Skip to content

Commit 343c3be

Browse files
author
John Crispin
committed
scripts/getver.sh: generate revision relative to the reboot tag
Signed-off-by: John Crispin <[email protected]>
1 parent ee53a24 commit 343c3be

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

scripts/getver.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,9 @@ try_version() {
99
[ -n "$REV" ]
1010
}
1111

12-
try_svn() {
13-
[ -d .svn ] || return 1
14-
REV="$(svn info | awk '/^Last Changed Rev:/ { print $4 }')"
15-
REV="${REV:+r$REV}"
16-
[ -n "$REV" ]
17-
}
18-
1912
try_git() {
2013
git rev-parse --git-dir >/dev/null 2>&1 || return 1
21-
REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"
22-
REV="${REV:+r$REV}"
14+
REV="$(git describe | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
2315
[ -n "$REV" ]
2416
}
2517

@@ -30,5 +22,5 @@ try_hg() {
3022
[ -n "$REV" ]
3123
}
3224

33-
try_version || try_svn || try_git || try_hg || REV="unknown"
25+
try_version || try_git || try_hg || REV="unknown"
3426
echo "$REV"

0 commit comments

Comments
 (0)