mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 14:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(catalyst.sh): Update catalyst build more aggressively.

Browse Source 
Use 2*CPUs for the target load average but add load average throttling
to emerge in addition to make. Also work around how catalyst sets
FEATURES so we can disable extra locking for hopefully faster builds.
This commit is contained in:
Michael Marineau 2013-11-06 15:09:41 -08:00
parent 55a4517d65
commit e145b916f2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build_library/catalyst.sh
View File

@ -77,9 +77,14 @@ EOF
}
catalystrc() {
echo "export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${NUM_JOBS}'"
echo "export EMERGE_DEFAULT_OPTS=--jobs=${NUM_JOBS}"
echo "export FEATURES='parallel-install -ebuild-locks'"
local load=$((NUM_JOBS * 2))
cat <<EOF
export TERM='${TERM}'
export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}'
export EMERGE_DEFAULT_OPTS="\$MAKEOPTS"
# Catalyst overrides FEATURES so set it's own variable instead.
export clst_myfeatures='-ebuild-locks'
EOF
}
# Common values for all stage spec files