diff options
| author | Baptiste Jonglez <git@bitsofnetworks.org> | 2020-09-03 23:19:22 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-10-07 23:15:10 +0200 |
| commit | 6d94a6eca41da34f4df845d9876be2acfbf5881f (patch) | |
| tree | 1933ab782dddd2e4400a9b3d8f3760e0b84d5c69 | |
| parent | 3d771602e99af29b4a194d81647a26a7af8c5784 (diff) | |
| download | upstream-6d94a6eca41da34f4df845d9876be2acfbf5881f.tar.gz upstream-6d94a6eca41da34f4df845d9876be2acfbf5881f.tar.bz2 upstream-6d94a6eca41da34f4df845d9876be2acfbf5881f.zip | |
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 <git@bitsofnetworks.org>
[shorten commit title]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
| -rwxr-xr-x | scripts/getver.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |