him411/nss-packages-qosmio
1
0
Fork 0
mirror of https://github.com/qosmio/nss-packages.git synced 2025-12-16 16:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss-firmware: bugfix empty packages due to incorrect inheritance

Browse Source 
The previous refactor (32dd47ec) attempted to use a common definition
block (`nss-firmware-common`) for package metadata and builds.
However, the way it was referenced (`$(nss-firmware-common)`) didn't
work for inheriting properties like TITLE, SECTION, CATEGORY, or
the install logic via `$(call ...)` within the sub-package definitions.

This resulted in the platform-specific packages
(`ipq807x`, `ipq60xx`, `ipq50xx`) being built without any firmwares
leading to empty `.ipk` files and failure to boot.

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2025-04-18 02:29:23 -04:00
parent a3692762e9
commit 3584692072
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/nss-firmware/Makefile
View File

@ -33,7 +33,7 @@ STRIP:=:
NSS_PROFILE:=R NSS_PROFILE:=R
define nss-firmware-common define Package/nss-firmware-common
TITLE:=NSS firmware TITLE:=NSS firmware
SECTION:=firmware SECTION:=firmware
CATEGORY:=Firmware CATEGORY:=Firmware
@ -42,27 +42,27 @@ define nss-firmware-common
endef endef
define Package/nss-firmware define Package/nss-firmware
$(nss-firmware-common) $(call Package/nss-firmware-common,$(1))
DEPENDS+= +TARGET_qualcommax_ipq807x:nss-firmware-ipq807x \ DEPENDS+= +TARGET_qualcommax_ipq807x:nss-firmware-ipq807x \
+TARGET_qualcommax_ipq60xx:nss-firmware-ipq60xx \ +TARGET_qualcommax_ipq60xx:nss-firmware-ipq60xx \
+TARGET_qualcommax_ipq50xx:nss-firmware-ipq50xx +TARGET_qualcommax_ipq50xx:nss-firmware-ipq50xx
endef endef
define Package/nss-firmware-ipq807x define Package/nss-firmware-ipq807x
$(nss-firmware-common) $(call Package/nss-firmware-common,$(1))
IPQ_PLATFORM=IPQ8074 IPQ_PLATFORM=IPQ8074
NSS_SOC:=HK NSS_SOC:=HK
endef endef
define Package/nss-firmware-ipq60xx define Package/nss-firmware-ipq60xx
$(nss-firmware-common) $(call Package/nss-firmware-common,$(1))
IPQ_PLATFORM=IPQ6018 IPQ_PLATFORM=IPQ6018
CONFLICTS=nss-firmware-ipq807x CONFLICTS=nss-firmware-ipq807x
NSS_SOC:=CP NSS_SOC:=CP
endef endef
define Package/nss-firmware-ipq50xx define Package/nss-firmware-ipq50xx
$(nss-firmware-common) $(call Package/nss-firmware-common,$(1))
IPQ_PLATFORM=IPQ5018 IPQ_PLATFORM=IPQ5018
CONFLICTS=nss-firmware-ipq807x nss-firmware-ipq60xx CONFLICTS=nss-firmware-ipq807x nss-firmware-ipq60xx
NSS_SOC:=MP NSS_SOC:=MP
@ -84,6 +84,7 @@ define Package/nss-firmware/config
config NSS_FIRMWARE_VERSION_12_2 config NSS_FIRMWARE_VERSION_12_2
bool "NSS Firmware 12.2 Release 161" bool "NSS Firmware 12.2 Release 161"
depends on !TARGET_qualcommax_ipq50xx
help help
This version does NOT work with NSS MESH (802.11s) This version does NOT work with NSS MESH (802.11s)
@ -125,7 +126,7 @@ endif
define Build/Compile define Build/Compile
endef endef
define Package/nss-firmware/install define Package/nss-firmware-common/install
$(INSTALL_DIR) $(PKG_BUILD_DIR)/$(IPQ_PLATFORM) $(INSTALL_DIR) $(PKG_BUILD_DIR)/$(IPQ_PLATFORM)
$(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/$(IPQ_PLATFORM) -xf \ $(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/$(IPQ_PLATFORM) -xf \
$(VERSION_PATH)/$(IPQ_PLATFORM).ATH.$(NSS_MAJOR).$(NSS_MINOR)/BIN-NSS*.$(NSS_MAJOR).$(NSS_MINOR)*-$(NSS_REL)*$(NSS_PROFILE).tar.bz2 $(VERSION_PATH)/$(IPQ_PLATFORM).ATH.$(NSS_MAJOR).$(NSS_MINOR)/BIN-NSS*.$(NSS_MAJOR).$(NSS_MINOR)*-$(NSS_REL)*$(NSS_PROFILE).tar.bz2
@ -141,15 +142,15 @@ endif
endef endef
define Package/nss-firmware-ipq807x/install define Package/nss-firmware-ipq807x/install
$(call Package/nss-firmware/install,$(1)) $(call Package/nss-firmware-common/install,$(1))
endef endef
define Package/nss-firmware-ipq60xx/install define Package/nss-firmware-ipq60xx/install
$(call Package/nss-firmware/install,$(1)) $(call Package/nss-firmware-common/install,$(1))
endef endef
define Package/nss-firmware-ipq50xx/install define Package/nss-firmware-ipq50xx/install
$(call Package/nss-firmware/install,$(1)) $(call Package/nss-firmware-common/install,$(1))
endef endef
define Package/nss-firmware/install define Package/nss-firmware/install