commit 2de7f049ad0f280cfe8b666c58eecf8a5e61adee
author Mike Frysinger <vapier@chromium.org> Tue Jul 10 04:45:03 2012 -0400
committer Gerrit <chrome-bot@google.com> Tue Jul 10 23:27:11 2012 -0700
tree d14569b6f84f807603a5c76035adecb687bbfcf6
parent 4d46a82a2c801d2e58d9946f91bd425dbd5c75a6

do not use binpkgs when using a fresh sdk

When using the freshly created sdk, we do not want to force binpkgs
when trying to update chroot packages because the binpkgs don't yet
exist -- they're created by this step.  Otherwise, we get into the
situation where the bootstrapped sdk installs a newer package which
is then downgraded when we attempt to use it for the first time.

BUG=chromium-os:32354
TEST=`./buildbot/run_tests` passed
TEST=`cbuildbot chromiumos-sdk` worked

Change-Id: I223c03379f9e34d59e8a48e1ee94a2b3964c57ac
Reviewed-on: https://gerrit.chromium.org/gerrit/27028
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index 5f66fa6..aff49c2 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2011-2012 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -211,7 +211,7 @@
     raise SystemExit('Running %r failed!' % cmd)
 
 
-def CreateChroot(sdk_url, sdk_version, chroot_path, replace):
+def CreateChroot(sdk_url, sdk_version, chroot_path, replace, nousepkg):
   """Creates a new chroot from a given SDK"""
   if not os.path.exists(SDK_DIR):
     cros_build_lib.RunCommand(['mkdir', '-p', SDK_DIR], print_cmd=False)
@@ -232,7 +232,8 @@
   # this to just unpacking the sdk.
   cmd = MAKE_CHROOT + ['--stage3_path', sdk,
                        '--chroot', chroot_path]
-
+  if nousepkg:
+    cmd.append('--nousepkg')
   if replace:
     cmd.append('--replace')
 
@@ -327,6 +328,9 @@
   parser.add_option('-r', '--replace',
                     action='store_true', dest='replace', default=False,
                     help=('Replace an existing SDK chroot'))
+  parser.add_option('--nousepkg',
+                    action='store_true', dest='nousepkg', default=False,
+                    help=('Do not use binary packages when creating a chroot'))
   parser.add_option('-u', '--url',
                     dest='sdk_url', default='',
                     help=('''Use sdk tarball located at this url.
@@ -423,7 +427,7 @@
                             options.replace)
           else:
             CreateChroot(options.sdk_url, sdk_version,
-                         chroot_path, options.replace)
+                         chroot_path, options.replace, options.nousepkg)
         if options.enter:
           lock.read_lock()
           EnterChroot(chroot_path, options.chrome_root,