summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-03-05 14:00:06 +0000
committerLeah Rowe <leah@libreboot.org>2023-03-05 14:00:06 +0000
commit544737c8647a42788b407be87cc898816376288d (patch)
treee9f3cd386cd24c544ccc32bb4c544aa84c867d73
parent9398ad08db8b9aa05268425234d5fb686890564f (diff)
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
-rwxr-xr-xresources/scripts/blobs/inject4
-rwxr-xr-xresources/scripts/build/release/roms4
2 files changed, 4 insertions, 4 deletions
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
diff --git a/resources/scripts/build/release/roms b/resources/scripts/build/release/roms
index dce21f16..38162a5d 100755
--- a/resources/scripts/build/release/roms
+++ b/resources/scripts/build/release/roms
@@ -74,13 +74,13 @@ for romdir in bin/*; do
ifdtooldir="coreboot/default/util/ifdtool"
ifdtool="${ifdtooldir}/ifdtool"
if [ ! -f "${ifdtool}" ]; then
- make -BC "${ifdtooldir}" || exit 1
+ ./build module cbutils default || exit 1
fi
cbfstooldir="coreboot/default/util/cbfstool"
cbfstool="${cbfstooldir}/cbfstool"
if [ ! -f "${cbfstool}" ]; then
- make -BC "${cbfstooldir}" || exit 1
+ ./build module cbutils default || exit 1
fi
rm -Rf "${romdir}_tmp" # dirty hack, to reduce disk io later