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

Revert "Revert "Use --fast by default in build_image when --jobs is enabled.""

Browse Source 
parallel_emerge prints a message every 30 seconds now so that buildbot doesn't
kill us early. Per discussion with cmasone, reverting the revert.

This reverts commit debaa3d8cf1cfcbcc77b2f44729f6e7f83625ca1.
This commit is contained in:
David James 2010-07-08 21:21:41 -07:00
parent 37f50a00e6
commit 8edffbaec5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build_image
View File

@ -92,6 +92,11 @@ if [ "${FLAGS_rootfs_size}" -gt "${FLAGS_rootfs_partition_size}" ] ; then
exit 1 exit 1
fi fi
if [ ${FLAGS_jobs} -ne -1 ]; then
EMERGE_JOBS="--jobs=${FLAGS_jobs}"
FLAGS_fast=${FLAGS_TRUE}
fi
EMERGE_BOARD_CMD="emerge-${FLAGS_board}" EMERGE_BOARD_CMD="emerge-${FLAGS_board}"
if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
echo "Using alternate emerge" echo "Using alternate emerge"
@ -161,10 +166,6 @@ if [[ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]] ; then
INSTALL_MASK="${INSTALL_MASK} ${FACTORY_INSTALL_MASK}" INSTALL_MASK="${INSTALL_MASK} ${FACTORY_INSTALL_MASK}"
fi fi
if [[ ${FLAGS_jobs} -ne -1 ]]; then
EMERGE_JOBS="--jobs=${FLAGS_jobs}"
fi
# Figure out ARCH from the given toolchain. # Figure out ARCH from the given toolchain.
# TODO: Move to common.sh as a function after scripts are switched over. # TODO: Move to common.sh as a function after scripts are switched over.
TC_ARCH=$(echo "${CHOST}" | awk -F'-' '{ print $1 }') TC_ARCH=$(echo "${CHOST}" | awk -F'-' '{ print $1 }')

5
common.sh
View File

@ -325,14 +325,13 @@ function die {
} }
# Retry an emerge command according to $FLAGS_retries # Retry an emerge command according to $FLAGS_retries
# The $EMERGE_JOBS flags will only be added the first time the command is run
function eretry () { function eretry () {
$* && return 0
local i= local i=
for i in $(seq $FLAGS_retries); do for i in $(seq $FLAGS_retries); do
echo Retrying $* echo Retrying $*
$* $EMERGE_JOBS && return 0 $* && return 0
done done
$* && return 0
return 1 return 1
} }