diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2019-07-11 14:12:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-11 14:12:49 +0200 |
commit | f68e1d59f0a0ed4341dad3b16d4979b1b63336d7 (patch) | |
tree | ca09b8b8fcd5dcef30a49fe45368d655a89afc9e | |
parent | 6a11a18f290707975f1cbc43f247aa52fa5cf050 (diff) | |
parent | c1de33deb2a5d2d928830329ee08d0e48606b1a5 (diff) | |
download | meta-updater-f68e1d59f0a0ed4341dad3b16d4979b1b63336d7.tar.gz |
Merge pull request #536 from ricardosalveti/master
Use libp11 from meta-oe upstream
-rw-r--r-- | recipes-support/libp11/libp11_git.bb | 40 | ||||
-rw-r--r-- | recipes-support/softhsm-testtoken/softhsm-testtoken.bb | 2 |
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 @@ | |||
1 | SUMMARY = "Library for using PKCS" | ||
2 | DESCRIPTION = "\ | ||
3 | Libp11 is a library implementing a small layer on top of PKCS \ | ||
4 | make using PKCS" | ||
5 | HOMEPAGE = "http://www.opensc-project.org/libp11" | ||
6 | SECTION = "Development/Libraries" | ||
7 | LICENSE = "LGPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" | ||
9 | DEPENDS = "libtool openssl" | ||
10 | RDEPENDS_${PN} += " opensc" | ||
11 | |||
12 | SRC_URI = "git://github.com/OpenSC/libp11.git" | ||
13 | SRCREV = "57ca68ff67efa08e3be1f26dec6d23bf5bb977f2" | ||
14 | |||
15 | PV = "0.4.9+git${SRCPV}" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
21 | # Currently, Makefile dependencies are incorrectly defined which causes build errors | ||
22 | # if the number of jobs is high | ||
23 | # See https://github.com/OpenSC/libp11/issues/94 | ||
24 | PARALLEL_MAKE = "" | ||
25 | EXTRA_OECONF = "--disable-static" | ||
26 | |||
27 | do_install_append () { | ||
28 | rm -rf ${D}${libdir}/*.la | ||
29 | rm -rf ${D}${docdir}/${BPN} | ||
30 | } | ||
31 | |||
32 | FILES_${PN} = "${libdir}/engines*/pkcs11.so \ | ||
33 | ${libdir}/engines*/libpkcs11${SOLIBS} \ | ||
34 | ${libdir}/libp11${SOLIBS}" | ||
35 | |||
36 | FILES_${PN}-dev = " \ | ||
37 | ${libdir}/engines*/libpkcs11${SOLIBSDEV} \ | ||
38 | ${libdir}/libp11${SOLIBSDEV} \ | ||
39 | ${libdir}/pkgconfig/libp11.pc \ | ||
40 | /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 | |||
4 | 4 | ||
5 | inherit systemd | 5 | inherit systemd |
6 | 6 | ||
7 | RDEPENDS_${PN} = "softhsm libp11 openssl-bin" | 7 | RDEPENDS_${PN} = "softhsm libp11 opensc openssl-bin" |
8 | DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" | 8 | DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" |
9 | 9 | ||
10 | 10 | ||