From 941fbcbf1b070c5e82c8590e6a4f1afcc0da78a4 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 24 Jun 2023 23:23:16 +0100 Subject: run coreboot utils from own directory this means coreboot can now be distcleaned safely, before and after each build of a rom image Signed-off-by: Leah Rowe --- resources/scripts/build/release/roms | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'resources/scripts/build/release') diff --git a/resources/scripts/build/release/roms b/resources/scripts/build/release/roms index 33200cc4..d81ec09a 100755 --- a/resources/scripts/build/release/roms +++ b/resources/scripts/build/release/roms @@ -24,14 +24,13 @@ set -u -e projectname="$(cat projectname)" version="version-unknown" versiondate="version-date-unknown" +cbtree="default" target="" CONFIG_HAVE_MRC="" CONFIG_HAVE_ME_BIN="" CONFIG_KBC1126_FIRMWARE="" -ifdtooldir="coreboot/default/util/ifdtool" -ifdtool="${ifdtooldir}/ifdtool" -cbfstooldir="coreboot/default/util/cbfstool" -cbfstool="${cbfstooldir}/cbfstool" +ifdtool="cbutils/${cbtree}/ifdtool" +cbfstool="cbutils/${cbtree}/cbfstool" main() { @@ -114,12 +113,10 @@ strip_archive() { romdir=${1} - if [ ! -d coreboot/default ]; then - ./download coreboot default || exit 1 - fi - if [ ! -f "${ifdtool}" ] || [ ! -f "${cbfstool}" ]; then - ./build module cbutils default || exit 1 + if [ ! -d coreboot/${cbtree} ]; then + ./download coreboot ${cbtree} || exit 1 fi + ./build module cbutils ${cbtree} || exit 1 rm -Rf "${romdir}_tmp" # dirty hack, to reduce disk io later # rather than using /tmp, which might not be tmpfs -- cgit v1.2.1