X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fgetver.sh;h=46eee9a04937109c4989e07d6a1c24efcb41e010;hb=6f86d2e2ab25f7fb8e915556d025f007f41cece6;hp=60adc42e9244a7ae0e963baf8280b4401dc4aa4d;hpb=fa69553900516944fc43cf7b377105ea1f6d3db0;p=openwrt%2Fopenwrt.git

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 60adc42e92..46eee9a049 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -3,6 +3,8 @@ export LANG=C
 export LC_ALL=C
 [ -n "$TOPDIR" ] && cd $TOPDIR
 
+GET_REV=$1
+
 try_version() {
 	[ -f version ] || return 1
 	REV="$(cat version)"
@@ -11,14 +13,43 @@ try_version() {
 
 try_git() {
 	git rev-parse --git-dir >/dev/null 2>&1 || return 1
-	REV="$(git describe --match reboot | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
+
+	[ -n "$GET_REV" ] || GET_REV="HEAD"
+
+	case "$GET_REV" in
+	r*)
+		GET_REV="$(echo $GET_REV | tr -d 'r')"
+		BASE_REV="$(git rev-list reboot..HEAD | wc -l | awk '{print $1}')"
+		REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
+		;;
+	*)
+		BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+		ORIGIN="$(git rev-parse --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
+		[ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --symbolic-full-name master@{u} 2>/dev/null)"
+		REV="$(git rev-list reboot..$GET_REV | wc -l | awk '{print $1}')"
+
+		if [ -n "$ORIGIN" ]; then
+			UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)"
+			UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l | awk '{print $1}')"
+		else
+			UPSTREAM_REV=$REV
+		fi
+
+		if [ "$REV" -gt "$UPSTREAM_REV" ]; then
+			REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
+		fi
+
+		REV="${REV:+r$REV}"
+		;;
+	esac
+
 	[ -n "$REV" ]
 }
 
 try_hg() {
 	[ -d .hg ] || return 1
 	REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
-	REV="${REV:+$REV}"
+	REV="${REV:+r$REV}"
 	[ -n "$REV" ]
 }