xbmk: cache builds in XBMK_CACHE/elf/

not elf/

this way, release builds will go faster because
we re-use cached builds which are, due to recent
design improvements, always reliably re-built and
we can be sure that what's cached matches what's
currently in config/

if ./mk release is done with uncommitted changes,
that's OK because the hash checking is still done
in the release directory, which would still make
builds be re-done, and this would then update the
hashes so the master tree would then re-build them
later on, when doing a non-release build.

this change enables more rapid release build testing,
because we don't needlessly repeat certain builds.

we still generate the source archive from a clean slate.

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/include/vendor.sh b/include/vendor.sh
index 55373913..4aad7532 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -15,7 +15,7 @@
 e6400_unpack="$xbmkpwd/src/bios_extract/dell_inspiron_1100_unpacker.py"
 me7updateparser="$xbmkpwd/util/me7_update_parser/me7_update_parser.py"
 pfs_extract="$xbmkpwd/src/biosutilities/Dell_PFS_Extract.py"
-uefiextract="$xbmkpwd/elf/uefitool/uefiextract"
+uefiextract="$XBMK_CACHE/elf/uefitool/uefiextract"
 vendir="vendorfiles"
 appdir="$vendir/app"
 vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
@@ -270,14 +270,15 @@ bootstrap()
 	cbdir="src/coreboot/$tree"
 	mecleaner="$xbmkpwd/$cbdir/util/me_cleaner/me_cleaner.py"
 	kbc1126_ec_dump="$xbmkpwd/$cbdir/util/kbc1126/kbc1126_ec_dump"
-	cbfstool="elf/coreboot/$tree/cbfstool"
-	rmodtool="elf/coreboot/$tree/rmodtool"
+	cbfstool="$XBMK_CACHE/elf/coreboot/$tree/cbfstool"
+	rmodtool="$XBMK_CACHE/elf/coreboot/$tree/rmodtool"
 
 	x_ ./mk -f coreboot "${cbdir##*/}"
 	fx_ "x_ ./mk -b" printf "uefitool\nbiosutilities\nbios_extract\n"
 	[ -d "${kbc1126_ec_dump%/*}" ] && x_ make -C "$cbdir/util/kbc1126"
 	[ -n "$MRC_refcode_cbtree" ] && \
-	    cbfstoolref="elf/coreboot/$MRC_refcode_cbtree/cbfstool" && \
+	    cbfstoolref="$XBMK_CACHE/elf/coreboot/$MRC_refcode_cbtree" && \
+	    cbfstoolref="$cbfstoolref/cbfstool" && \
 	    x_ ./mk -d coreboot "$MRC_refcode_cbtree"; :
 }