ds-lite: make tunnel encapsulation limit support configurable (FS#1501)

[openwrt/openwrt.git] / scripts / getver.sh

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 46eee9a04937109c4989e07d6a1c24efcb41e010..9175f411db8345ab420fdb1edcaf0d20f858f12f 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -12,6 +12,7 @@ try_version() {
 }
 
 try_git() {
+       REBOOT=ee53a240ac902dc83209008a2671e7fdcf55957a
        git rev-parse --git-dir >/dev/null 2>&1 || return 1
 
        [ -n "$GET_REV" ] || GET_REV="HEAD"
@@ -19,27 +20,28 @@ try_git() {
        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}')"
+               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}')"
+               ORIGIN="$(git rev-parse --verify --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
+               [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify --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}')"
+                       UPSTREAM_REV="$(git rev-list ${REBOOT}..$UPSTREAM_BASE | wc -l | awk '{print $1}')"
                else
-                       UPSTREAM_REV=$REV
+                       UPSTREAM_REV=0
                fi
 
                if [ "$REV" -gt "$UPSTREAM_REV" ]; then
                        REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
                fi
 
-               REV="${REV:+r$REV}"
+               REV="${REV:+r$REV-$(git log -n 1 --format="%h" $UPSTREAM_BASE)}"
+
                ;;
        esac