From d57027cc02abfb1ecfed8257027297cf5dfa125f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 4 Nov 2020 13:40:05 +0000 Subject: [PATCH] arm/trusted-firmware-a: clean up license assignments trusted-firmware-a.inc can set LIC_FILES_CHKSUM so do += in the .bb files. trusted-firmware-a.inc expects recipes to set LIC_FILES_CHKSUM_MBEDTLS, so just use = in the .bb files. Change-Id: I673aec6f2ae59c58cd11517e1f2aecc538427796 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb index 744ba8ca..2e41e90f 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb @@ -14,7 +14,7 @@ SRCREV_tfa = "ed8112606c54d85781fc8429160883d6310ece32" S = "${WORKDIR}/git" -LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" +LIC_FILES_CHKSUM += "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" # # mbed TLS source @@ -26,7 +26,7 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht # mbed TLS v2.16.2 SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" -LIC_FILES_CHKSUM_MBEDTLS += " \ +LIC_FILES_CHKSUM_MBEDTLS = " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb index 1f36dbcd..96df5c67 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb @@ -14,7 +14,7 @@ SRCREV_tfa = "e1286bdb968ee74fc52f96cf303a4218e1ae2950" S = "${WORKDIR}/git" -LIC_FILES_CHKSUM = "file://license.rst;md5=c709b197e22b81ede21109dbffd5f363" +LIC_FILES_CHKSUM += "file://license.rst;md5=c709b197e22b81ede21109dbffd5f363" # # mbed TLS source @@ -26,7 +26,7 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht # mbed TLS v2.16.2 SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" -LIC_FILES_CHKSUM_MBEDTLS += " \ +LIC_FILES_CHKSUM_MBEDTLS = " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb index cd575395..58e6c8e8 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb @@ -14,7 +14,7 @@ SRCREV_tfa = "7192b956bde11652a835eee0724dca0e403fee90" S = "${WORKDIR}/git" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" # # mbed TLS source @@ -26,7 +26,7 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht # mbed TLS v2.16.2 SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" -LIC_FILES_CHKSUM_MBEDTLS += " \ +LIC_FILES_CHKSUM_MBEDTLS = " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb index 7279173b..d333854c 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb @@ -14,7 +14,7 @@ SRCREV_tfa = "ecd27ad85f1eba29f6bf92c39dc002c85b07dad5" S = "${WORKDIR}/git" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" # # mbed TLS source @@ -26,7 +26,7 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht # mbed TLS v2.18.1 SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a" -LIC_FILES_CHKSUM_MBEDTLS += " \ +LIC_FILES_CHKSUM_MBEDTLS = " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb index c443ecd6..6adc00ba 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb @@ -15,7 +15,7 @@ SRCREV_FORMAT = "tfa" S = "${WORKDIR}/git" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" # # mbed TLS source @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89 SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls" -LIC_FILES_CHKSUM_MBEDTLS += " \ +LIC_FILES_CHKSUM_MBEDTLS = " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ "