From c44a38aefc9dc4e150b8a11d904a16cf358b9b66 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 13 Oct 2023 03:20:33 +0100 Subject: only build cbutils if required it's sometimes done unconditionally. this change ensures that it is not repeated needlessly. i observed otherwise that cbfstool would be re-built from time to time, even if it was built. Signed-off-by: Leah Rowe --- script/build/fw/coreboot | 3 ++- script/update/vendor/download | 4 +++- script/update/vendor/inject | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot index bf7943ac..4cdf64ff 100755 --- a/script/build/fw/coreboot +++ b/script/build/fw/coreboot @@ -132,7 +132,8 @@ prepare_target() cbfstool="cbutils/${tree}/cbfstool" cbrom="${cbdir}/build/coreboot.rom" - x_ ./update project trees -b coreboot utils ${tree} + [ -f "${cbfstool}" ] || \ + x_ ./update project trees -b coreboot utils ${tree} build_dependency_seabios diff --git a/script/update/vendor/download b/script/update/vendor/download index 2d90b9b0..6c83b0ca 100755 --- a/script/update/vendor/download +++ b/script/update/vendor/download @@ -50,7 +50,9 @@ build_dependencies() x_ ./update project trees -b uefitool [ -f "${kbc1126_ec_dump}" ] || \ x_ make -C "${cbdir}/util/kbc1126" - x_ ./update project trees -b coreboot utils default + if [ ! -f "${cbfstool}" ] || [ ! -f "${ifdtool}" ]; then + x_ ./update project trees -b coreboot utils default + fi } download_vendorfiles() diff --git a/script/update/vendor/inject b/script/update/vendor/inject index 3340a723..f4caf89e 100755 --- a/script/update/vendor/inject +++ b/script/update/vendor/inject @@ -88,7 +88,9 @@ detect_board() build_dependencies() { [ -d "${cbdir}" ] || x_ ./update project trees -f coreboot default - x_ ./update project trees -b coreboot utils default + if [ ! -f "${cbfstool}" ] || [ ! -f "${ifdtool}" ]; then + x_ ./update project trees -b coreboot utils default + fi x_ ./update vendor download ${board} } -- cgit v1.2.1