diff options
author | Francis Rowe <info@gluglug.org.uk> | 2016-03-10 20:18:49 +0000 |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2016-03-10 20:18:49 +0000 |
commit | 25a828190b2a08105ad561b5b417bb61a383fc4f (patch) | |
tree | 459580bd75950b3c0fbcd6f8116f2bdc11c8db52 /resources/scripts/helpers/build/roms/withdepthcharge | |
parent | 2628a25901d35bd267fba945100864578f920770 (diff) | |
download | librebootfr-25a828190b2a08105ad561b5b417bb61a383fc4f.tar.gz librebootfr-25a828190b2a08105ad561b5b417bb61a383fc4f.zip |
build system: allow arbitrary specification of number of cores used
Use NPROC=foo
Replace "foo" with a number. By default, the build system uses $(nproc).
This patch allows the user to specify any number of cores. This is useful
on some systems, or certain chroot environments.
Diffstat (limited to 'resources/scripts/helpers/build/roms/withdepthcharge')
-rwxr-xr-x | resources/scripts/helpers/build/roms/withdepthcharge | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/resources/scripts/helpers/build/roms/withdepthcharge b/resources/scripts/helpers/build/roms/withdepthcharge index eaab8f04..cf473e20 100755 --- a/resources/scripts/helpers/build/roms/withdepthcharge +++ b/resources/scripts/helpers/build/roms/withdepthcharge @@ -24,6 +24,17 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e +if [ -z ${NPROC+x} ]; then + cores="$(nproc)" +else + case ${NPROC} in + ''|*[!0-9]*) + printf "value '%s' for NPROC is invalid. non-numeric. Exiting.\n" "${NPROC}" + exit 1 + ;; + esac + cores="${NPROC}" +fi printf "Building ROM images with the depthcharge payload\n" @@ -63,7 +74,7 @@ buildlibpayload() { rm -Rf "install/" make KBUILD_DEFCONFIG="configs/config.$family" defconfig - make -j$(nproc) + make -j${cores} make DESTDIR="install" install cd "../../" @@ -94,7 +105,7 @@ builddepthcharge() { rm -f "../coreboot/${cbrevision:?}/${cbrevision:?}/depthcharge.elf" make BOARD="${board}" defconfig - make BOARD="${board}" LIBPAYLOAD_DIR="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/payloads/libpayload/install/libpayload" VB_SOURCE="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/3rdparty/vboot" -j$(nproc) depthcharge_unified + make BOARD="${board}" LIBPAYLOAD_DIR="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/payloads/libpayload/install/libpayload" VB_SOURCE="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/3rdparty/vboot" -j${cores} depthcharge_unified cp "build/depthcharge.elf" "../coreboot/${cbrevision}/${cbrevision}/" @@ -129,7 +140,7 @@ buildcoreboot() { printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot make KBUILD_DEFCONFIG="$(pwd)/../../../resources/libreboot/config/depthcharge/${board}/config" defconfig - make -j$(nproc) + make -j${cores} cbfs_size=$( grep CONFIG_CBFS_SIZE ".config" | sed "s/.*[[:space:]]*=[[:space:]]*//g" ) cbfs_size=$( printf "%d\n" "${cbfs_size}" ) |