Skip to content

Commit 10be7a3

Browse files
authored
Merge pull request openwrt#7042 from stangri/master-luci.mk
luci.mk: include release in version number
2 parents 62acdc6 + a9664a7 commit 10be7a3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

luci.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ ifneq ($(LUCI_SUBMENU),none)
153153
endif
154154
TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE))
155155
DEPENDS:=$(LUCI_DEPENDS)
156-
VERSION:=$(if $(PKG_VERSION),$(PKG_VERSION),$(PKG_SRC_VERSION))
156+
VERSION:=$(if $(PKG_VERSION),$(if $(PKG_RELEASE),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_VERSION)),$(PKG_SRC_VERSION))
157157
$(if $(LUCI_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS))
158158
$(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH))
159159
$(if $(PKG_PROVIDES),PROVIDES:=$(PKG_PROVIDES))

0 commit comments

Comments
 (0)