diff options
| author | Craig Hesling <hesling@chromium.org> | 2020-09-15 09:37:51 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-03 09:45:30 +0000 |
| commit | 684642811f23490f52128d5e80140c410e786c37 (patch) | |
| tree | 42965ccac069e44866e3e1e7d8319c3733e0c60f /util | |
| parent | e905f32593450568c4075a80bbd4573e06d8a6e3 (diff) | |
| download | chrome-ec-684642811f23490f52128d5e80140c410e786c37.tar.gz | |
util/getversion.sh: Fix no VCSID logic
BRANCH=none
BUG=b:168613053
TEST=./util/compare_build.sh # This forces a static version
TEST=BOARD=bloonchipper CR50_DEV=blah ./util/getversion.sh
TEST=BOARD=bloonchipper CR50_DEV=blah CR50_SQA=1 ./util/getversion.sh
TEST=BOARD=cr50 CRYPTO_TEST=1 ./util/getversion.sh
TEST=mv .git .gitnomore && ./util/getversion.sh; mv .gitnomore .git
TEST=mv .git .gitnomore && VCSID=0.0.1-r1519-9b368af6a4943b90941471d0bdf7e7208788f898 ./util/getversion.sh; mv .gitnomore .git
Signed-off-by: Craig Hesling <hesling@chromium.org>
Change-Id: I0d1621b5facabf5769ea382c77cdd096d87cbc01
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2412389
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/getversion.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/getversion.sh b/util/getversion.sh index 8b46034e80..165383d879 100755 --- a/util/getversion.sh +++ b/util/getversion.sh @@ -70,7 +70,8 @@ get_tree_version() { else # Fall back to the VCSID provided by the packaging system if available. # Ex VCSID: 0.0.1-r1519-9b368af6a4943b90941471d0bdf7e7208788f898 - if ghash=${VCSID##*-}; then + if [[ -n "${VCSID}" ]]; then + ghash="${VCSID##*-}" vbase="1.1.9999-${ghash:0:7}" else # then ultimately fails to "no_version" |