diff options
| author | Nobel Barakat <nobelbarakat@google.com> | 2022-11-22 00:40:20 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-02 20:54:11 +0000 |
| commit | f9ae6c12bd0b67ee336089ce15d5255d7d6d11b7 (patch) | |
| tree | bfee455348d11600286c62322d56e0e20e177a56 | |
| parent | 06cbffbe5bbc289ccd41d70f9e6a013f4d23a634 (diff) | |
| download | vboot-f9ae6c12bd0b67ee336089ce15d5255d7d6d11b7.tar.gz | |
flashrom: ensure flashrom symbols are not loaded if !USE_FLASHROM
The linking process during the installation phase of this package
breaks if you compile with make USE_FLASHROM=0. A new conditional has
been added to the make file that prevents utility/crossystem from
compiling if USE_FLASHROM is either not set or set to the number 0.
BUG=b:256682063
TEST=cros_run_unit_tests --board amd64-generic --packages vboot_reference
TEST=env USE="test -flashrom" emerge-amd64-generic vboot_reference
TEST=env USE="-flashrom" emerge-amd64-generic vboot_reference
BRANCH=none
Signed-off-by: Nobel Barakat nobelbarakat@google.com
Change-Id: Ia8cdd24653fdb74c9bb5f4de86b7711b138299cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4045302
Commit-Queue: Nobel Barakat <nobelbarakat@google.com>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Tested-by: Nobel Barakat <nobelbarakat@google.com>
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -593,10 +593,13 @@ UTIL_BIN_NAMES_SDK = \ utility/signature_digest_utility \ utility/verify_data UTIL_BIN_NAMES_BOARD = \ - utility/crossystem \ utility/dumpRSAPublicKey \ utility/tpmc +ifneq ($(filter-out 0,${USE_FLASHROM}),) +UTIL_BIN_NAMES_BOARD += utility/crossystem +endif + UTIL_SCRIPTS_SDK = $(addprefix ${BUILD}/,${UTIL_SCRIPT_NAMES_SDK}) UTIL_SCRIPTS_BOARD = $(addprefix ${BUILD}/,${UTIL_SCRIPT_NAMES_BOARD}) UTIL_BINS_SDK = $(addprefix ${BUILD}/,${UTIL_BIN_NAMES_SDK}) |