libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

allow users to specify number of build threads 

lbmk otherwise uses nproc to set the number of build threads,
in these places:

* generic make commands in script/update/trees
* crossgcc make command in script/update/trees

the -T0 option is also used in script/update/release, when running
tar.

with this change, you can do:

export LBMK_THREADS=x

where x is the number of threads. when you then run
lbmk, your chosen number of threads will override
the default. this may be useful on a host that does
not have a lot of memory.

Signed-off-by: Leah Rowe <leah@libreboot.org>
9020nri
Leah Rowe 2024-03-27 07:14:47 +00:00
parent 6ebab10caa
commit 332778973c
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/option.sh
View File

@ -22,6 +22,14 @@ eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE _dest board boarddir \
CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE)"
threads=
set | grep LBMK_THREADS 1>/dev/null 2>/dev/null || threads=$(nproc) || :
[ -z "$threads" ] && threads=$LBMK_THREADS
[ -z "$threads" ] && threads=1 # LBMK_THREADS not set, and nproc failed
expr "X$threads" : "X-\{0,1\}[0123456789][0123456789]*$" \
1>/dev/null 2>/dev/null || threads=1 # user specified a non-integer
items()
{
rval=1

7
script/update/release
View File

@ -215,11 +215,12 @@ mktarball()
mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\""
if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then
tar --sort=name --owner=root:0 --group=root:0 \
--mtime="UTC 2024-02-25" -c "$1" | xz -T0 -9e > "$2" || \
$err "mktarball 1, ${1}"
--mtime="UTC 2024-02-25" -c "$1" | xz -T$threads -9e \
> "$2" || $err "mktarball 1, ${1}"
else
# TODO: reproducible tarballs on non-GNU systems
tar -c "$1" | xz -T0 -9e > "$2" || $err "mktarball 2, $1"
tar -c "$1" | xz -T$threads -9e > "$2" || \
$err "mktarball 2, $1"
fi
(
[ "${2%/*}" != "${2}" ] && x_ cd "${2%/*}"

4
script/update/trees
View File

@ -172,7 +172,7 @@ check_cross_compiler()
[ -n "${xlang}" ] && export BUILD_LANGUAGES="$xlang"
[ -d "${cbdir}/util/crossgcc/xgcc/${_xarch}/" ] && continue
x_ make -C "$cbdir" crossgcc-${_xarch%-*} CPUS=$(nproc)
x_ make -C "$cbdir" crossgcc-${_xarch%-*} CPUS=$threads
done
}
@ -219,7 +219,7 @@ run_make_command()
[ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \
printf "%s\n" "${version%%-*}" > "$codedir/.coreboot-version"
make $mode -j$(nproc) $makeargs -C "$codedir" || \
make $mode -j$threads $makeargs -C "$codedir" || \
$err "run_make $codedir: !make $mode"
[ "$mode" != "clean" ] && return 0