From 5a22e31b84c405fe787148191dc610dedab02adf Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Wed, 3 Apr 2024 22:51:15 +0000 Subject: [PATCH] luci.mk: include revision in version number Fixes issue mentioned in https://github.com/openwrt/luci/pull/7009#issuecomment-2035504461 where the IPK filename doesn't contain revision from the luci-app Makefile. Signed-off-by: Stan Grishin --- luci.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci.mk b/luci.mk index 12cdd6de901c..c89fea6558e4 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),$(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_PKGARCH),PKGARCH:=$(LUCI_PKGARCH)) $(if $(PKG_PROVIDES),PROVIDES:=$(PKG_PROVIDES))