From 03b28fcbcf23bdc4741c2117ada7785176d76e10 Mon Sep 17 00:00:00 2001 From: Zdenek Behan Date: Thu, 26 Jan 2012 16:43:54 +0100 Subject: [PATCH] setup_board: make the gcc version stable by default This is needed as part of transition to cros-workon. Crossdev has a -S option to install the current stable, which is the preferred future option, but would greatly complicate the logic. BUG=chromium-os:25338 TEST=setup_board --board=any --force, see it build the right one Change-Id: Ibb4fd18d122f69835eb471b2fa1a258c571dfdd1 Reviewed-on: https://gerrit.chromium.org/gerrit/14878 Tested-by: Zdenek Behan Commit-Ready: Zdenek Behan Reviewed-by: Zdenek Behan --- setup_board | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/setup_board b/setup_board index 1e500f4e8f..73906d1a8e 100755 --- a/setup_board +++ b/setup_board @@ -48,7 +48,7 @@ DEFINE_boolean force $FLAGS_FALSE \ "Force re-creating board root." DEFINE_string binutils_version "2.21-r3" \ "Version of binutils to use." -DEFINE_string gcc_version "4.6.0-r13" \ +DEFINE_string gcc_version "stable" \ "Version of gcc to use." DEFINE_string libc_version "2.11.1-r3" \ "Version of libc to use." @@ -142,9 +142,14 @@ toolchain_needs_update() { return 1 fi - # Unmask any ebuilds previously masked by crossdev. crossdev will re-setup - # its masks appropriately the next time we run it. - sudo rm -f /etc/portage/package.mask/cross-$toolchain + # Unmask any ebuilds previously [un]masked by crossdev. crossdev will + # re-setup its masks appropriately the next time we run it. + sudo rm -f /etc/portage/package.{mask,keywords}/cross-$toolchain + + if [ "$FLAGS_gcc_version" = "stable" ]; then + FLAGS_gcc_version=$(portageq best_visible / "cross-$toolchain/gcc"| \ + sed -e "s,cross-$toolchain/gcc-,,") + fi local flags="--pretend --quiet --update" local pkgs