X-Git-Url: https://git.archive.openwrt.org/?p=15.05%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fgetver.sh;h=0aebd29091e48ffb930131d5cb5429feb0e7bf1b;hp=4643ca63ff0bb43b344fa4f9dfef383567c128ff;hb=HEAD;hpb=0709b59745cca0191ade10af764006e1f40e8b63

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 4643ca63ff..0aebd29091 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -17,9 +17,9 @@ try_svn() {
 }
 
 try_git() {
-	[ -e .git ] || return 1
-	REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"
-	REV="${REV:+r$REV}"
+	git rev-parse --git-dir >/dev/null 2>&1 || return 1
+	REV="$(git describe --tags | sed "s/v15.05.1-\([0-9]*\)-.*/\1/g")"
+	REV="${REV:+r$((REV+49254))}"
 	[ -n "$REV" ]
 }
 
@@ -30,5 +30,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"