From 62bb67b1e7cbc03b170f3f05e811f35347d26199 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 25 May 2021 10:07:23 +0100 Subject: [PATCH] arm/trusted-firmware-a: fix incorrect license checksum TF-A 2.5 has a tweaked license.rst file but the checksum wasn't updated. The CI didn't catch this because of an attempt at making warnings fatal, which has the side effect of masking some warnings. Update the checksum for that file, and add MIT explicitly to the license list as all of the embedded projects are used under the MIT. Change-Id: Id39b4c49c0efae30c6452e77b1cdf56e43b792d4 Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 2 +- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 67a5cd37..33ae64bb 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 @@ -1,5 +1,5 @@ DESCRIPTION = "Trusted Firmware-A" -LICENSE = "BSD-3-Clause" +LICENSE = "BSD-3-Clause & MIT" PROVIDES = "virtual/trusted-firmware-a" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb index dded0034..15e689a8 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb @@ -6,7 +6,7 @@ SRCREV_FORMAT = "tfa" # TF-A v2.5 SRCREV_tfa = "1e13c500a0351ac4b55d09a63f7008e2438550f8" -LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=713afe122abbe07f067f939ca3c480c5" # mbed TLS v2.26.0 SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master"