Compare commits

...

2 Commits

Author SHA1 Message Date
Leah Rowe 60a2f5cbff rom.sh: disable ccache on coreboot builds
this fixes a build issue i was having on ./mk release,
and it's also a preventative bug fix.

instead of forcing it to be enabled, we now force
it to be disabled. all current configs already disable
it, and disabled is the default.

just in case, disable it by force. i encountered build
errors on ./mk release, due to stale build artifacts.

i had no issues on normal lbmk.git, doing builds, but
./mk release builds everything in bulk. we want the
release build process to be as reliable as possible.

this won't actually affect build speed much, due to
lbmk's design (clean builds before running make).

work is needed upstream, to make ccache more reliable.
ccache is fine when you're re-building the same board
a lot, but there's just no way it can be used reliably
when building lots of very different boards, where the
code greatly differs in coreboot.

Signed-off-by: Leah Rowe <leah@libreboot.org>
2026-09-16 23:27:53 +01:00
Leah Rowe 3b565ce056 vendor.sh: minor cleanup
Signed-off-by: Leah Rowe <leah@libreboot.org>
2026-09-16 21:06:39 +01:00
2 changed files with 9 additions and 24 deletions
+1 -1
View File
@@ -80,7 +80,7 @@ corebootpremake()
cook_coreboot_config() cook_coreboot_config()
{ {
if [ -z "$mode" ] && [ -f "$srcdir/.config" ]; then if [ -z "$mode" ] && [ -f "$srcdir/.config" ]; then
printf "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || \ printf "CONFIG_CCACHE=n\n" >> "$srcdir/.config" || \
err "can't cook '$srcdir'" "cook_coreboot_config" "$@" err "can't cook '$srcdir'" "cook_coreboot_config" "$@"
fi fi
} }
+8 -23
View File
@@ -122,42 +122,31 @@ fetch()
remkdir "${_pre_dest%/*}" "$appdir" remkdir "${_pre_dest%/*}" "$appdir"
# HACK: if grabbing fsp from coreboot, fix the path for lbmk # HACK: if grabbing fsp from coreboot, fix the path for lbmk
if [ "$dl_type" = "fsp" ]; then [ "$dl_type" = "fsp" ] && for bkup in "" "_bkup"; do
dl="${dl##*../}" eval "dl$bkup=\"\${dl$bkup##*../}\""
_cdp="$dl" eval "_cdp=\"\$dl$bkup\""
[ ! -f "$_cdp" ] && \ [ ! -f "$_cdp" ] && \
_cdp="$cbdir/$_cdp" _cdp="$cbdir/$_cdp"
[ -f "$_cdp" ] && \ [ -f "$_cdp" ] && \
dl="$_cdp" eval "dl$bkup=\"\$_cdp\""; :
done; :
dl_bkup="${dl_bkup##*../}"
_cdp="$dl_bkup"
[ ! -f "$_cdp" ] && \
_cdp="$cbdir/$_cdp"
[ -f "$_cdp" ] && \
dl_bkup="$_cdp"; :
fi
# download the file (from the internet) to extract from: # download the file (from the internet) to extract from:
xbget "$dlop" "$dl" "$dl_bkup" "$_dl" "$dlsum" xbget "$dlop" "$dl" "$dl_bkup" "$_dl" "$dlsum"
x_ rm -Rf "${_dl}_extracted" x_ rm -Rf "${_dl}_extracted"
# skip extraction if a cached extracted file exists: # skip extraction if a cached extracted file exists:
( xbget copy "$_dl_bin" "$_dl_bin" "$_dest" "$binsum" 2>/dev/null ) || : ( xbget copy "$_dl_bin" "$_dl_bin" "$_dest" "$binsum" 2>/dev/null ) || :
[ -f "$_dest" ] && \ [ -f "$_dest" ] && \
return 0 return 0
x_ mkdir -p "${_dest%/*}" x_ mkdir -p "${_dest%/*}"
if [ "$dl_type" != "fsp" ]; then [ "$dl_type" = "fsp" ] || \
extract_archive "$_dl" "$appdir" || \ extract_archive "$_dl" "$appdir" || \
[ "$dl_type" = "e6400vga" ] || \ [ "$dl_type" = "e6400vga" ] || \
err "$_dest $dl_type: !extract" "fetch" "$@" err "$_dest $dl_type: !extract" "fetch" "$@"
fi
x_ extract_$dl_type "$_dl" "$appdir" x_ extract_$dl_type "$_dl" "$appdir"
set -u -e set -u -e
@@ -172,13 +161,9 @@ fetch()
return 0; : return 0; :
[ -z "$binsum" ] && \ [ -z "$binsum" ] && \
printf "'%s': checksum undefined\n" "$_dest" 1>&2 printf "WARNING: %s: checksum undefined\n" "$_dest" 1>&2
if [ -L "$_dest" ]; then x_ rm -f "$_dest"
printf "WARNING: '%s' is a link!\n" "$_dest" 1>&2
else
x_ rm -f "$_dest"
fi
err "Can't safely extract '$_dest', for board '$board'" "fetch" "$@" err "Can't safely extract '$_dest', for board '$board'" "fetch" "$@"
} }