From 0dccff339e2a69115c556cb8338fe5b0e6c68622 Mon Sep 17 00:00:00 2001 From: David James Date: Thu, 9 Jun 2011 13:03:47 -0700 Subject: [PATCH] Allow for new toolchains to be rolled out when sdk builder completes. New toolchains should only be rolled out to developers running with binary packages when the sdk-builder has completed and uploaded the prebuilts. This ensures that we've vetted the toolchain properly before it rolls out and also speeds up binary builds for developers. This also provides consistency with the behavior of setup_board. BUG=chromium-os:16363 TEST=Verify these 3 packages are only updated in --usepkg builds when the prebuilts are also updated. Change-Id: I6be7c6c98c12130751d3d4440bec7c71afb1d4c2 Reviewed-on: http://gerrit.chromium.org/gerrit/2391 Reviewed-by: Raymes Khoury Tested-by: David James --- update_chroot | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/update_chroot b/update_chroot index 19bcd8cec6..0c80defb2c 100755 --- a/update_chroot +++ b/update_chroot @@ -40,6 +40,13 @@ info "Updating chroot" EMERGE_FLAGS="-uDNv --with-bdeps=y" if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg" + + # Only update toolchain when binpkgs are available. Toolchain rollout + # process only takes place when the chromiumos sdk builder finishes + # a successful build. + EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/binutils" + EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/gcc" + EMERGE_FLAGS+=" --useoldpkg-atoms=sys-libs/glibc" fi # Perform an update of hard-host-depends and world in the chroot.