[meta-arm,2/2] arm/trusted-firmware-a: ensure LICENSE is correct
Submitted by Ross Burton on Nov. 4, 2020, 1:40 p.m.
|
Patch ID: 178148
Details
Commit Message
@@ -1,5 +1,5 @@
DESCRIPTION = "Trusted Firmware-A"
-LICENSE = "BSD & Apache-2.0"
+LICENSE = "BSD-3-Clause"
PROVIDES = "virtual/trusted-firmware-a"
@@ -39,8 +39,9 @@ SRC_URI_MBEDTLS ??= ""
LIC_FILES_CHKSUM_MBEDTLS ??= ""
# add MBEDTLS to our sources if activated
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)}"
+# 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)}"
# add mbed TLS to version
SRCREV_FORMAT_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
TF-A itself is BSD 3-clause licensed, so use that instead of the generic BSD license. The end result is only also Apache-2.0 licensed if mbed TLS is used, so add this only if mbed TLS is enabled. Change-Id: I243e664dcfc590d8b2dbe7b795bc414a973b379b Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#1334): https://lists.yoctoproject.org/g/meta-arm/message/1334 Mute This Topic: https://lists.yoctoproject.org/mt/78028541/1003190 Group Owner: meta-arm+owner@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org] -=-=-=-=-=-=-=-=-=-=-=-