[Edited Message Follows] [Reason: include softhsm2.module only in FILES if pk11 is set in PACKAGECONFIG]
>From 216dba6552f2b3a65c3fc9b586736d93132a0166 Mon Sep 17 00:00:00 2001 From: "Gassner, Tobias.ext" <[email protected]> Date: Thu, 18 Jan 2024 12:50:22 +0100 Subject: [PATCH] softhsm_2.6.1.bb fixing p11-kit module path, adding softhsm2.module to FILES In order for the softhsm module to be discoverable by p11-kit proxy the softhsm2.module file must be deployed to ${datadir}/p11-kit/modules. This was previously not the case. Also the p11-kit module path (--with-p11-kit) seemed to point to the wrong directory and had a syntax error (two == instead one =). Signed-off-by: Gassner, Tobias.ext <[email protected]> --- meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb index 2c68ba984..930bca96f 100644 --- a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb +++ b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb @@ -27,7 +27,9 @@ PACKAGECONFIG[notvisable] = "--disable-visibility" PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_HOST}/usr --with-crypto-backend=openssl, --without-openssl, openssl, openssl" PACKAGECONFIG[botan] = "--with-botan=${STAGING_DIR_HOST}/usr --with-crypto-backend=botan, --without-botan, botan" PACKAGECONFIG[migrate] = "--with-migrate" -PACKAGECONFIG[pk11] = "--enable-p11-kit --with-p11-kit==${STAGING_DIR_HOST}/usr, --without-p11-kit, p11-kit, p11-kit" +PACKAGECONFIG[pk11] = "--enable-p11-kit --with-p11-kit=${datadir}/p11-kit/modules, --without-p11-kit, p11-kit, p11-kit" + +FILES:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'pk11', '${datadir}/p11-kit/modules/softhsm2.module', '', d)}" RDEPENDS:${PN} = "sqlite3" BBCLASSEXTEND = "native nativesdk" -- 2.42.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#108344): https://lists.openembedded.org/g/openembedded-devel/message/108344 Mute This Topic: https://lists.openembedded.org/mt/103807076/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
