Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

4 files changed, 89 insertions, 1 deletions

diff --git a/packages/ccid/ccid_1.3.8.bb b/packages/ccid/ccid_1.3.8.bb
new file mode 100644
index 0000000000..033af6c3d5
--- /dev/null
+++ b/packages/ccid/ccid_1.3.8.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Generic USB CCID smart card reader driver"
+HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html"
+LICENSE = "GPL"
+FILE_PR = "r0"
+
+DEPENDS = "libusb pcsc-lite"
+RDEPENDS = "pcsc-lite"
+
+SRC_URI = "http://alioth.debian.org/download.php/2482/ccid-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-udev"
+
+do_install_append () {
+	install -d "${D}/etc/udev/rules.d"
+	install -m 644 "${S}/src/pcscd_ccid.rules" "${D}/etc/udev/rules.d/85-pcscd_ccid.rules"
+}
+
+FILES_${PN} += "${libdir}/pcsc/"
+FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug"
diff --git a/packages/dmidecode/dmidecode_2.9.bb b/packages/dmidecode/dmidecode_2.9.bb
index 2186120498..bb13500eff 100644
--- a/packages/dmidecode/dmidecode_2.9.bb
+++ b/packages/dmidecode/dmidecode_2.9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "DMI (Desktop Management Interface) table related utilities"
 HOMEPAGE = "http://www.nongnu.org/dmidecode/"
 LICENSE = "GPLv2"
-PR = "r0"
+FILE_PR = "r0"
 
 SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2"
 
diff --git a/packages/pcsc-lite/files/pcscd.init b/packages/pcsc-lite/files/pcscd.init
new file mode 100644
index 0000000000..92385ab196
--- /dev/null
+++ b/packages/pcsc-lite/files/pcscd.init
@@ -0,0 +1,32 @@
+#!/bin/sh
+DAEMON=/usr/sbin/pcscd
+NAME=pcscd
+DESC="PCSC Daemon"
+PIDFILE=/var/run/pcscd/pcscd.pid
+ARGS=""
+
+test -f $DAEMON || exit 0
+
+case "$1" in
+    start)
+        echo -n "Starting $DESC: $NAME"
+        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $ARGS
+        echo "."
+        ;;
+    stop)
+        echo -n "Stopping $DESC: $NAME"
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
+        echo "."
+        ;;
+    restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/packages/pcsc-lite/pcsc-lite_1.4.102.bb b/packages/pcsc-lite/pcsc-lite_1.4.102.bb
new file mode 100644
index 0000000000..6d5bb44113
--- /dev/null
+++ b/packages/pcsc-lite/pcsc-lite_1.4.102.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "PC/SC Lite smart card framework and applications"
+HOMEPAGE = "http://pcsclite.alioth.debian.org/"
+LICENSE = "BSD"
+FILE_PR = "r0"
+
+DEPENDS = "hal"
+RDEPENDS_${PN} = "hal"
+
+SRC_URI = "http://alioth.debian.org/download.php/2479/pcsc-lite-${PV}.tar.bz2 \
+           file://pcscd.init "
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "pcscd"
+INITSCRIPT_PARAMS = "defaults"
+
+EXTRA_OECONF = " \
+	--enable-libhal \
+	--disable-libusb \
+	--enable-usbdropdir=${libdir}/pcsc/drivers \
+	"
+
+do_stage() {
+	autotools_stage_all
+}
+
+do_install() {
+	oe_runmake DESTDIR="${D}" install
+	install -d "${D}/etc/init.d"
+	install -m 755 "${WORKDIR}/pcscd.init" "${D}/etc/init.d/pcscd"
+}
+
+PACKAGES =+ "libpcsclite"
+
+FILES_libpcsclite = "${libdir}/libpcsclite.so.*"