@@ -51,12 +51,12 @@ SRC_URI_MBEDTLS ??= ""
# This should be set to MBEDTLS LIC FILES checksum
LIC_FILES_CHKSUM_MBEDTLS ??= ""
# add MBEDTLS to our sources if activated
-SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}"
+SRC_URI += "${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}"
# Update license variables
-LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}"
-LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
+LICENSE += "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}"
+LIC_FILES_CHKSUM += "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
# add mbed TLS to version
-SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
+SRCREV_FORMAT += "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
# U-boot support (set TFA_UBOOT to 1 to activate)
# When U-Boot support is activated BL33 is activated with u-boot.bin file
@@ -1,5 +1,5 @@
# Include a backport kernel patch for TEE driver
-SRC_URI:append = " \
+SRC_URI += " \
file://Add-sec_world_id-to-struct-tee_shm.patch \
- "
+"
@@ -1,6 +1,6 @@
FILESEXTRAPATHS:prepend := "${ARMFILESPATHS}"
# Enable ARM-FFA transport
-SRC_URI:append = " \
+SRC_URI += " \
file://arm-ffa-transport.cfg \
- "
+"
@@ -1,13 +1,10 @@
FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
-DEPENDS:append = "\
- ${@bb.utils.contains('MACHINE_FEATURES', \
- 'optee-ftpm', \
- 'optee-ftpm', \
- '' , \
- d)}"
+DEPENDS += "\
+ ${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', 'optee-ftpm', '' , d)} \
+"
-EXTRA_OEMAKE:append = "\
+EXTRA_OEMAKE += "\
${@bb.utils.contains('MACHINE_FEATURES', \
'optee-ftpm', \
'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', \
@@ -16,13 +16,12 @@ DEPENDS = "python3-pyelftools-native python3-cryptography-native"
DEPENDS:append:toolchain-clang = " compiler-rt"
-SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
-
-SRC_URI:append = " \
+SRC_URI = "\
+ git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https \
file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
file://0007-allow-setting-sysroot-for-clang.patch \
file://0008-no-warn-rwx-segments.patch \
- "
+"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
@@ -10,45 +10,45 @@ TS_ENV = "opteesp"
TS_BIN = "${RECIPE_SYSROOT}/usr/${TS_ENV}/bin"
# ITS SP
-DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-its', \
- ' ts-sp-its', '' , d)}"
-SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-its', \
- ' ${TS_BIN}/${ITS_UUID}.stripped.elf', '', d)}"
+DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-its', \
+ ' ts-sp-its', '' , d)}"
+SP_PATHS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-its', \
+ ' ${TS_BIN}/${ITS_UUID}.stripped.elf', '', d)}"
# Storage SP
-DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-storage', \
- ' ts-sp-storage', '' , d)}"
-SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-storage', \
- ' ${TS_BIN}/${STORAGE_UUID}.stripped.elf', '', d)}"
+DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-storage', \
+ ' ts-sp-storage', '' , d)}"
+SP_PATHS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-storage', \
+ ' ${TS_BIN}/${STORAGE_UUID}.stripped.elf', '', d)}"
# Crypto SP.
-DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-crypto', \
- ' ts-sp-crypto', '' , d)}"
-SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-crypto', \
- ' ${TS_BIN}/${CRYPTO_UUID}.stripped.elf', '', d)}"
+DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-crypto', \
+ ' ts-sp-crypto', '' , d)}"
+SP_PATHS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-crypto', \
+ ' ${TS_BIN}/${CRYPTO_UUID}.stripped.elf', '', d)}"
# Attestation SP
-DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-attestation', \
- ' ts-sp-attestation', '' , d)}"
-SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-attestation', \
- ' ${TS_BIN}/${ATTESTATION_UUID}.stripped.elf', '', d)}"
+DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-attestation', \
+ ' ts-sp-attestation', '' , d)}"
+SP_PATHS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-attestation', \
+ ' ${TS_BIN}/${ATTESTATION_UUID}.stripped.elf', '', d)}"
# Env-test SP
-DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-env-test', \
- ' ts-sp-env-test', '' , d)}"
-SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-env-test', \
- ' ${TS_BIN}/${ENV_TEST_UUID}.stripped.elf', '', d)}"
+DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-env-test', \
+ ' ts-sp-env-test', '' , d)}"
+SP_PATHS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-env-test', \
+ ' ${TS_BIN}/${ENV_TEST_UUID}.stripped.elf', '', d)}"
# SE-Proxy SP
-DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-se-proxy', \
- ' ts-sp-se-proxy', '' , d)}"
-SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-se-proxy', \
- ' ${TS_BIN}/${SE_PROXY_UUID}.stripped.elf', '', d)}"
+DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-se-proxy', \
+ ' ts-sp-se-proxy', '' , d)}"
+SP_PATHS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-se-proxy', \
+ ' ${TS_BIN}/${SE_PROXY_UUID}.stripped.elf', '', d)}"
# SMM Gateway
-DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
- ' ts-sp-smm-gateway', '' , d)}"
-SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
- ' ${TS_BIN}/${SMM_GATEWAY_UUID}.stripped.elf', '', d)}"
+DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
+ ' ts-sp-smm-gateway', '' , d)}"
+SP_PATHS += "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
+ ' ${TS_BIN}/${SMM_GATEWAY_UUID}.stripped.elf', '', d)}"
-EXTRA_OEMAKE:append = "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_SECURE_PARTITION=y SP_PATHS="${SP_PATHS}" ', d)}"
+EXTRA_OEMAKE += "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_SECURE_PARTITION=y SP_PATHS="${SP_PATHS}" ', d)}"
@@ -14,13 +14,12 @@ DEPENDS = "python3-pyelftools-native python3-cryptography-native"
DEPENDS:append:toolchain-clang = " compiler-rt"
-SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
-
-SRC_URI:append = " \
+SRC_URI = " \
+ git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https \
file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
file://0007-allow-setting-sysroot-for-clang.patch \
file://0008-no-warn-rwx-segments.patch \
- "
+"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
@@ -5,8 +5,8 @@ DEPENDS += "dtc-native"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-3.18.0:"
SRCREV = "1ee647035939e073a2e8dddb727c0f019cc035f1"
-SRC_URI:append = " \
+SRC_URI += " \
file://0001-core-Define-section-attributes-for-clang.patch \
file://0009-add-z-execstack.patch \
file://0010-add-note-GNU-stack-section.patch \
- "
+"
@@ -4,6 +4,6 @@ DEPENDS += "dtc-native"
SRCREV = "afacf356f9593a7f83cae9f96026824ec242ff52"
-SRC_URI:append = " \
- file://0001-core-Define-section-attributes-for-clang.patch \
- "
+SRC_URI += " \
+ file://0001-core-Define-section-attributes-for-clang.patch \
+"
@@ -1,8 +1,8 @@
require optee-test.inc
-SRC_URI:append = " \
+SRC_URI += " \
file://musl-workaround.patch \
- "
+"
SRCREV = "da5282a011b40621a2cf7a296c11a35c833ed91b"
EXTRA_OEMAKE:append:libc-musl = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}"
@@ -13,7 +13,7 @@ require trusted-services-src.inc
# By default bitbake includes only ${S} (i.e git/trusted-services) in the maps.
# We also need to include the TS dependencies source trees.
-DEBUG_PREFIX_MAP:append = "-fmacro-prefix-map=${WORKDIR}/git=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+DEBUG_PREFIX_MAP += "-fmacro-prefix-map=${WORKDIR}/git=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
-fdebug-prefix-map=${WORKDIR}/git=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
"
:append is hard to override in product specific layers so use += when possible. Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> --- .../trusted-firmware-a/trusted-firmware-a.inc | 8 +-- .../recipes-kernel/linux/arm-ffa-5.15.inc | 4 +- .../linux/arm-ffa-transport.inc | 4 +- .../optee-ftpm/optee-os_%.bbappend | 11 ++-- .../recipes-security/optee/optee-os-3_19.inc | 7 +-- .../recipes-security/optee/optee-os-ts.inc | 58 +++++++++---------- meta-arm/recipes-security/optee/optee-os.inc | 7 +-- .../recipes-security/optee/optee-os_3.18.0.bb | 4 +- .../recipes-security/optee/optee-os_3.19.0.bb | 6 +- .../optee/optee-test_3.18.0.bb | 4 +- .../trusted-services/trusted-services.inc | 2 +- 11 files changed, 55 insertions(+), 60 deletions(-)