[LEDE-DEV] [PATCH] prism54-firmware: change prism54/p54-firmware package versioning

[Christian Lamparter]

There are multiple prism54/p54 firmware versions for different
drivers and devices. Therefore, assigning the package version
of all the different firmware packages on the old prism54
firmware could break if any of the p54 firmwares are updated
and we need to roll out new packages.

Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
---
John and Hauke: How about this? I'm not an expert on LEDE packages.
I'm not sure if both PKG_RELEASE and PKG_VERSION needed an update
or not (I just want it so that the previous packages will be
updated with the new ones). I know that for example "base-files"
only needs PKG_RELEASE, so I'm not sure if PKG_VERSION is
actually needed or not.

So yes: Please fix this (or tell me what to do and more
importantly: tell me what (PKG_VERSION or PKG_RELEASE)
takes precedence over the other and why so?.

Regards,
Christian
---
 package/firmware/prism54-firmware/Makefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/package/firmware/prism54-firmware/Makefile b/package/firmware/prism54-firmware/Makefile
index 32bd289..0aaad62 100644
--- a/package/firmware/prism54-firmware/Makefile
+++ b/package/firmware/prism54-firmware/Makefile
@@ -6,24 +6,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prism54-firmware
-PKG_VERSION:=1.0.4.3
-PKG_RELEASE:=1
-
-PRG_URL:=https://daemonizer.de/prism54/prism54-fw/
+PKG_VERSION:=2.0.0.0
+PKG_RELEASE:=2
 
 # Prism54 FullMAC firmware (jbnore.free.fr seems to be rather slow, so we use daemonizer.de)
-PKG_SOURCE:=$(PKG_VERSION).arm
-PKG_SOURCE_URL:=$(PRG_URL)/fw-fullmac/
-PKG_MD5SUM:=8bd4310971772a486b9784c77f8a6df9
+PRG_URL:=https://daemonizer.de/prism54/prism54-fw/
 
 include $(INCLUDE_DIR)/package.mk
 
 
-# Prism54 drivers
+# PRISM54/P54 firmwares
+PRISM54FW:=1.0.4.3.arm
 P54USBFW:=2.13.24.0.lm87.arm
 P54PCIFW:=2.13.12.0.arm
 P54SPIFW:=2.13.0.0.a.13.14.arm
 
+define Download/prism54-firmware
+  FILE:=$(PRISM54FW)
+  URL:=$(PRG_URL)/fw-fullmac
+  MD5SUM:=8bd4310971772a486b9784c77f8a6df9
+endef
+$(eval $(call Download,prism54-firmware))
+
 define Download/p54-usb-firmware
   FILE:=$(P54USBFW)
   URL:=$(PRG_URL)/fw-usb
@@ -83,7 +87,7 @@ endef
 
 define Package/prism54-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(DL_DIR)/$(PKG_SOURCE) $(1)/lib/firmware/isl3890
+	$(INSTALL_DATA) $(DL_DIR)/$(PRISM54FW) $(1)/lib/firmware/isl3890
 endef
 
 define Package/p54-usb-firmware/install
-- 
2.8.1