OpenWrt/openwrt-luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci synced 2025-01-09 04:28:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: luci.mk: honour PKG_VERSION if set

Browse Source 
Also pass correct variable to builds to ensure that version.lua and cache
buster strings are properly interpolated.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-04-11 21:25:19 +02:00
parent 65d673f467
commit 0fa1bce8cf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
luci.mk
View File

@ -102,7 +102,7 @@ define Package/$(PKG_NAME)
SUBMENU:=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app)) SUBMENU:=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app))
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:=$(PKG_SRC_VERSION) VERSION:=$(if $(PKG_VERSION),$(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))
endef endef
@ -152,7 +152,7 @@ endef
ifneq ($(wildcard ${CURDIR}/src/Makefile),) ifneq ($(wildcard ${CURDIR}/src/Makefile),)
MAKE_PATH := src/ MAKE_PATH := src/
MAKE_VARS += FPIC="$(FPIC)" LUCI_VERSION="$(PKG_VERSION)" LUCI_GITBRANCH="$(PKG_GITBRANCH)" MAKE_VARS += FPIC="$(FPIC)" LUCI_VERSION="$(PKG_SRC_VERSION)" LUCI_GITBRANCH="$(PKG_GITBRANCH)"
define Build/Compile define Build/Compile
$(call Build/Compile/Default,clean compile) $(call Build/Compile/Default,clean compile)
@ -189,8 +189,8 @@ endef
define SubstituteVersion define SubstituteVersion
$(FIND) $(1) -type f -name '*.htm' | while read src; do \ $(FIND) $(1) -type f -name '*.htm' | while read src; do \
$(SED) 's/<%# *\([^ ]*\)PKG_VERSION *%>/\1$(PKG_VERSION)/g' \ $(SED) 's/<%# *\([^ ]*\)PKG_VERSION *%>/\1$(if $(PKG_VERSION),$(PKG_VERSION),$(PKG_SRC_VERSION))/g' \
-e 's/"\(<%= *\(media\|resource\) *%>[^"]*\.\(js\|css\)\)"/"\1?v=$(PKG_VERSION)"/g' \ -e 's/"\(<%= *\(media\|resource\) *%>[^"]*\.\(js\|css\)\)"/"\1?v=$(if $(PKG_VERSION),$(PKG_VERSION),$(PKG_SRC_VERSION))"/g' \
"$$$$src"; \ "$$$$src"; \
done done
endef endef