luci.mk: include release in version number

Fixes issue mentioned in https://github.com/openwrt/luci/pull/7009#issuecomment-2035504461
where the IPK filename doesn't contain release from the luci-app Makefile.

Signed-off-by: Stan Grishin <stangri@melmac.ca>

diff --git a/luci.mk b/luci.mk
index 12cdd6de901cfa5dbda1f119afd8f715018f6de2..c89fea6558e4e32553f63f9e88b5209077dca0be 100644 (file)
--- a/luci.mk
+++ b/luci.mk
@@ -153,7 +153,7 @@ ifneq ($(LUCI_SUBMENU),none)
 endif
   TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE))
   DEPENDS:=$(LUCI_DEPENDS)
-  VERSION:=$(if $(PKG_VERSION),$(PKG_VERSION),$(PKG_SRC_VERSION))
+  VERSION:=$(if $(PKG_VERSION),$(if $(PKG_RELEASE),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_VERSION)),$(PKG_SRC_VERSION))
   $(if $(LUCI_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS))
   $(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH))
   $(if $(PKG_PROVIDES),PROVIDES:=$(PKG_PROVIDES))