From 174edae00a4efef4e4930fa6433a0ce5e8286472 Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Sat, 22 Jun 2024 16:10:49 -0400 Subject: [PATCH] nss-firmware: fix building for IPQ60XX/IPQ50XX Remove the $(NSS_ARCHIVE) variable that conflicts with building for platforms other than IPQ807X. NSS_ARCHIVE is getting evaluated on very first platform, rather than each platform. This was primarily meant for externally hosted NSS firmware, but was mostly used internally. Can be safely removed. Reported-by: Shi Jiay (shi05275@gmail.com) Signed-off-by: Sean Khan --- firmware/nss-firmware/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/nss-firmware/Makefile b/firmware/nss-firmware/Makefile index 31911fc..be14105 100644 --- a/firmware/nss-firmware/Makefile +++ b/firmware/nss-firmware/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=nss-firmware PKG_SOURCE_DATE:=2022-07-12 PKG_SOURCE_VERSION:=ade6bff5 PKG_MIRROR_HASH:=6652eea8941a0db28f983fa450b28ffaae332e4494c21cb9dbfe4648568db28d -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/quic/qca-sdk-nss-fw.git @@ -99,9 +99,9 @@ define Build/Compile endef define Package/nss-firmware/install - $(eval NSS_ARCHIVE ?= $(VERSION_PATH)/$(IPQ_PLATFORM).ATH.$(NSS_MAJOR)/BIN-NSS*.$(NSS_MINOR)-$(NSS_REL)*$(NSS_PROFILE).tar.bz2) $(INSTALL_DIR) $(PKG_BUILD_DIR)/$(IPQ_PLATFORM) - $(TAR) -C $(PKG_BUILD_DIR)/$(IPQ_PLATFORM) -xf $(NSS_ARCHIVE) --strip-components=1 + $(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/$(IPQ_PLATFORM) -xf \ + $(VERSION_PATH)/$(IPQ_PLATFORM).ATH.$(NSS_MAJOR)/BIN-NSS*.$(NSS_MINOR)-$(NSS_REL)*$(NSS_PROFILE).tar.bz2 $(INSTALL_DIR) $(1)/lib/firmware/ $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/$(IPQ_PLATFORM)/retail_router0.bin \ @@ -114,15 +114,15 @@ endif endef define Package/nss-firmware-ipq8074/install - $(call Package/nss-firmware/install,$1) + $(call Package/nss-firmware/install,$(1)) endef define Package/nss-firmware-ipq6018/install - $(call Package/nss-firmware/install,$1) + $(call Package/nss-firmware/install,$(1)) endef define Package/nss-firmware-ipq5018/install - $(call Package/nss-firmware/install,$1) + $(call Package/nss-firmware/install,$(1)) endef define Package/nss-firmware-default/install