aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Jonglez <git@bitsofnetworks.org>2020-09-03 23:19:07 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-10-07 23:13:00 +0200
commit891022918d55b565b49b7ecafc4ebf8a66461a13 (patch)
treea9e49ca381ffd7ebf574b08b9b06dffdb039791d
parent8076fb59ab1c4a07fc4c4ea40570b354ef5d8cc0 (diff)
downloadupstream-891022918d55b565b49b7ecafc4ebf8a66461a13.tar.gz
upstream-891022918d55b565b49b7ecafc4ebf8a66461a13.tar.bz2
upstream-891022918d55b565b49b7ecafc4ebf8a66461a13.zip
scripts: getver.sh: fix version based on stable branch
When building from a local branch based off the "openwrt-19.07" branch, version computation is wrong, for instance: r10194+1004-c53f62b111 The number of local commits (1004 in this case) is wrong because it is computed against master. As a result, it wrongly counts *all* commits since the beginning of the openwrt-19.07 branch as local commits. The fix is to compare to the openwrt-19.07 branch instead, which gives the expected result such as: r11192+6-8b0278a17e Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org> [shorten commit title] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rwxr-xr-xscripts/getver.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/getver.sh b/scripts/getver.sh
index 9175f411db..a0063505c3 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -26,7 +26,7 @@ try_git() {
*)
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
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)"
+ [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify --symbolic-full-name openwrt-19.07@{u} 2>/dev/null)"
REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print $1}')"
if [ -n "$ORIGIN" ]; then