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>
This commit is contained in:
Craig Hesling 2020-09-15 09:37:51 -07:00 committed by Commit Bot
parent e905f32593
commit 684642811f
1 changed files with 2 additions and 1 deletions

View File

@ -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"