Merge pull request #536 from ricardosalveti/master

Use libp11 from meta-oe upstream

2 files changed, 1 insertions, 41 deletions

diff --git a/recipes-support/libp11/libp11_git.bb b/recipes-support/libp11/libp11_git.bb
deleted file mode 100644
index bedcdc8..0000000
--- a/recipes-support/libp11/libp11_git.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Library for using PKCS"
-DESCRIPTION = "\
-Libp11 is a library implementing a small layer on top of PKCS \
-make using PKCS"
-HOMEPAGE = "http://www.opensc-project.org/libp11"
-SECTION = "Development/Libraries"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
-DEPENDS = "libtool openssl"
-RDEPENDS_${PN} += " opensc"
-
-SRC_URI = "git://github.com/OpenSC/libp11.git"
-SRCREV = "57ca68ff67efa08e3be1f26dec6d23bf5bb977f2"
-
-PV = "0.4.9+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-# Currently, Makefile dependencies are incorrectly defined which causes build errors
-# if 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}/engines*/pkcs11.so \
-               ${libdir}/engines*/libpkcs11${SOLIBS} \
-               ${libdir}/libp11${SOLIBS}"
-
-FILES_${PN}-dev = " \
-                   ${libdir}/engines*/libpkcs11${SOLIBSDEV} \
-                   ${libdir}/libp11${SOLIBSDEV} \
-                   ${libdir}/pkgconfig/libp11.pc \
-                   /usr/include"
diff --git a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb b/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
index 58b521c..68514b2 100644
--- a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
+++ b/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit systemd
 
-RDEPENDS_${PN} = "softhsm libp11 openssl-bin"
+RDEPENDS_${PN} = "softhsm libp11 opensc openssl-bin"
 DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"