ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-25 00:11:13 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

scripts/getver.sh: stop relying on the reboot tag

Browse Source 
It may not be present when cloning a staging tree or another fork

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-14 13:30:54 +02:00
parent 55761205ef
commit 7ed215437c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/getver.sh
View File

@ -12,6 +12,7 @@ try_version() {
} }
try_git() { try_git() {
REBOOT=ee53a240ac902dc83209008a2671e7fdcf55957a
git rev-parse --git-dir >/dev/null 2>&1 || return 1 git rev-parse --git-dir >/dev/null 2>&1 || return 1
[ -n "$GET_REV" ] || GET_REV="HEAD" [ -n "$GET_REV" ] || GET_REV="HEAD"
@ -19,18 +20,18 @@ try_git() {
case "$GET_REV" in case "$GET_REV" in
r*) r*)
GET_REV="$(echo $GET_REV | tr -d '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)))" REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
;; ;;
*) *)
BRANCH="$(git rev-parse --abbrev-ref HEAD)" BRANCH="$(git rev-parse --abbrev-ref HEAD)"
ORIGIN="$(git rev-parse --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)" 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)" [ -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}')" REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print $1}')"
if [ -n "$ORIGIN" ]; then if [ -n "$ORIGIN" ]; then
UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)" 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 else
UPSTREAM_REV=$REV UPSTREAM_REV=$REV
fi fi