boot/arm-trusted-firmware: correct cpe-id version logic
PATCH 1/1 boot/arm-trusted-firmware: correct cpe-id version logic
Commit 53bb7eafb2 ("package/arm-trusted-firmware: add ARM_TRUSTED_FIRMWARE_CPE_ID_*") added logic to set the cpe-id version from the package version by dropping a v or lts- prefix, but it used subst instead of patsubst - So it would replace "v" and "lts-" anywhere in the version and not only in the beginning of it.
Change to patsubst to fix that.
E.G. with the following defconfig:
BR2_aarch64=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="version-with-v-or-lts-in-it"
before:
make printvars VARS=ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION=ersion-with--or-in-it
after:
make printvars VARS=ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION=ersion-with-v-or-lts-in-it
--- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
boot/arm-trusted-firmware/arm-trusted-firmware.mk +1 -1
@@ -8,7 +8,7 @@ ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_V ARM_TRUSTED_FIRMWARE_CPE_ID_PREFIX = cpe:2.3:o ARM_TRUSTED_FIRMWARE_CPE_ID_VENDOR = arm ARM_TRUSTED_FIRMWARE_CPE_ID_PRODUCT = trusted_firmware-a -ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION = $(subst v,,$(subst lts-,,$(ARM_TRUSTED_FIRMWARE_VERSION))) +ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION = $(patsubst v%,%,$(patsubst lts-%,%,$(ARM_TRUSTED_FIRMWARE_VERSION))) ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y) # Handle custom ATF tarballs as specified by the configuration
Signature · 6 lines
2.47.3 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 18 lines · Peter Korsgaard
Commit
53bb7eafb2("package/arm-trusted-firmware: add ARM_TRUSTED_FIRMWARE_CPE_ID_*") added logic to set the cpe-id version from the package version by dropping a v or lts- prefix, but it used subst instead of patsubst - So it would replace "v" and "lts-" anywhere in the version and not only in the beginning of it.Change to patsubst to fix that.
E.G. with the following defconfig:
BR2_aarch64=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="version-with-v-or-lts-in-it"before:
make printvars VARS=ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION=ersion-with--or-in-it
Quoted 5 lines
after:
make printvars VARS=ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION=ersion-with-v-or-lts-in-itSigned-off-by Peter Korsgaard <[email protected]>
Applied to master, thanks.
Regards,
Arnout
Quoted 9 lines
--- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)boot/arm-trusted-firmware/arm-trusted-firmware.mk +0
-0
boot/arm-trusted-firmware/arm-trusted-firmware.mk ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_V · line 14
Quoted 8 lines
boot/arm-trusted-firmware/arm-trusted-firmware.mk +1
-1@@ -8,7 +8,7 @@ ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_V ARM_TRUSTED_FIRMWARE_CPE_ID_PREFIX = cpe:2.3:o ARM_TRUSTED_FIRMWARE_CPE_ID_VENDOR = arm ARM_TRUSTED_FIRMWARE_CPE_ID_PRODUCT = trusted_firmware-a -ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION = $(subst v,,$(subst lts-,,$(ARM_TRUSTED_FIRMWARE_VERSION))) +ARM_TRUSTED_FIRMWARE_CPE_ID_VERSION = $(patsubst v%,%,$(patsubst lts-%,%,$(ARM_TRUSTED_FIRMWARE_VERSION))) ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y) # Handle custom ATF tarballs as specified by the configuration
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot