From 544737c8647a42788b407be87cc898816376288d Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 5 Mar 2023 14:00:06 +0000 Subject: scripts: build cbutils, not specific utils some checks check for specific utils, which are then used to indicate the existence of other utils, which means that building them singularly, as is currently done, may result in errors later if another tool doesn't exist compiled yet this is an obscure bug, fixed by this patch. more of a workaround really. a dirty hack. when checking for any of the coreboot utilities required, build all coreboot utilities that are possibly required the utilities are small enough that this does not add much extra time to build, and in most cases, all of them will be needed anyway --- resources/scripts/blobs/inject | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resources/scripts/blobs/inject') diff --git a/resources/scripts/blobs/inject b/resources/scripts/blobs/inject index 61a4ba6e..125a5481 100755 --- a/resources/scripts/blobs/inject +++ b/resources/scripts/blobs/inject @@ -130,12 +130,12 @@ fi if [ ! -f "coreboot/default/util/ifdtool/ifdtool" ]; then printf "building ifdtool from coreboot\n" - make -C coreboot/default/util/ifdtool || Fail 'could not build ifdtool' + ./build module cbutils default || Fail 'could not build ifdtool' fi if [ ! -f "coreboot/default/util/cbfstool/cbfstool" ]; then printf "building cbfstool from coreboot\n" -make -C coreboot/default/util/cbfstool || Fail 'could not build cbfstool' +./build module cbutils default || Fail 'could not build cbfstool' fi ./blobutil download ${board} && Patch -- cgit v1.2.1