luci.mk: Add apk compatibility to PKG_RELEASE handling

Most LuCI packages have automatic versioning, but some
use manual versioning, and compatibility with apk requires
'r' to be added into PKG_RELEASE in style of 1.2.7-r17

Modify luci.mk to behave similarly as the the generic
packages Makefile. Add 'r' prefix to PKG_RELEASE.

Signed-off-by: Hannu Nyman <[email protected]>

diff --git a/luci.mk b/luci.mk
index b5bd6fcd13a899dc85f55566a6be7a9ac7f8dbb6..2d393caea6869d982eeea97ca5f1e882e57af5d3 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),$(if $(PKG_RELEASE),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_VERSION)),$(PKG_SRC_VERSION))
+  VERSION:=$(if $(PKG_VERSION),$(if $(PKG_RELEASE),$(PKG_VERSION)-r$(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))