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 <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2024-11-09 21:10:12 +02:00
parent 96fa870979
commit 384790944d

View File

@ -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))