From 06c4e8a262e4618e61866ed92e296e46a1b6b671 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Tue, 25 Mar 2025 00:20:32 +0200 Subject: [PATCH] include/trusted-firmware-a.mk: support LTS releases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- 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 c329b76c56a..422fc54e84e 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)? +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 -PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +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 @@ -83,7 +91,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))" \ $(TFA_MAKE_FLAGS) endef