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
fsdg20230625
Leah Rowe 2023-03-05 14:00:06 +00:00
parent 9398ad08db
commit 544737c864
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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