From 24379d7e7fd675b1ae28a3829f9c0dfc32dbb019 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 28 Aug 2020 11:15:42 +0100 Subject: [PATCH] arm/trusted-firmware-a: actually add mbedtls to SRC_URI trusted-firmware-a.inc was conditionally adding the Mbed TLS tarball to SRC_URI, but all of the versioned recipes subsequently assigned over the top of it so the Mbed TLS tarball was never actually in SRC_URI. This resulted in machine overrides needing to add the tarball themselves. Solve by using _append so that the SRC_URI is actually changed. Change-Id: I05cf1dec2c6422a40a42c615fb2b9b6e8d6f1cb0 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index e1cffdfb..7845dac6 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -38,7 +38,7 @@ 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 += "${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}" +SRC_URI_append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}" # add mbed TLS chksum LIC_FILES_CHKSUM += "${@bb.utils.contains('TFA_MBEDTLS', '1', '${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}" # add mbed TLS to version