From e996baa382533ddd374d62ef94d93bd54194ec2d Mon Sep 17 00:00:00 2001 From: David James Date: Wed, 2 Nov 2011 16:11:27 -0700 Subject: [PATCH] Add IGNORE_PREFLIGHT_BINHOST env variable for ignoring PREFLIGHT_BINHOST. This variable is intended to be used by cbuildbot to allow it to ignore the preflight binhost when clobbering the preflight builder itself, to ensure it doesn't pick up the old preflight prebuilts again. BUG=chromium-os:21788 TEST=Set IGNORE_PREFLIGHT_BINHOST and see that preflight binhosts are ignored. Change-Id: I2a0ca38ad8d35b34d2f14a980d5cd67ab66c0f07 Reviewed-on: https://gerrit.chromium.org/gerrit/11088 Reviewed-by: Ryan Cui Tested-by: Ryan Cui Commit-Ready: David James --- update_chroot | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/update_chroot b/update_chroot index 07c561f385..99b04e8853 100755 --- a/update_chroot +++ b/update_chroot @@ -35,6 +35,13 @@ set -e # Run version hooks as pre-update ${SCRIPTS_DIR}/run_chroot_version_hooks +PREBUILT_SETUP="/etc/make.conf.prebuilt_setup" +if [[ -n "$IGNORE_PREFLIGHT_BINHOST" ]]; then + echo 'PORTAGE_BINHOST="$FULL_BINHOST"' | sudo_clobber "$PREBUILT_SETUP" +elif [[ -s "$PREBUILT_SETUP" ]]; then + sudo_clobber "$PREBUILT_SETUP" < /dev/null +fi + info "Updating chroot" EMERGE_FLAGS="-uNv --with-bdeps=y"