X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=luci.mk;h=5b32dab2ffd904a346706975b4b358cf26611a71;hp=1e56edde508a02190e69f05c157c244617140757;hb=7553654bb10af9206cff9837a485b828d1998213;hpb=ac9b31ca462b5662e98a0ac6b57fb49c4c4e32de diff --git a/luci.mk b/luci.mk index 1e56edde5..5b32dab2f 100644 --- a/luci.mk +++ b/luci.mk @@ -66,6 +66,19 @@ PKG_VERSION?=$(if $(DUMP),x,$(strip $(shell \ echo "$$revision" \ ))) +PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \ + variant="LuCI"; \ + if git log -1 >/dev/null 2>/dev/null; then \ + branch="$$(git symbolic-ref --short -q HEAD 2>/dev/null)"; \ + if [ "$$branch" != "master" ]; then \ + variant="LuCI $$branch branch"; \ + else \ + variant="LuCI Master"; \ + fi; \ + fi; \ + echo "$$variant" \ +))) + PKG_RELEASE?=1 PKG_INSTALL:=$(if $(realpath src/Makefile),1) PKG_BUILD_DEPENDS += lua/host luci-base/host $(LUCI_BUILD_DEPENDS) @@ -121,7 +134,7 @@ endef ifneq ($(wildcard ${CURDIR}/src/Makefile),) MAKE_PATH := src/ - MAKE_VARS += FPIC="$(FPIC)" LUCI_VERSION="$(PKG_VERSION)" + MAKE_VARS += FPIC="$(FPIC)" LUCI_VERSION="$(PKG_VERSION)" LUCI_GITBRANCH="$(PKG_GITBRANCH)" define Build/Compile $(call Build/Compile/Default,clean compile)