From 7553654bb10af9206cff9837a485b828d1998213 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Thu, 10 Mar 2016 19:50:58 +0200 Subject: LuCI: Display the proper LuCI git branch in GUI Adjust luci.mk and luci-base to find out correctly if Luci is built from master or from a branch. Display that value in the footer and the overview page. * Evaluate the git branch in luci.mk and pass that to LuCI submodules as a make variable. Use branch name, ignore tags. * Deprecate svn detection in luci-base's mkversion.sh that generates version.lua. Simply use the value passed by make. Signed-off-by: Hannu Nyman --- modules/luci-base/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/luci-base/src/Makefile') diff --git a/modules/luci-base/src/Makefile b/modules/luci-base/src/Makefile index 7bb7f2ebe0..03e887e1d5 100644 --- a/modules/luci-base/src/Makefile +++ b/modules/luci-base/src/Makefile @@ -11,7 +11,7 @@ parser.so: template_parser.o template_utils.o template_lmo.o template_lualib.o $(CC) $(LDFLAGS) -shared -o $@ $^ version.lua: - ./mkversion.sh $@ $(LUCI_VERSION) + ./mkversion.sh $@ $(LUCI_VERSION) "$(LUCI_GITBRANCH)" compile: parser.so version.lua -- cgit v1.2.3