mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-27 05:21:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "setup_board: make the gcc version stable by default"

Browse Source 
This reverts commit 76a930df83466050ef065c1e433681145b83ab4c

Change-Id: I1b3bd9e8ebc87edcce42a0c105cfeb96c0d1ffd4
Reviewed-on: https://gerrit.chromium.org/gerrit/15004
Commit-Ready: Zdenek Behan <zbehan@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Tested-by: Zdenek Behan <zbehan@chromium.org>
This commit is contained in:
Zdenek Behan 2012-01-28 09:44:18 -08:00
parent 03b28fcbcf
commit 3ae2b4b5d1
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup_board
View File

@ -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 "stable" \
DEFINE_string gcc_version "4.6.0-r13" \
"Version of gcc to use."
DEFINE_string libc_version "2.11.1-r3" \
"Version of libc to use."
@ -142,14 +142,9 @@ toolchain_needs_update() {
return 1
fi
# 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
# 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
local flags="--pretend --quiet --update"
local pkgs