mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-16 06:41:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure preflight prebuilts are actually clobbered in make_chroot.

Browse Source 
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 <jrbarnette@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
This commit is contained in:
David James 2012-02-23 21:18:14 -08:00 committed by Gerrit
parent 184e39019d
commit d46beb7f75
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_lib/make_chroot.sh
View File

@ -368,7 +368,7 @@ info "Setting up mounts..."
# Set up necessary mounts and make sure we clean them up on exit. # Set up necessary mounts and make sure we clean them up on exit.
sudo mkdir -p "${FLAGS_chroot}/${CHROOT_TRUNK}" "${FLAGS_chroot}/run" sudo mkdir -p "${FLAGS_chroot}/${CHROOT_TRUNK}" "${FLAGS_chroot}/run"
PREBUILT_SETUP="$FLAGS_chroot/etc/make.conf.prebuilt_setup" 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"' echo 'PORTAGE_BINHOST="$FULL_BINHOST"'
fi | sudo_clobber "$PREBUILT_SETUP" fi | sudo_clobber "$PREBUILT_SETUP"

6
update_chroot
View File

@ -39,10 +39,8 @@ ${SCRIPTS_DIR}/run_chroot_version_hooks
PREBUILT_SETUP="/etc/make.conf.prebuilt_setup" PREBUILT_SETUP="/etc/make.conf.prebuilt_setup"
if [[ -n "$IGNORE_PREFLIGHT_BINHOST" ]]; then if [[ -n "$IGNORE_PREFLIGHT_BINHOST" ]]; then
echo 'PORTAGE_BINHOST="$FULL_BINHOST"' | sudo_clobber "$PREBUILT_SETUP" echo 'PORTAGE_BINHOST="$FULL_BINHOST"'
elif [[ -s "$PREBUILT_SETUP" ]]; then fi | sudo_clobber "$PREBUILT_SETUP"
sudo_clobber "$PREBUILT_SETUP" < /dev/null
fi
info "Updating chroot" info "Updating chroot"