From b83942a5967bb0a94afa2980d4cc6ee28ddda79d Mon Sep 17 00:00:00 2001
From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Thu, 10 Mar 2016 19:50:58 +0200
Subject: [PATCH] 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 <hannu.nyman@iki.fi>
(cherry picked from commit 7553654bb10af9206cff9837a485b828d1998213)
---
 luci.mk                            | 15 ++++++++++++++-
 modules/luci-base/src/Makefile     |  2 +-
 modules/luci-base/src/mkversion.sh | 25 +------------------------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/luci.mk b/luci.mk
index 1e56edde50..5b32dab2ff 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)
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
 
diff --git a/modules/luci-base/src/mkversion.sh b/modules/luci-base/src/mkversion.sh
index 55b0ebd22f..33c7a3ffea 100755
--- a/modules/luci-base/src/mkversion.sh
+++ b/modules/luci-base/src/mkversion.sh
@@ -1,28 +1,5 @@
 #!/bin/sh
 
-if svn info >/dev/null 2>/dev/null; then
-	if [ "${4%%/*}" = "branches" ]; then
-		variant="LuCI ${4##*[-/]} Branch"
-	elif [ "${4%%/*}" = "tags" ]; then
-		variant="LuCI ${4##*[-/]} Release"
-	else
-		variant="LuCI Trunk"
-	fi
-elif git status >/dev/null 2>/dev/null; then
-	tag="$(git describe --tags 2>/dev/null)"
-	branch="$(git symbolic-ref --short -q HEAD 2>/dev/null)"
-
-	if [ -n "$tag" ]; then
-		variant="LuCI $tag Release"
-	elif [ "$branch" != "master" ]; then
-		variant="LuCI ${branch##*-} Branch"
-	else
-		variant="LuCI Master"
-	fi
-else
-	variant="LuCI"
-fi
-
 cat <<EOF > $1
 local pcall, dofile, _G = pcall, dofile, _G
 
@@ -36,6 +13,6 @@ else
 	distversion = "Development Snapshot"
 end
 
-luciname    = "$variant"
+luciname    = "${3:-LuCI}"
 luciversion = "${2:-Git}"
 EOF
-- 
2.30.2