From 384790944d7c77819a4d0875156a41114239729d Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 9 Nov 2024 21:10:12 +0200 Subject: [PATCH] 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 --- luci.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci.mk b/luci.mk index b5bd6fcd13..2d393caea6 100644 --- 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)) -- 2.30.2