diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2019-03-04 17:24:29 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-15 16:48:43 -0700 |
| commit | 787d34561f0a91b6565a9886887d60606c43f426 (patch) | |
| tree | 88e54cd1d51064545280f4e8cefb4f97272c3ba1 /extra/usb_updater/Makefile | |
| parent | 36db1e3862efd21889acfd698c61e11d355b5318 (diff) | |
| download | chrome-ec-787d34561f0a91b6565a9886887d60606c43f426.tar.gz | |
gsctool: do not include hashes of unrelated directories
When building gsctool, getversion.sh is invoked by the Makefile, and
since BOARD environment variable is set to cr50, getversion.sh is
trying to retrieve the state of directories used by Cr50, but not
present when gsctool is built.
Let's just make sure that BOARD is not set to 'cr50' when
getversion.sh is invoked.
BRANCH=none
BUG=none
TEST='sudo emerge ec-utils' does not produce getversion.sh errors
about not being able to change directory to
../../third_party/{tpm2,cryptoc}, but the version string is still
available:
$ gsctool -v
Version: 1.1.9999-d2e5b7e, built on by @eskimo.mtv.corp.google.com
note that date and user name are also not included in this case,
but this is a separate unrelated issue.
Change-Id: Iadd7615f980e9444c539b5e04afca3f23d080174
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1501836
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'extra/usb_updater/Makefile')
| -rw-r--r-- | extra/usb_updater/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extra/usb_updater/Makefile b/extra/usb_updater/Makefile index 7e9f11725b..2f8f70a6d3 100644 --- a/extra/usb_updater/Makefile +++ b/extra/usb_updater/Makefile @@ -63,7 +63,10 @@ usb_updater2: usb_updater2.c Makefile .PHONY: clean generated_version.h: $(GSCTOOL_SOURCES) - @(cd ../../; util/getversion.sh) > $@ + # Make sure ${BOARD} not set to anything when invoking getversion.sh, + # as even when building with Cr50 enabled, other directories do not + # matter for gsctool. + @(cd ../../; BOARD= util/getversion.sh) > $@ clean: rm -rf $(PROGRAMS) *~ *.o *.d dp generated_version.h |