From b1f1c7a304de33916040928ea7182c03580efb28 Mon Sep 17 00:00:00 2001 From: Anton Antonov Date: Mon, 19 May 2025 09:45:53 +0100 Subject: [PATCH] parsec-service: update PACKAGECONFIG options as lists of cargo build features After commit 7a2b9acef2 "cargo: pass PACKAGECONFIG_CONFARGS to cargo build" we don't need to include Parsec cargo build features into CARGO_BUILD_FLAGS. Let's update PACKAGECONFIG options as lists of features. A small fix in readme.md as well. Signed-off-by: Anton Antonov Signed-off-by: Scott Murray --- meta-parsec/README.md | 4 ++-- .../parsec-service/parsec-service_1.4.1.bb | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/meta-parsec/README.md b/meta-parsec/README.md index 9dea718..a5472ae 100644 --- a/meta-parsec/README.md +++ b/meta-parsec/README.md @@ -112,7 +112,7 @@ You might need to change permissions or add the account into `kvm` unix group. - Add into your `local.conf`: ``` -INHERIT += "testimage" +IMAGE_CLASSES += "testimage" TEST_SUITES = "ping ssh parsec" ``` - Build your image @@ -129,7 +129,7 @@ bitbake -c testimage - Add into your `local.conf`: ``` DISTRO_FEATURES += " tpm2" -INHERIT += "testimage" +IMAGE_CLASSES += "testimage" TEST_SUITES = "ping ssh parsec" ``` - Build security-parsec-image image diff --git a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.4.1.bb b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.4.1.bb index 49467cd..baa02fb 100644 --- a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.4.1.bb +++ b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.4.1.bb @@ -21,15 +21,12 @@ PACKAGECONFIG ??= "PKCS11 MBED-CRYPTO" have_TPM = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'TPM', '', d)}" PACKAGECONFIG:append = " ${@bb.utils.contains('BBFILE_COLLECTIONS', 'tpm-layer', '${have_TPM}', '', d)}" -PACKAGECONFIG[ALL] = "all-providers cryptoki/generate-bindings tss-esapi/generate-bindings,,tpm2-tss libts,tpm2-tss libtss2-tcti-device libts" -PACKAGECONFIG[TPM] = "tpm-provider tss-esapi/generate-bindings,,tpm2-tss,tpm2-tss libtss2-tcti-device" -PACKAGECONFIG[PKCS11] = "pkcs11-provider cryptoki/generate-bindings," -PACKAGECONFIG[MBED-CRYPTO] = "mbed-crypto-provider," -PACKAGECONFIG[CRYPTOAUTHLIB] = "cryptoauthlib-provider," -PACKAGECONFIG[TS] = "trusted-service-provider,,libts,libts" - -PARSEC_FEATURES = "${@d.getVar('PACKAGECONFIG_CONFARGS').strip().replace(' ', ',')}" -CARGO_BUILD_FLAGS += " --features ${PARSEC_FEATURES}" +PACKAGECONFIG[ALL] = "-F all-providers -F cryptoki/generate-bindings -F tss-esapi/generate-bindings,,tpm2-tss libts,tpm2-tss libtss2-tcti-device libts" +PACKAGECONFIG[TPM] = "-F tpm-provider -F tss-esapi/generate-bindings,,tpm2-tss,tpm2-tss libtss2-tcti-device" +PACKAGECONFIG[PKCS11] = "-F pkcs11-provider -F cryptoki/generate-bindings," +PACKAGECONFIG[MBED-CRYPTO] = "-F mbed-crypto-provider," +PACKAGECONFIG[CRYPTOAUTHLIB] = "-F cryptoauthlib-provider," +PACKAGECONFIG[TS] = "-F trusted-service-provider,,libts,libts" export BINDGEN_EXTRA_CLANG_ARGS target = "${@d.getVar('TARGET_SYS').replace('-', ' ')}"