From e3a8452a7d256c25b8a7458ba4eb083639a66084 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 10 Jul 2025 10:55:47 +0100 Subject: 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 --- include/inject.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/inject.sh') diff --git a/include/inject.sh b/include/inject.sh index 795b2c70..cac08357 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -6,7 +6,7 @@ cbcfgsdir="config/coreboot" tmpromdel="$XBMK_CACHE/DO_NOT_FLASH" nvm="util/nvmutil/nvm" -ifdtool="elf/coreboot/default/ifdtool" +ifdtool="$XBMK_CACHE/elf/coreboot/default/ifdtool" cv="CONFIG_GBE_BIN_PATH" [ -n "$cvxbmk" ] && cv="$cv $cvxbmk" @@ -77,7 +77,7 @@ check_target() eval "`setcfg "$boarddir/target.cfg"`" chkvars tree && x_ ./mk -d coreboot "$tree" - ifdtool="elf/coreboot/$tree/ifdtool" + ifdtool="$XBMK_CACHE/elf/coreboot/$tree/ifdtool" [ -n "$IFD_platform" ] && ifdprefix="-p $IFD_platform"; : } -- cgit v1.2.1