Message ID | 20201104134006.1121416-1-ross.burton@arm.com |
---|---|
State | New |
Headers | show |
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 744ba8c..2e41e90 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 1f36dbc..96df5c6 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 cd57539..58e6c8e 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 7279173..d333854 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 c443ecd..6adc00b 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 \ "
On Wed, Nov 04, 2020 at 01:40:05PM +0000, Ross Burton wrote: > 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 <ross.burton@arm.com> Applied to master. Thanks, Jon > --- > .../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 744ba8c..2e41e90 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 1f36dbc..96df5c6 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 cd57539..58e6c8e 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 7279173..d333854 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 c443ecd..6adc00b 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 \ > " > -- > 2.25.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#1337): https://lists.yoctoproject.org/g/meta-arm/message/1337 Mute This Topic: https://lists.yoctoproject.org/mt/78028542/1003190 Group Owner: meta-arm+owner@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org] -=-=-=-=-=-=-=-=-=-=-=-
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 <ross.burton@arm.com> --- .../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(-) -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#1335): https://lists.yoctoproject.org/g/meta-arm/message/1335 Mute This Topic: https://lists.yoctoproject.org/mt/78028542/1003190 Group Owner: meta-arm+owner@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org] -=-=-=-=-=-=-=-=-=-=-=-