From 0b3cb32abdb35a774c6c11611720f2b19987af19 Mon Sep 17 00:00:00 2001 From: akash hadke Date: Thu, 9 Jan 2025 16:16:53 +0530 Subject: [PATCH] meta-security: Remove True option to getVar calls getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Signed-off-by: Akash Hadke Signed-off-by: Scott Murray --- meta-integrity/classes/ima-evm-rootfs.bbclass | 2 +- .../recipes-parsec/parsec-service/parsec-service_1.3.0.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-integrity/classes/ima-evm-rootfs.bbclass b/meta-integrity/classes/ima-evm-rootfs.bbclass index 7b73373..8b2e767 100644 --- a/meta-integrity/classes/ima-evm-rootfs.bbclass +++ b/meta-integrity/classes/ima-evm-rootfs.bbclass @@ -59,7 +59,7 @@ ima_evm_sign_rootfs () { # # Deduplicates iversion in case that this gets called more than once. if [ -f etc/fstab ]; then - perl -pi -e 's;(\S+)(\s+)(${@"|".join((d.getVar("IMA_EVM_ROOTFS_IVERSION", True) or "no-such-mount-point").split())})(\s+)(\S+)(\s+)(\S+);\1\2\3\4\5\6\7,iversion;; s/(,iversion)+/,iversion/;' etc/fstab + perl -pi -e 's;(\S+)(\s+)(${@"|".join((d.getVar("IMA_EVM_ROOTFS_IVERSION") or "no-such-mount-point").split())})(\s+)(\S+)(\s+)(\S+);\1\2\3\4\5\6\7,iversion;; s/(,iversion)+/,iversion/;' etc/fstab fi # Detect 32bit target to pass --m32 to evmctl by looking at libc diff --git a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.3.0.bb b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.3.0.bb index 477988e..6887b9f 100644 --- a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.3.0.bb +++ b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.3.0.bb @@ -27,11 +27,11 @@ PACKAGECONFIG[MBED-CRYPTO] = "mbed-crypto-provider," PACKAGECONFIG[CRYPTOAUTHLIB] = "cryptoauthlib-provider," PACKAGECONFIG[TS] = "trusted-service-provider,,libts,libts" -PARSEC_FEATURES = "${@d.getVar('PACKAGECONFIG_CONFARGS',True).strip().replace(' ', ',')}" +PARSEC_FEATURES = "${@d.getVar('PACKAGECONFIG_CONFARGS').strip().replace(' ', ',')}" CARGO_BUILD_FLAGS += " --features ${PARSEC_FEATURES}" export BINDGEN_EXTRA_CLANG_ARGS -target = "${@d.getVar('TARGET_SYS',True).replace('-', ' ')}" +target = "${@d.getVar('TARGET_SYS').replace('-', ' ')}" BINDGEN_EXTRA_CLANG_ARGS = "${@bb.utils.contains('target', 'arm', \ '--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include -mfloat-abi=hard', \ '--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include', \