Skip to contentSkip to conversation

engine-pkcs11: update to version 0.2.2

PATCH Superseded Derek Straka 2 participants 8 messages Aug 10, 2016 – Aug 15, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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} (72%)
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 72%
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 f2a2258..c391c4f 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;protocol=http"
-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.so*"
+FILES_${PN}-dbg += "${libdir}/engines/.debug/*"
+
+RDEPENDS_${PN} += "openssl libp11 opensc"
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/3 libp11: update to version 0.4.0

---
 meta-oe/recipes-support/libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb} | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb} (81%)
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +4 -1
similarity index 81%
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..a7e43be 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git;protocol=http"
-SRCREV = "6f71240991aa831f6fc2cc5431faf6ebec627ed2"
+SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3"
 
 S = "${WORKDIR}/git"
 
@@ -21,3 +21,6 @@ do_install_append () {
     rm -rf ${D}${libdir}/*.la
     rm -rf ${D}${docdir}/${BPN}
 }
+
+FILES_${PN} += "${libdir}/pkcs11.so.0*"
+FILES_${PN}-dev += "${libdir}/pkcs11.so"
Signature · 1 line
1.9.1
#2 lore raw

Re: [meta-oe][PATCH 2/3] libp11: update to version 0.4.0

Quoted 23 lines · Derek Straka
---
 meta-oe/recipes-support/libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb} | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb} (81%)
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +1 -1
similarity index 81%
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..a7e43be 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git;protocol=http"
-SRCREV = "6f71240991aa831f6fc2cc5431faf6ebec627ed2"
+SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3"
 
 S = "${WORKDIR}/git"
 

meta-oe/recipes-support/libp11/libp11_0.4.0.bb do_install_append () { · line 26

Quoted 6 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +3 -0
@@ -21,3 +21,6 @@ do_install_append () {
     rm -rf ${D}${libdir}/*.la
     rm -rf ${D}${docdir}/${BPN}
 }
+
+FILES_${PN} += "${libdir}/pkcs11.so.0*"
+FILES_${PN}-dev += "${libdir}/pkcs11.so"

You can use following variables here:

SOLIBS = ".so.*"
SOLIBS_darwin = ".dylib"

SOLIBSDEV = ".so"
# Due to the ordering of PACKAGES and the naming of the dev symlinks on # darwin,

# we can't make the symlinks end up in the -dev packages easily at this
# point. This hack
# at least means builds aren't completely broken and symlinks don't take
# up much space.
SOLIBSDEV_darwin = ".dylibbroken"

If I don't forget I'll update it when cherry-picking to master-next (if you don't send v2 before that).

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

Re: [meta-oe][PATCH 2/3] libp11: update to version 0.4.0

Ah, excellent. Thanks for the hint.

-Derek

Quoted 62 lines · Martin Jansa
Quoted 3 lines · Derek Straka

---
meta-oe/recipes-support/libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb} |

5 ++++-

Quoted 2 lines
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.3.0.bb =>

libp11_0.4.0.bb} (81%)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-oe/recipes-support/libp11/libp11_0.4.0.bb

meta-oe/recipes-support/libp11/libp11_0.4.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=

Quoted 7 lines

similarity index 81%
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..a7e43be 100644

meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +0 -0
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=

fad9b3332be894bab9bc501572864b29"

Quoted 9 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +1 -1
 DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git;protocol=http"
-SRCREV = "6f71240991aa831f6fc2cc5431faf6ebec627ed2"
+SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3"
 
 S = "${WORKDIR}/git"
 

meta-oe/recipes-support/libp11/libp11_0.4.0.bb do_install_append () { · line 26

Quoted 6 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +3 -0
@@ -21,3 +21,6 @@ do_install_append () {
     rm -rf ${D}${libdir}/*.la
     rm -rf ${D}${docdir}/${BPN}
 }
+
+FILES_${PN} += "${libdir}/pkcs11.so.0*"
+FILES_${PN}-dev += "${libdir}/pkcs11.so"

You can use following variables here:

SOLIBS = ".so.*"
SOLIBS_darwin = ".dylib"

SOLIBSDEV = ".so"
# Due to the ordering of PACKAGES and the naming of the dev symlinks on # darwin,

# we can't make the symlinks end up in the -dev packages easily at this
# point. This hack
# at least means builds aren't completely broken and symlinks don't take
# up much space.
SOLIBSDEV_darwin = ".dylibbroken"

If I don't forget I'll update it when cherry-picking to master-next (if you don't send v2 before that).

--
Martin 'JaMa' Jansa jabber: [email protected]

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#4 lore raw

Re: [meta-oe][PATCH 2/3] libp11: update to version 0.4.0

I've updated it also in engine-pkcs change, while resolving conflicts from those SRC_URI changes for krogoth and master.

Quoted 75 lines · Derek Straka

Ah, excellent. Thanks for the hint.

-Derek

Quoted 52 lines · Martin Jansa
Quoted 3 lines · Derek Straka

---
meta-oe/recipes-support/libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb} |

5 ++++-

Quoted 2 lines
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.3.0.bb =>

libp11_0.4.0.bb} (81%)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-oe/recipes-support/libp11/libp11_0.4.0.bb

meta-oe/recipes-support/libp11/libp11_0.4.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=

Quoted 7 lines

similarity index 81%
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..a7e43be 100644

meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +0 -0
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=

fad9b3332be894bab9bc501572864b29"

Quoted 9 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +1 -1
 DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git;protocol=http"
-SRCREV = "6f71240991aa831f6fc2cc5431faf6ebec627ed2"
+SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3"
 
 S = "${WORKDIR}/git"
 

meta-oe/recipes-support/libp11/libp11_0.4.0.bb do_install_append () { · line 26

Quoted 6 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +3 -0
@@ -21,3 +21,6 @@ do_install_append () {
     rm -rf ${D}${libdir}/*.la
     rm -rf ${D}${docdir}/${BPN}
 }
+
+FILES_${PN} += "${libdir}/pkcs11.so.0*"
+FILES_${PN}-dev += "${libdir}/pkcs11.so"

You can use following variables here:

SOLIBS = ".so.*"
SOLIBS_darwin = ".dylib"

SOLIBSDEV = ".so"
# Due to the ordering of PACKAGES and the naming of the dev symlinks on # darwin,

# we can't make the symlinks end up in the -dev packages easily at this
# point. This hack
# at least means builds aren't completely broken and symlinks don't take
# up much space.
SOLIBSDEV_darwin = ".dylibbroken"

If I don't forget I'll update it when cherry-picking to master-next (if you don't send v2 before that).

Quoted 10 lines

--
Martin 'JaMa' Jansa jabber: [email protected]

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#5 lore raw

Re: [meta-oe][PATCH 2/3] libp11: update to version 0.4.0

Quoted 2 lines · Martin Jansa

I've updated it also in engine-pkcs change, while resolving conflicts from those SRC_URI changes for krogoth and master.

There is one more issue:
cd .libs && ln -s -f pkcs11.so libpkcs11.so /bin/bash: line 0: cd: .libs: No such file or directory make[2]: *** [all-local] Error 1

http://errors.yoctoproject.org/Errors/Details/75462/

So keeping this in master-next with other 3 changes, until this is resolved.

Quoted 77 lines · Derek Straka
Quoted 76 lines

Ah, excellent. Thanks for the hint.

-Derek

Quoted 52 lines · Martin Jansa
Quoted 3 lines · Derek Straka

---
meta-oe/recipes-support/libp11/{libp11_0.3.0.bb => libp11_0.4.0.bb} |

5 ++++-

Quoted 2 lines
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.3.0.bb =>

libp11_0.4.0.bb} (81%)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-oe/recipes-support/libp11/libp11_0.4.0.bb

meta-oe/recipes-support/libp11/libp11_0.4.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=

Quoted 7 lines

similarity index 81%
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..a7e43be 100644

meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +0 -0
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=

fad9b3332be894bab9bc501572864b29"

Quoted 9 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +1 -1
 DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git;protocol=http"
-SRCREV = "6f71240991aa831f6fc2cc5431faf6ebec627ed2"
+SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3"
 
 S = "${WORKDIR}/git"
 

meta-oe/recipes-support/libp11/libp11_0.4.0.bb do_install_append () { · line 26

Quoted 6 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +3 -0
@@ -21,3 +21,6 @@ do_install_append () {
     rm -rf ${D}${libdir}/*.la
     rm -rf ${D}${docdir}/${BPN}
 }
+
+FILES_${PN} += "${libdir}/pkcs11.so.0*"
+FILES_${PN}-dev += "${libdir}/pkcs11.so"

You can use following variables here:

SOLIBS = ".so.*"
SOLIBS_darwin = ".dylib"

SOLIBSDEV = ".so"
# Due to the ordering of PACKAGES and the naming of the dev symlinks on # darwin,

# we can't make the symlinks end up in the -dev packages easily at this
# point. This hack
# at least means builds aren't completely broken and symlinks don't take
# up much space.
SOLIBSDEV_darwin = ".dylibbroken"

If I don't forget I'll update it when cherry-picking to master-next (if you don't send v2 before that).

Quoted 10 lines

--
Martin 'JaMa' Jansa jabber: [email protected]

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#6 lore raw

Re: [meta-oe][PATCH 2/3] libp11: update to version 0.4.0

Interesting. I didn't see that until I cranked up the number of bitbake threads to match your build slave's count. I'll take a quick peek at the Makefile dependencies; otherwise, I will just set PARALLEL_MAKE accordingly.

-Derek

Quoted 108 lines · Martin Jansa
Quoted 1 line · Martin Jansa

I've updated it also in engine-pkcs change, while resolving conflicts

from

Quoted 1 line

those SRC_URI changes for krogoth and master.

There is one more issue:
cd .libs && ln -s -f pkcs11.so libpkcs11.so /bin/bash: line 0: cd: .libs: No such file or directory make[2]: *** [all-local] Error 1

http://errors.yoctoproject.org/Errors/Details/75462/

So keeping this in master-next with other 3 changes, until this is resolved.

Quoted 6 lines · Derek Straka
Quoted 5 lines

Ah, excellent. Thanks for the hint.

-Derek

Quoted 7 lines
Quoted 7 lines
Quoted 4 lines · Martin Jansa
Quoted 3 lines · Derek Straka

---
meta-oe/recipes-support/libp11/{libp11_0.3.0.bb =>

libp11_0.4.0.bb} |

Quoted 33 lines
Quoted 33 lines
Quoted 33 lines

5 ++++-

Quoted 2 lines
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.3.0.bb =>

libp11_0.4.0.bb} (81%)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-oe/recipes-support/libp11/libp11_0.4.0.bb

meta-oe/recipes-support/libp11/libp11_0.4.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=

Quoted 7 lines

similarity index 81%
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..a7e43be 100644

meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +0 -0
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=

fad9b3332be894bab9bc501572864b29"

Quoted 9 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +1 -1
 DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git;protocol=http"
-SRCREV = "6f71240991aa831f6fc2cc5431faf6ebec627ed2"
+SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3"
 
 S = "${WORKDIR}/git"
 

meta-oe/recipes-support/libp11/libp11_0.4.0.bb do_install_append () { · line 26

Quoted 6 lines
meta-oe/recipes-support/libp11/libp11_0.4.0.bb renamed from meta-oe/recipes-support/libp11/libp11_0.3.0.bb +3 -0
@@ -21,3 +21,6 @@ do_install_append () {
     rm -rf ${D}${libdir}/*.la
     rm -rf ${D}${docdir}/${BPN}
 }
+
+FILES_${PN} += "${libdir}/pkcs11.so.0*"
+FILES_${PN}-dev += "${libdir}/pkcs11.so"

You can use following variables here:

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

SOLIBS = ".so.*"
SOLIBS_darwin = ".dylib"

SOLIBSDEV = ".so"
# Due to the ordering of PACKAGES and the naming of the dev symlinks

on

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

# darwin,

# we can't make the symlinks end up in the -dev packages easily at

this

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
# point. This hack
# at least means builds aren't completely broken and symlinks don't

take

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
# up much space.
SOLIBSDEV_darwin = ".dylibbroken"

If I don't forget I'll update it when cherry-picking to master-next

(if

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines

you don't send v2 before that).

--
Martin 'JaMa' Jansa jabber: [email protected]

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Quoted 6 lines
Quoted 6 lines

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--
Martin 'JaMa' Jansa jabber: [email protected]

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#7 lore raw

PATCH 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
1.9.1