Merge pull request #7042 from stangri/master-luci.mk

luci.mk: include release in version number
This commit is contained in:
Hannu Nyman
2024-04-13 10:58:20 +03:00
committed by GitHub

View File

@@ -153,7 +153,7 @@ ifneq ($(LUCI_SUBMENU),none)
endif endif
TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE)) TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE))
DEPENDS:=$(LUCI_DEPENDS) 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_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS))
$(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH)) $(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH))
$(if $(PKG_PROVIDES),PROVIDES:=$(PKG_PROVIDES)) $(if $(PKG_PROVIDES),PROVIDES:=$(PKG_PROVIDES))