aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Jonglez <git@bitsofnetworks.org>2021-02-21 18:42:38 +0100
committerBaptiste Jonglez <git@bitsofnetworks.org>2021-02-21 18:42:38 +0100
commitcb5c93f12ad45f646089be6473c1c70005800020 (patch)
tree4dd110756088803b2e1ae1f059b0dd667297b32b
parent1b46554895d3933d4b94f37f6f916908cb9ad763 (diff)
downloadupstream-cb5c93f12ad45f646089be6473c1c70005800020.tar.gz
upstream-cb5c93f12ad45f646089be6473c1c70005800020.tar.bz2
upstream-cb5c93f12ad45f646089be6473c1c70005800020.zip
scripts: getver.sh: fix version based on stable branch
When building from a local branch based off the "openwrt-21.02" branch, version computation is wrong, because the number of local commits is computed against master. As a result, it wrongly counts *all* commits since the beginning of the openwrt-21.02 branch as local commits. The fix is to compare to the openwrt-21.02 branch instead, which gives the expected result. A similar change had been applied to the openwrt-19.07 branch: 891022918d55 ("scripts: getver.sh: fix version based on stable branch") Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
-rwxr-xr-xscripts/getver.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/getver.sh b/scripts/getver.sh
index 49260a2260..dc3d1bb1c3 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-21.02@{u} 2>/dev/null)"
REV="$(git rev-list ${REBOOT}..$GET_REV 2>/dev/null | wc -l | awk '{print $1}')"
if [ -n "$ORIGIN" ]; then