[openwrt/openwrt] include/trusted-firmware-a.mk: support LTS releases

LEDE Commits lede-commits at lists.infradead.org
Mon Jun 16 06:40:52 PDT 2025


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/a4f56aca810c80803b85c996e0b7decfb2eeb6b4

commit a4f56aca810c80803b85c996e0b7decfb2eeb6b4
Author: Stijn Tintel <stijn at linux-ipv6.be>
AuthorDate: Tue Mar 25 00:20:32 2025 +0200

    include/trusted-firmware-a.mk: support LTS releases
    
    TF-A LTS releases have an lts- prefix in their version tag. Introduce a
    PKG_LTS variable to support these.
    
    As the non-LTS tarbals do not contain the version prefix in the
    directory, we need different PKG_BUILD_DIR for each variant:
    
    ➜ tar --list --file dl/trusted-firmware-a-v2.12.tar.gz  | head -n1
    trusted-firmware-a-2.12/
    ➜ tar --list --file dl/trusted-firmware-a-lts-v2.12.1.tar.gz  | head -n1
    trusted-firmware-a-lts-v2.12.1/
    
    Signed-off-by: Stijn Tintel <stijn at linux-ipv6.be>
    cherry picked from commit 06c4e8a262e4618e61866ed92e296e46a1b6b671
    Signed-off-by: Thomas Richard <thomas.richard at bootlin.com>
    Link: https://github.com/openwrt/openwrt/pull/19076
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 include/trusted-firmware-a.mk | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/include/trusted-firmware-a.mk b/include/trusted-firmware-a.mk
index 40c9023f1d..521225fa28 100644
--- a/include/trusted-firmware-a.mk
+++ b/include/trusted-firmware-a.mk
@@ -1,12 +1,20 @@
 PKG_NAME ?= trusted-firmware-a
 PKG_CPE_ID ?= cpe:/a:arm:trusted_firmware-a
 
-ifndef PKG_SOURCE_PROTO
-PKG_SOURCE = trusted-firmware-a-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/TrustedFirmware-A/trusted-firmware-a/tar.gz/v$(PKG_VERSION)?
-endif
+PKG_LTS ?=
 
+ifneq ($(PKG_LTS),)
+PKG_VERSION_PREFIX:=lts-v
+PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION_PREFIX)$(PKG_VERSION)
+else
+PKG_VERSION_PREFIX:=v
 PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+endif
+
+ifndef PKG_SOURCE_PROTO
+PKG_SOURCE = trusted-firmware-a-$(PKG_VERSION_PREFIX)$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/TrustedFirmware-A/trusted-firmware-a/tar.gz/$(PKG_VERSION_PREFIX)$(PKG_VERSION)?
+endif
 
 PKG_TARGETS := bin
 PKG_FLAGS:=nonshared
@@ -82,7 +90,7 @@ define Build/Compile/Trusted-Firmware-A
 		OPENSSL_DIR=$(STAGING_DIR_HOST) \
 		$(if $(DTC),DTC="$(DTC)") \
 		PLAT=$(PLAT) \
-		BUILD_STRING="OpenWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
+		BUILD_STRING="OpenWrt $(PKG_VERSION_PREFIX)$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
 		$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 		$(TFA_MAKE_FLAGS)
 endef




More information about the lede-commits mailing list