TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2026-02-15 07:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not use parallel build for grub2

Browse Source
This commit is contained in:
themylogin
2021-04-01 16:08:08 +02:00
parent 35f6324742
commit 2e27e4cefb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/build.sh
View File

@@ -395,7 +395,7 @@ build_deb_packages() {
mk_overlayfs
# Clear variables we are going to load from MANIFEST
unset GENERATE_VERSION SUBDIR PREBUILD PREDEP NAME KMOD
unset GENERATE_VERSION SUBDIR PREBUILD DEOPTIONS PREDEP NAME KMOD JOBS
NAME=$(${YQ} e ".sources[$k].name" ${MANIFEST})
PREDEP=$(${YQ} e ".sources[$k].predepscmd" ${MANIFEST})
@@ -404,6 +404,7 @@ build_deb_packages() {
SUBDIR=$(${YQ} e ".sources[$k].subdir" ${MANIFEST})
GENERATE_VERSION=$(${YQ} e ".sources[$k].generate_version" ${MANIFEST})
KMOD=$(${YQ} e ".sources[$k].kernel_module" ${MANIFEST})
JOBS=$(${YQ} e ".sources[$k].jobs" ${MANIFEST})
if [ ! -d "${SOURCES}/${NAME}" ] ; then
exit_err "Missing sources for ${NAME}, did you forget to run 'make checkout'?"
fi
@@ -441,9 +442,9 @@ build_deb_packages() {
else
if [ -n "${PKG_DEBUG}" ] ; then
# Running in PKG_DEBUG mode - Display to stdout
build_normal_dpkg "$NAME" "$PREDEP" "$PREBUILD" "$DEOPTIONS" "$SUBDIR" "$GENERATE_VERSION" "$KMOD"
build_normal_dpkg "$NAME" "$PREDEP" "$PREBUILD" "$DEOPTIONS" "$SUBDIR" "$GENERATE_VERSION" "$KMOD" "$JOBS"
else
build_normal_dpkg "$NAME" "$PREDEP" "$PREBUILD" "$DEOPTIONS" "$SUBDIR" "$GENERATE_VERSION" "$KMOD" >>${LOG_DIR}/packages/${NAME}.log 2>&1
build_normal_dpkg "$NAME" "$PREDEP" "$PREBUILD" "$DEOPTIONS" "$SUBDIR" "$GENERATE_VERSION" "$KMOD" "$JOBS" >>${LOG_DIR}/packages/${NAME}.log 2>&1
fi
fi
@@ -645,7 +646,12 @@ build_normal_dpkg() {
subarg="$5"
generate_version="$6"
kmod="$7"
deflags="-us -uc -b"
jobs="$8"
if [ -z "$jobs" -o "$jobs" = "null" ] ; then
deflags="-j$(nproc) -us -uc -b"
else
deflags="-j${jobs} -us -uc -b"
fi
# Check if we have a valid sub directory for these sources
if [ -z "$subarg" -o "$subarg" = "null" ] ; then