mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-07 04:58:47 +00:00
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 <akash.hadke27@gmail.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com>
This commit is contained in:
committed by
Scott Murray
parent
4f19c6b49a
commit
0b3cb32abd
@@ -59,7 +59,7 @@ ima_evm_sign_rootfs () {
|
|||||||
#
|
#
|
||||||
# Deduplicates iversion in case that this gets called more than once.
|
# Deduplicates iversion in case that this gets called more than once.
|
||||||
if [ -f etc/fstab ]; then
|
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
|
fi
|
||||||
|
|
||||||
# Detect 32bit target to pass --m32 to evmctl by looking at libc
|
# Detect 32bit target to pass --m32 to evmctl by looking at libc
|
||||||
|
|||||||
@@ -27,11 +27,11 @@ PACKAGECONFIG[MBED-CRYPTO] = "mbed-crypto-provider,"
|
|||||||
PACKAGECONFIG[CRYPTOAUTHLIB] = "cryptoauthlib-provider,"
|
PACKAGECONFIG[CRYPTOAUTHLIB] = "cryptoauthlib-provider,"
|
||||||
PACKAGECONFIG[TS] = "trusted-service-provider,,libts,libts"
|
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}"
|
CARGO_BUILD_FLAGS += " --features ${PARSEC_FEATURES}"
|
||||||
|
|
||||||
export BINDGEN_EXTRA_CLANG_ARGS
|
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', \
|
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 -mfloat-abi=hard', \
|
||||||
'--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include', \
|
'--sysroot=${WORKDIR}/recipe-sysroot -I${WORKDIR}/recipe-sysroot/usr/include', \
|
||||||
|
|||||||
Reference in New Issue
Block a user