canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trees: unified coreboot makeargs 

in particular, the coreboot build system may auto-download
submodules when building cbfstool; vboot for instance.

we do not want such unpredictable behaviour, so now we
use UPDATED_SUBMODULES=1 when building coreboot utilities.

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2-merge1
Leah Rowe 2024-06-06 22:21:59 +01:00 committed by Leah Rowe
parent f7170092c8
commit e4eb82e089
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
script/trees
View File

@ -9,6 +9,7 @@ set -u -e
. "include/lib.sh" . "include/lib.sh"
. "include/git.sh" . "include/git.sh"
cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$threads"
eval "$(setvars "" xarch cdir config config_name xlang mode makeargs \ eval "$(setvars "" xarch cdir config config_name xlang mode makeargs \
listfile project target target_dir targets tree _f target1 bootstrapargs \ listfile project target target_dir targets tree _f target1 bootstrapargs \
autoconfargs cmakedir elfdir autogenargs xtree)" autoconfargs cmakedir elfdir autogenargs xtree)"
@ -164,8 +165,7 @@ check_cross_compiler()
[ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang"
[ -d "$cbdir/util/crossgcc/xgcc/$_xarch/" ] && continue [ -d "$cbdir/util/crossgcc/xgcc/$_xarch/" ] && continue
x_ make -C "$cbdir" crossgcc-${_xarch%-*} CPUS=$threads \ x_ make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs
UPDATED_SUBMODULES=1
done done
} }
@ -177,7 +177,7 @@ check_coreboot_utils()
utilmode="" utilmode=""
[ -z "$mode" ] || utilmode="clean" [ -z "$mode" ] || utilmode="clean"
x_ make -C "$utilsrcdir" $utilmode -j$threads x_ make -C "$utilsrcdir" $utilmode -j$threads $cbmakeargs
[ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \ [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \
x_ mkdir -p "$utilelfdir" && \ x_ mkdir -p "$utilelfdir" && \
x_ cp "$utilsrcdir/$util" "elf/$util/$1" x_ cp "$utilsrcdir/$util" "elf/$util/$1"
@ -230,7 +230,7 @@ run_make_command()
[ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \ [ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \
printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \ printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \
&& makeargs="$makeargs UPDATED_SUBMODULES=1 CPUS=$threads" && makeargs="$makeargs $cbmakeargs"
make -C "$cdir" $mode -j$threads $makeargs || $err "!mk $cdir $mode" make -C "$cdir" $mode -j$threads $makeargs || $err "!mk $cdir $mode"