boot/arm-trusted-firmware: ignore licencing check for user defined official version
PATCH 1/1 boot/arm-trusted-firmware: ignore licencing check for user defined official version
The commit [1] "licensing info is only valid for v1.4" fixed the legal-info issues when a custom ATF tarball or a version from git is used. But we need to ignore licencing for a used defined official ATF version.
Althougt the ATF version are licensed under BSD-3-Clause, the license file can be updated between version (for example between v1.4 and v2.0).
Ignore the licencing check if the user provide a custom official version.
[1] d1a61703f728340ec894c367398d2a3a394a3360
---
This can be reproduced by loading qemu_arm_vexpress_tz_defconfig followed by make legal-info.
--- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 ++ 1 file changed, 2 insertions(+)
boot/arm-trusted-firmware/arm-trusted-firmware.mk +2 -0
@@ -19,9 +19,11 @@ else ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) # The licensing of custom or from-git versions is unknown. # This is valid only for the official v1.4. +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION),) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst endif +endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE)
Signature · 1 line
2.25.4
Yann E. MORIN
AppliedPATCH 1/1 boot/arm-trusted-firmware: ignore licencing check for user defined official version
romain, All,
On 2020-05-30 19:07 +0200, Romain Naour spake thusly:
Quoted 7 lines
The commit [1] "licensing info is only valid for v1.4" fixed the legal-info issues when a custom ATF tarball or a version from git is used. But we need to ignore licencing for a used defined official ATF version.
Althougt the ATF version are licensed under BSD-3-Clause, the license file can be updated between version (for example between v1.4 and v2.0).
Quoted 6 lines
Ignore the licencing check if the user provide a custom official version.
[1]
d1a61703f728340ec894c367398d2a3a394a3360Signed-off-by Romain Naour <[email protected]>Cc Yann E. MORIN <[email protected]>
Applied to master, thanks.
But see below...
Quoted 12 lines
---
This can be reproduced by loadingqemu_arm_vexpress_tz_defconfigfollowed by make legal-info.--- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 ++ 1 file changed, 2 insertions(+)boot/arm-trusted-firmware/arm-trusted-firmware.mk +0
-0
boot/arm-trusted-firmware/arm-trusted-firmware.mk else · line 22
Quoted 4 lines
boot/arm-trusted-firmware/arm-trusted-firmware.mk +1
-0@@ -19,9 +19,11 @@ else ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) # The licensing of custom or from-git versions is unknown. # This is valid only for the official v1.4. +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION),)
I've switched to using positive logic, with the _LATEST _variable, which makese the condition even more explicit, too:
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y)
Regards,
Yann E. MORIN.
Quoted 10 lines
boot/arm-trusted-firmware/arm-trusted-firmware.mk +1
-0ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst endif +endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE)Signature · 1 line
2.25.4
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 boot/arm-trusted-firmware: ignore licencing check for user defined official version
In reply to Romain NaourQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
The commit [1] "licensing info is only valid for v1.4" fixed the legal-info issues when a custom ATF tarball or a version from git is used. But we need to ignore licencing for a used defined official ATF version.
Althougt the ATF version are licensed under BSD-3-Clause, the license file can be updated between version (for example between v1.4 and v2.0).
Quoted 6 lines
Ignore the licencing check if the user provide a custom official version.
[1]
d1a61703f728340ec894c367398d2a3a394a3360Signed-off-by Romain Naour <[email protected]>Cc Yann E. MORIN <[email protected]>
Committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard