From 10025571d961207241ce4cb015b0ace7b97ae6e8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 17 Feb 2014 12:42:22 -0800 Subject: [PATCH] fix(common): Disable parallel_emerge by default for most commands. I would like to phase out parallel_emerge so disable it for all commands other than build_image which is the only one that shows a noticeable benefit from it (~2 min with --fast, ~3 min with --nofast). --- build_image | 2 +- common.sh | 4 ++-- update_chroot | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_image b/build_image index 8649fe7c5f..f602f8c94e 100755 --- a/build_image +++ b/build_image @@ -47,7 +47,7 @@ show_help_if_requested "$@" # not needed for the typical developer workflow. DEFINE_integer build_attempt 1 \ "The build attempt for this image build." -DEFINE_boolean fast "${DEFAULT_FAST}" \ +DEFINE_boolean fast ${FLAGS_TRUE} \ "Use the parallel_emerge wrapper script." DEFINE_integer jobs "${NUM_JOBS}" \ "How many packages to build in parallel at maximum." diff --git a/common.sh b/common.sh index 61c7ce7cda..11b1803a76 100644 --- a/common.sh +++ b/common.sh @@ -392,8 +392,8 @@ if [[ -f ${GCLIENT_ROOT}/src/scripts/.default_board ]]; then fi fi -# Enable --fast by default. -DEFAULT_FAST=${FLAGS_TRUE} +# Disable --fast in most commands +DEFAULT_FAST=${FLAGS_FALSE} # Directory to store built images. Should be set by sourcing script when used. BUILD_DIR= diff --git a/update_chroot b/update_chroot index c3282df255..e310a665cf 100755 --- a/update_chroot +++ b/update_chroot @@ -113,7 +113,7 @@ fi # In first pass, update portage and toolchains. Lagged updates of both # can cause serious issues later. info "Updating basic system packages" -sudo -E ${EMERGE_CMD} ${EMERGE_FLAGS} \ +sudo -E ${EMERGE_CMD} --quiet ${EMERGE_FLAGS} \ dev-util/ccache \ sys-apps/portage \ sys-devel/crossdev \