Skip to contentSkip to conversation

engine-pkcs11: update to version 0.2.2

PATCH New Derek Straka 1 participant 3 messages Aug 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 engine-pkcs11: update to version 0.2.2

---
 .../{engine-pkcs11_0.2.0.bb => engine-pkcs11_0.2.2.bb}       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-support/engine-pkcs11/{engine-pkcs11_0.2.0.bb => engine-pkcs11_0.2.2.bb} (71%)
meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.2.bb renamed from meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.0.bb +7 -5
similarity index 71%
rename from meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.0.bb
rename to meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.2.bb
index da096c9..047f701 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://src/engine_pkcs11.h;startline=1;endline=26;md5=973a19
 DEPENDS = "openssl libp11"
 
 SRC_URI = "git://github.com/OpenSC/engine_pkcs11.git"
-SRCREV = "6909d6761c8820e1750fa0bf4fa8532c82f34e35"
+SRCREV = "132fcf2c8b319f9f4b2ebdc8dcb54ff496dc0519"
 
 S = "${WORKDIR}/git"
 
@@ -18,12 +18,14 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "\
     --disable-static \
-    --libdir ${libdir}/openssl \
+    --libdir ${libdir}/engines \
 "
 
 do_install_append () {
-    rm -f ${D}${libdir}/openssl/engines/libpkcs11.la
+    rm -f ${D}${libdir}/engines/libpkcs11.la
 }
 
-FILES_${PN} += "${libdir}/openssl/engines/libpkcs11.so*"
-FILES_${PN}-dbg += "${libdir}/openssl/engines/.debug/*"
+FILES_${PN} += "${libdir}/engines/libpkcs11${SOLIBSDEV}"
+FILES_${PN}-dbg += "${libdir}/engines/.debug/"
+
+RDEPENDS_${PN} += "openssl libp11 opensc"
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 2/3 libp11: update to version 0.4.0

---
 .../libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb}               | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb} (57%)
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +9 -2
similarity index 57%
rename from meta-oe/recipes-support/libp11/libp11_0.3.0.bb
rename to meta-oe/recipes-support/libp11/libp11_0.4.0.bb
index d97bfc6..d88006c 100644
@@ -8,16 +8,23 @@ LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
 
-SRC_URI = "git://github.com/OpenSC/libp11.git;protocol=http"
-SRCREV = "6f71240991aa831f6fc2cc5431faf6ebec627ed2"
+SRC_URI = "git://github.com/OpenSC/libp11.git"
+SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
+# Currently, Makefile dependencies are incorrectly defined which causes build errors
+# The number of jobs is high
+# See https://github.com/OpenSC/libp11/issues/94
+PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-static"
 
 do_install_append () {
     rm -rf ${D}${libdir}/*.la
     rm -rf ${D}${docdir}/${BPN}
 }
+
+FILES_${PN} += "${libdir}/pkcs11${SOLIBS}"
+FILES_${PN}-dev += "${libdir}/pkcs11${SOLIBSDEV}"
Signature · 1 line
2.7.4
#2 lore raw

PATCH v2 3/3 opensc: update to version 0.16.0

In reply to Derek Straka
---
 .../recipes-support/opensc/{opensc_0.15.0.bb => opensc_0.16.0.bb}    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/opensc/{opensc_0.15.0.bb => opensc_0.16.0.bb} (87%)
meta-oe/recipes-support/opensc/opensc_0.16.0.bb renamed from meta-oe/recipes-support/opensc/opensc_0.15.0.bb +2 -3
similarity index 87%
rename from meta-oe/recipes-support/opensc/opensc_0.15.0.bb
rename to meta-oe/recipes-support/opensc/opensc_0.16.0.bb
index a11b3d8..fd67181 100644
@@ -11,10 +11,9 @@ SECTION = "System Environment/Libraries"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz"
 
-SRC_URI[md5sum] = "f266024e5a9630821ffa0ac14f72e369"
-SRC_URI[sha256sum] = "8f8f8cf52e0252334e4dfdccca829b876a3de6340deb772aa0bfe0c0cc10eaf5"
+SRC_URI[md5sum] = "724d128f23cd7a74b28d04300ce7bcbd"
+SRC_URI[sha256sum] = "3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729"
 
-S = "${WORKDIR}/OpenSC-${PV}"
 DEPENDS = "openct pcsc-lite virtual/libiconv openssl"
 
 LICENSE = "LGPLv2+"
Signature · 1 line
2.7.4