| Message ID | 20210924162349.2802374-1-quentin.schulz@theobroma-systems.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | boot/arm-trusted-firmware: point LICENSE_FILES to correct file | expand |
>>>>> "Quentin" == Quentin Schulz <quentin.schulz@theobroma-systems.com> writes: > Since v2.2 release (commits 8cc36aec912 "doc: De-duplicate readme and > license files" and 9f1622b018ab "doc: Move content out of readme and > create new index page "), the license.rst file at the root of the git > repo is only telling to look at docs/license.rst file. > Let's point the ARM_TRUSTED_FIRMWARE_LICENSE_FILES to the correct file > and modify the .hash file accordingly. > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks. For 2021.02.x / 2021.05.x I updated the license hash to match the version we use there (v2.4).
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 1ab50a9e28..80402ec374 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 d12a824afcc5cb90d005f9820f3274f1319cef1bb282e40a6a190b75900206d3 arm-trusted-firmware-v2.5.tar.gz -sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164 license.rst +sha256 0171b0795501ee90634fbc4a7835e2fb215d9423daf1cf5b0d0682adde12c597 docs/license.rst diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 9d44a5df06..001121477a 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -21,7 +21,7 @@ ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(AR # This is valid only for the official v1.4. ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause -ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst +ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif
Since v2.2 release (commits 8cc36aec912 "doc: De-duplicate readme and license files" and 9f1622b018ab "doc: Move content out of readme and create new index page "), the license.rst file at the root of the git repo is only telling to look at docs/license.rst file. Let's point the ARM_TRUSTED_FIRMWARE_LICENSE_FILES to the correct file and modify the .hash file accordingly. Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> --- boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)