From d46beb7f75376bda0a1204d528a6c616cb8f5397 Mon Sep 17 00:00:00 2001 From: David James Date: Thu, 23 Feb 2012 21:18:14 -0800 Subject: [PATCH] Ensure preflight prebuilts are actually clobbered in make_chroot. The logic of IGNORE_PREFLIGHT_PREBUILTS is currently inverted in make_chroot, causing preflight prebuilts to be ignored by default, but then used in the one situation where they should be ignored. This CL fixes that. BUG=chromium-os:26834 TEST=Verify preflight prebuilts are now used by default in make_chroot. Change-Id: I626319d6de79b6f201f993a05e34610e944b161e Reviewed-on: https://gerrit.chromium.org/gerrit/16614 Reviewed-by: Richard Barnette Commit-Ready: David James Tested-by: David James --- sdk_lib/make_chroot.sh | 2 +- update_chroot | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh index 012cbb06d3..09cc500385 100755 --- a/sdk_lib/make_chroot.sh +++ b/sdk_lib/make_chroot.sh @@ -368,7 +368,7 @@ info "Setting up mounts..." # Set up necessary mounts and make sure we clean them up on exit. sudo mkdir -p "${FLAGS_chroot}/${CHROOT_TRUNK}" "${FLAGS_chroot}/run" PREBUILT_SETUP="$FLAGS_chroot/etc/make.conf.prebuilt_setup" -if [[ -z "$IGNORE_PREFLIGHT_BINHOST" ]]; then +if [[ -n "$IGNORE_PREFLIGHT_BINHOST" ]]; then echo 'PORTAGE_BINHOST="$FULL_BINHOST"' fi | sudo_clobber "$PREBUILT_SETUP" diff --git a/update_chroot b/update_chroot index 4283474d56..8a271c3959 100755 --- a/update_chroot +++ b/update_chroot @@ -39,10 +39,8 @@ ${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 + echo 'PORTAGE_BINHOST="$FULL_BINHOST"' +fi | sudo_clobber "$PREBUILT_SETUP" info "Updating chroot"