summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2022-05-19 08:35:05 -0700
committerArmin Kuster <akuster808@gmail.com>2022-05-23 07:11:55 -0700
commit3045de13abe1ee6c39e06d1ce0d2b31478d2ff35 (patch)
tree5c4c0de7d48b619d39c08f0271a2a0ae8ed0a099
parent2c534791b0b7b78842f76275081a2207c45ac1b0 (diff)
downloadmeta-security-3045de13abe1ee6c39e06d1ce0d2b31478d2ff35.tar.gz
tpm2-pkcs11: tpm2-pkcs11 module missing
Correctly fix symlink issue by putting module in -dev pkg. Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.8.0.bb9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.8.0.bb b/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.8.0.bb
index a9174e6..e8812d0 100644
--- a/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.8.0.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.8.0.bb
@@ -27,8 +27,13 @@ do_compile:append() {
27do_install:append() { 27do_install:append() {
28 install -d ${D}${libdir}/pkcs11 28 install -d ${D}${libdir}/pkcs11
29 install -d ${D}${datadir}/p11-kit 29 install -d ${D}${datadir}/p11-kit
30
31 # remove symlinks
30 rm -f ${D}${libdir}/pkcs11/libtpm2_pkcs11.so 32 rm -f ${D}${libdir}/pkcs11/libtpm2_pkcs11.so
31 33
34 #install lib
35 install -m 755 ${B}/src/.libs/libtpm2_pkcs11.so ${D}${libdir}/pkcs11/libtpm2_pkcs11.so
36
32 cd ${S}/tools 37 cd ${S}/tools
33 export PYTHONPATH="${D}${PYTHON_SITEPACKAGES_DIR}" 38 export PYTHONPATH="${D}${PYTHON_SITEPACKAGES_DIR}"
34 ${PYTHON_PN} setup.py install --root="${D}" --prefix="${prefix}" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --optimize=1 --skip-build 39 ${PYTHON_PN} setup.py install --root="${D}" --prefix="${prefix}" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --optimize=1 --skip-build
@@ -48,5 +53,5 @@ FILES:${PN} += "\
48 ${datadir}/p11-kit/* \ 53 ${datadir}/p11-kit/* \
49 " 54 "
50 55
51RDEPENDS:${PN} = "tpm2-tools" 56RDEPENDS:${PN} = "p11-kit tpm2-tools "
52RDEPENDS:${PN}-tools += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pyyaml ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1-modules" 57RDEPENDS:${PN}-tools = "${PYTHON_PN}-pyyaml ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1-modules"