From 0ccaae26621e963e92ed1ad0d599caa357308d90 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 30 May 2026 19:33:51 +0200 Subject: [PATCH] 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 Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit e60515bbf51998a1ce098d7ea1683a67aff50de8) Signed-off-by: Thomas Perale --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 65a189dbf7..87c16b6073 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -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