From 7411c63b47f3ad6f470fbcd0f40b02cd6d36767c Mon Sep 17 00:00:00 2001 From: oepen Date: Wed, 23 Jun 2010 15:04:27 +0000 Subject: [PATCH] -Fixed patches so bitbake can apply them -Added patches to bitbake recipes git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@169 96b47cad-a561-4643-ad3b-153ac7d7599c --- bitbake/ccid_1.3.11.bb | 26 ++++++++++++++++++++++ bitbake/ccid_1.3.13.bb | 3 ++- bitbake/pcsc-lite_1.5.5.bb | 35 ++++++++++++++++++++++++++++++ bitbake/pcsc-lite_1.6.1.bb | 3 ++- ccid/patches/ccid-1.3.11.patch | 28 ++++++++++++------------ ccid/patches/ccid-1.3.13.patch | 30 ++++++++++++------------- ccid/patches/pcsc-lite-1.5.5.patch | 6 ++--- ccid/patches/pcsc-lite-1.6.1.patch | 6 ++--- 8 files changed, 100 insertions(+), 37 deletions(-) create mode 100644 bitbake/ccid_1.3.11.bb create mode 100644 bitbake/pcsc-lite_1.5.5.bb diff --git a/bitbake/ccid_1.3.11.bb b/bitbake/ccid_1.3.11.bb new file mode 100644 index 0000000..25a0537 --- /dev/null +++ b/bitbake/ccid_1.3.11.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Generic USB CCID smart card reader driver" +HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html" +LICENSE = "GPL" +PR = "r0" + +DEPENDS = "virtual/libusb0 pcsc-lite" +RDEPENDS = "pcsc-lite" + +SRC_URI = "http://alioth.debian.org/download.php/3080/ccid-${PV}.tar.bz2 \ + file://ccid-1.3.11.patch;apply=yes \ + " + +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" + +SRC_URI[md5sum] = "727dc7eb4d560f81fe70a766a96de970" +SRC_URI[sha256sum] = "f7bf5a82b02aff7d709a45dcc6109105508625caf92e34da4140b7c84d498906" diff --git a/bitbake/ccid_1.3.13.bb b/bitbake/ccid_1.3.13.bb index bd408a3..4dcff50 100644 --- a/bitbake/ccid_1.3.13.bb +++ b/bitbake/ccid_1.3.13.bb @@ -6,7 +6,8 @@ PR = "r0" DEPENDS = "virtual/libusb0 pcsc-lite" RDEPENDS = "pcsc-lite" -SRC_URI = "http://alioth.debian.org/download.php/3300/ccid-${PV}.tar.bz2" +SRC_URI = "http://alioth.debian.org/download.php/3300/ccid-${PV}.tar.bz2 \ + file://ccid-1.3.13.patch;apply=yes" inherit autotools diff --git a/bitbake/pcsc-lite_1.5.5.bb b/bitbake/pcsc-lite_1.5.5.bb new file mode 100644 index 0000000..3e7750d --- /dev/null +++ b/bitbake/pcsc-lite_1.5.5.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "PC/SC Lite smart card framework and applications" +HOMEPAGE = "http://pcsclite.alioth.debian.org/" +LICENSE = "BSD" + +DEPENDS = "hal" +RDEPENDS_${PN} = "hal" + +SRC_URI = "https://alioth.debian.org/frs/download.php/3082/pcsc-lite-${PV}.tar.bz2 \ + file://pcscd.init \ + file://pcsc-lite-1.5.5.patch;apply=yes \ + " + +inherit autotools_stage update-rc.d + +INITSCRIPT_NAME = "pcscd" +INITSCRIPT_PARAMS = "defaults" + +EXTRA_OECONF = " \ + --enable-libhal \ + --disable-libusb \ + --enable-usbdropdir=${libdir}/pcsc/drivers \ + " + +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.*" + +SRC_URI[md5sum] = "6707e967fc8bb398a5d1b1089d4dff63" +SRC_URI[sha256sum] = "051de6f3c1deff9a9c6f72995f6b9d271a23fc8aea74737f1902cabf1a71ed26" diff --git a/bitbake/pcsc-lite_1.6.1.bb b/bitbake/pcsc-lite_1.6.1.bb index ece26e3..4b31af6 100644 --- a/bitbake/pcsc-lite_1.6.1.bb +++ b/bitbake/pcsc-lite_1.6.1.bb @@ -6,7 +6,8 @@ DEPENDS = "hal" RDEPENDS_${PN} = "hal" SRC_URI = "https://alioth.debian.org/frs/download.php/3298/pcsc-lite-${PV}.tar.bz2 \ - file://pcscd.init " + file://pcscd.init \ + file://pcsc-lite-1.6.1.patch;apply=yes" inherit autotools_stage update-rc.d diff --git a/ccid/patches/ccid-1.3.11.patch b/ccid/patches/ccid-1.3.11.patch index f4ac538..b629982 100644 --- a/ccid/patches/ccid-1.3.11.patch +++ b/ccid/patches/ccid-1.3.11.patch @@ -1,7 +1,7 @@ -Index: src/ifdhandler.c +Index: ccid-1.3.11/src/ifdhandler.c =================================================================== ---- src/ifdhandler.c (Revision 4347) -+++ src/ifdhandler.c (Arbeitskopie) +--- ccid-1.3.11/src/ifdhandler.c (Revision 4347) ++++ ccid-1.3.11/src/ifdhandler.c (Arbeitskopie) @@ -1266,6 +1266,16 @@ iBytesReturned += sizeof(PCSC_TLV_STRUCTURE); } @@ -63,10 +63,10 @@ Index: src/ifdhandler.c if (IFD_SUCCESS != return_value) *pdwBytesReturned = 0; -Index: src/commands.c +Index: ccid-1.3.11/src/commands.c =================================================================== ---- src/commands.c (Revision 4347) -+++ src/commands.c (Arbeitskopie) +--- ccid-1.3.11/src/commands.c (Revision 4347) ++++ ccid-1.3.11/src/commands.c (Arbeitskopie) @@ -68,7 +68,13 @@ unsigned int tx_length, unsigned char tx_buffer[], unsigned int *rx_length, unsigned char rx_buffer[]); @@ -242,10 +242,10 @@ Index: src/commands.c + buffer[1] = (value >> 8) & 0xFF; +} /* i2w */ + -Index: src/commands.h +Index: ccid-1.3.11/src/commands.h =================================================================== ---- src/commands.h (Revision 4347) -+++ src/commands.h (Arbeitskopie) +--- ccid-1.3.11/src/commands.h (Revision 4347) ++++ ccid-1.3.11/src/commands.h (Arbeitskopie) @@ -37,6 +37,14 @@ unsigned char TxBuffer[], unsigned int TxLength, unsigned char RxBuffer[], unsigned int *RxLength); @@ -263,8 +263,8 @@ Index: src/commands.h unsigned char RxBuffer[], unsigned int *RxLength); Index: src/ccid.h =================================================================== ---- src/ccid.h (Revision 4347) -+++ src/ccid.h (Arbeitskopie) +--- ccid-1.3.11/src/ccid.h (Revision 4347) ++++ ccid-1.3.11/src/ccid.h (Arbeitskopie) @@ -137,8 +137,10 @@ #define CCID_CLASS_EXCHANGE_MASK 0x00070000 @@ -278,10 +278,10 @@ Index: src/ccid.h /* See CCID specs ch. 4.2.1 */ #define CCID_ICC_PRESENT_ACTIVE 0x00 /* 00 0000 00 */ -Index: src/ccid_ifdhandler.h +Index: ccid-1.3.11/src/ccid_ifdhandler.h =================================================================== ---- src/ccid_ifdhandler.h (Revision 4347) -+++ src/ccid_ifdhandler.h (Arbeitskopie) +--- ccid-1.3.11/src/ccid_ifdhandler.h (Revision 4347) ++++ ccid-1.3.11/src/ccid_ifdhandler.h (Arbeitskopie) @@ -38,6 +38,8 @@ #define IOCTL_FEATURE_IFD_PIN_PROPERTIES \ SCARD_CTL_CODE(FEATURE_IFD_PIN_PROPERTIES + CLASS2_IOCTL_MAGIC) diff --git a/ccid/patches/ccid-1.3.13.patch b/ccid/patches/ccid-1.3.13.patch index ee57860..3a15c77 100644 --- a/ccid/patches/ccid-1.3.13.patch +++ b/ccid/patches/ccid-1.3.13.patch @@ -1,7 +1,7 @@ -Index: src/ifdhandler.c +Index: ccid-1.3.13/src/ifdhandler.c =================================================================== ---- src/ifdhandler.c (Revision 4979) -+++ src/ifdhandler.c (Arbeitskopie) +--- ccid-1.3.13/src/ifdhandler.c (Revision 4979) ++++ ccid-1.3.13/src/ifdhandler.c (Arbeitskopie) @@ -1384,6 +1384,16 @@ iBytesReturned += sizeof(PCSC_TLV_STRUCTURE); } @@ -63,10 +63,10 @@ Index: src/ifdhandler.c if (IFD_SUCCESS != return_value) *pdwBytesReturned = 0; -Index: src/commands.c +Index: ccid-1.3.13/src/commands.c =================================================================== ---- src/commands.c (Revision 4979) -+++ src/commands.c (Arbeitskopie) +--- ccid-1.3.13/src/commands.c (Revision 4979) ++++ ccid-1.3.13/src/commands.c (Arbeitskopie) @@ -68,7 +68,13 @@ unsigned int tx_length, unsigned char tx_buffer[], unsigned int *rx_length, unsigned char rx_buffer[]); @@ -242,10 +242,10 @@ Index: src/commands.c + buffer[1] = (value >> 8) & 0xFF; +} /* i2w */ + -Index: src/commands.h +Index: ccid-1.3.13/src/commands.h =================================================================== ---- src/commands.h (Revision 4979) -+++ src/commands.h (Arbeitskopie) +--- ccid-1.3.13/src/commands.h (Revision 4979) ++++ ccid-1.3.13/src/commands.h (Arbeitskopie) @@ -37,6 +37,14 @@ unsigned char TxBuffer[], unsigned int TxLength, unsigned char RxBuffer[], unsigned int *RxLength); @@ -261,10 +261,10 @@ Index: src/commands.h RESPONSECODE CmdEscape(unsigned int reader_index, const unsigned char TxBuffer[], unsigned int TxLength, unsigned char RxBuffer[], unsigned int *RxLength); -Index: src/ccid.h +Index: ccid-1.3.13/src/ccid.h =================================================================== ---- src/ccid.h (Revision 4979) -+++ src/ccid.h (Arbeitskopie) +--- ccid-1.3.13/src/ccid.h (Revision 4979) ++++ ccid-1.3.13/src/ccid.h (Arbeitskopie) @@ -142,8 +142,10 @@ #define CCID_CLASS_EXCHANGE_MASK 0x00070000 @@ -278,10 +278,10 @@ Index: src/ccid.h /* See CCID specs ch. 4.2.1 */ #define CCID_ICC_PRESENT_ACTIVE 0x00 /* 00 0000 00 */ -Index: src/ccid_ifdhandler.h +Index: ccid-1.3.13/src/ccid_ifdhandler.h =================================================================== ---- src/ccid_ifdhandler.h (Revision 4979) -+++ src/ccid_ifdhandler.h (Arbeitskopie) +--- ccid-1.3.13/src/ccid_ifdhandler.h (Revision 4979) ++++ ccid-1.3.13/src/ccid_ifdhandler.h (Arbeitskopie) @@ -37,6 +37,8 @@ SCARD_CTL_CODE(FEATURE_IFD_PIN_PROPERTIES + CLASS2_IOCTL_MAGIC) #define IOCTL_FEATURE_GET_TLV_PROPERTIES \ diff --git a/ccid/patches/pcsc-lite-1.5.5.patch b/ccid/patches/pcsc-lite-1.5.5.patch index 5f07b3d..05b91b7 100644 --- a/ccid/patches/pcsc-lite-1.5.5.patch +++ b/ccid/patches/pcsc-lite-1.5.5.patch @@ -1,7 +1,7 @@ -Index: src/PCSC/reader.h.in +Index: pcsc-lite-1.5.5/src/PCSC/reader.h.in =================================================================== ---- src/PCSC/reader.h.in (Revision 4345) -+++ src/PCSC/reader.h.in (Arbeitskopie) +--- pcsc-lite-1.5.5/src/PCSC/reader.h.in (Revision 4345) ++++ pcsc-lite-1.5.5/src/PCSC/reader.h.in (Arbeitskopie) @@ -118,6 +118,7 @@ #define FEATURE_WRITE_DISPLAY 0x0F #define FEATURE_GET_KEY 0x10 diff --git a/ccid/patches/pcsc-lite-1.6.1.patch b/ccid/patches/pcsc-lite-1.6.1.patch index 042c3c0..e2de056 100644 --- a/ccid/patches/pcsc-lite-1.6.1.patch +++ b/ccid/patches/pcsc-lite-1.6.1.patch @@ -1,7 +1,7 @@ -Index: src/PCSC/reader.h.in +Index: pcsc-lite-1.6.1/src/PCSC/reader.h.in =================================================================== ---- src/PCSC/reader.h.in (Revision 4978) -+++ src/PCSC/reader.h.in (Arbeitskopie) +--- pcsc-lite-1.6.1/src/PCSC/reader.h.in (Revision 4978) ++++ pcsc-lite-1.6.1/src/PCSC/reader.h.in (Arbeitskopie) @@ -121,6 +121,7 @@ #define FEATURE_IFD_DISPLAY_PROPERTIES 0x11 #define FEATURE_GET_TLV_PROPERTIES 0x12