From 6d94a6eca41da34f4df845d9876be2acfbf5881f Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Thu, 3 Sep 2020 23:19:22 +0200 Subject: [PATCH] scripts: getver.sh: fix version based on stable branch When building from a local branch based off the "openwrt-18.06" branch, version computation is wrong, for instance: r6907+1154-7e15e21766 The number of local commits (1154 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-18.06 branch as local commits. The fix is to compare to the openwrt-18.06 branch instead, which gives the expected result such as: r8060+1-1238a22316 Signed-off-by: Baptiste Jonglez [shorten commit title] Signed-off-by: Adrian Schmutzler --- scripts/getver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/getver.sh b/scripts/getver.sh index 9175f411db..dbd3292343 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-18.06@{u} 2>/dev/null)" REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print $1}')" if [ -n "$ORIGIN" ]; then -- 2.30.2