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

5 files changed, 97 insertions, 1 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a0714ac75e..6d464bd3da 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2082,6 +2082,10 @@ sha256=015c4237a532b873990aeeecdf351138ce5a811d062d6db73c611a4985de5435
 md5=b8c51a2e3cccb381428426c0fc543244
 sha256=f1e44d628cc4cbac192bf33f492ad8d1e1988cae576924128df36f3638e9a485
 
+[http://alioth.debian.org/download.php/2482/ccid-1.3.8.tar.bz2]
+md5=ebb5fc927d73cd63737a9114481e8957
+sha256=8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536
+
 [http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/ccxstream-1.0.15.tar.gz]
 md5=c589fff48ce541f26b394c9d82ccbead
 sha256=2dec31ba4a176c921a653c0949a53c2d3497e047737724350897fd2534db18fe
@@ -12054,6 +12058,10 @@ sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094
 md5=2af38e083fb90ef60fa9eda7cc290e86
 sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
 
+[http://alioth.debian.org/download.php/2479/pcsc-lite-1.4.102.tar.bz2]
+md5=b97d3a725ab93662adf09acfbc49efeb
+sha256=56fc9e6324539537324b071e5b51c3388df9bfa92fb7e210b989b463122fc333
+
 [http://handhelds.org/~zecke/oe_packages/pdamaze_V1.0.0.tar.gz]
 md5=bf27dd51fe03c8b475080b74de043a13
 sha256=99d6bc6b360baabd6044e8883d467cc6ed7955f9ab66d8f87f61e3cc757fb97a
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.*"