commit 677b6d8f17b5cad13b2bbd31291b82b72871e5e4
author Zdenek Behan <zbehan@chromium.org> Wed Apr 11 05:31:47 2012 +0200
committer Gerrit <chrome-bot@google.com> Thu Apr 12 13:53:07 2012 -0700
tree b2e5f78a718b5f8e439bd3c450040825664ac4cc
parent 404ec14924c949c997bddb7d4353463d47652fc1

cros_setup_toolchains: Make binutils stable and script more permissive

* Removed one dysfunctional block for stable ebuild logic
* When running as usepkg, allow older binaries to be used

BUG=chromium-os:25338
TEST=run it

Change-Id: I065df53dddc851a58f091ea19549a2a8dfd13e4e
Reviewed-on: https://gerrit.chromium.org/gerrit/19949
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Zdenek Behan <zbehan@chromium.org>
Tested-by: Zdenek Behan <zbehan@chromium.org>

scripts/cros_setup_toolchains.py

diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 6fcb35d..4802329 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -40,7 +40,6 @@
 # This is done essentially by messing with GetDesiredPackageVersions()
 DEFAULT_VERSION = PACKAGE_STABLE
 DEFAULT_TARGET_VERSION_MAP = {
-  'binutils' : '2.21-r4',
 }
 TARGET_VERSION_MAP = {
   'host' : {
@@ -432,10 +431,9 @@
   packages = []
   for pkg in mergemap:
     for ver in mergemap[pkg]:
-      if ver == PACKAGE_STABLE:
-        packages.append(pkg)
-      elif ver != PACKAGE_NONE:
-        packages.append('=%s-%s' % (pkg, ver))
+      if ver != PACKAGE_NONE:
+        # Be a little more permissive for usepkg, the binaries may not exist.
+        packages.append('%s%s-%s' % ('<=' if usepkg else '=', pkg, ver))
 
   if not packages:
     print 'Nothing to update!'