Skip to content

Commit

Permalink
luci.mk: Add apk compatibility to PKG_RELEASE handling
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
hnyman committed Nov 9, 2024
1 parent 96fa870 commit 3847909
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion luci.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 3847909

Please sign in to comment.