diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2016-10-11 17:39:14 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-10-14 16:05:47 -0700 |
| commit | ce3e350aded53fb54a86057b7a7f18bfbb165f73 (patch) | |
| tree | 9eff7521cbd4c831754bb723213f3d50ae185a88 /util | |
| parent | fb442347bd405f735b416d632628c45478e8fb69 (diff) | |
| download | chrome-ec-ce3e350aded53fb54a86057b7a7f18bfbb165f73.tar.gz | |
getversion: Fix lucid failing because of version strings
make build=lucid fails if there is an uncommitted change in the tree
because '-dirty' is appended to version strings, which causes the image
to exceed the flash size limit.
BUG=chromium:654549
BRANCH=none
TEST=make buildall -j
Change-Id: Ie4a7b4c7dc70846108aed953215f79dc30a10fca
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/396617
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/getversion.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/util/getversion.sh b/util/getversion.sh index 797c4508ab..d91ec771c4 100755 --- a/util/getversion.sh +++ b/util/getversion.sh @@ -11,7 +11,7 @@ dc=$'\001' # Default marker to indicate 'dirty' repositories -dirty_marker='-dirty' +dirty_marker='+' # This function examines the state of the current directory and attempts to # extract its version information: the latest tag, if any, how many patches @@ -77,9 +77,6 @@ dir_list=( . ) # list of component directories, always includes the EC tree case "${BOARD}" in (cr50) - # cr50 includes sources from 4 different git trees. Shortened 'dirty' tree - # marker allows to keep the summary version string shorter. - dirty_marker='+' dir_list+=( ../../third_party/tpm2 ../../third_party/cryptoc ) ;; esac |