From: John Crispin <blogic@openwrt.org>
Date: Thu, 24 Mar 2016 21:14:12 +0000 (+0100)
Subject: scripts/getver.sh: generate revision relative to the reboot tag
X-Git-Tag: v17.01.0-rc1~3042
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=343c3be45451e4a11f03109bd6cb1dd9061ec5eb;p=oweals%2Fopenwrt.git

scripts/getver.sh: generate revision relative to the reboot tag

Signed-off-by: John Crispin <blogic@openwrt.org>
---

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 6cf7797519..d3b68c8634 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -9,17 +9,9 @@ try_version() {
 	[ -n "$REV" ]
 }
 
-try_svn() {
-	[ -d .svn ] || return 1
-	REV="$(svn info | awk '/^Last Changed Rev:/ { print $4 }')"
-	REV="${REV:+r$REV}"
-	[ -n "$REV" ]
-}
-
 try_git() {
 	git rev-parse --git-dir >/dev/null 2>&1 || return 1
-	REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"
-	REV="${REV:+r$REV}"
+	REV="$(git describe | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
 	[ -n "$REV" ]
 }
 
@@ -30,5 +22,5 @@ try_hg() {
 	[ -n "$REV" ]
 }
 
-try_version || try_svn || try_git || try_hg || REV="unknown"
+try_version || try_git || try_hg || REV="unknown"
 echo "$REV"