mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "setup_board: make the gcc/glibc version stable by default, take 2"

Browse Source 
Breaks chromiumos-sdk on failing to resolve the 'stable' keywords into actual versions.

This reverts commit 82eadcf2de828e4dd1182ee717998128387ecbad

Change-Id: I031e1edb90a251562621d935bb9e3800f35318af
Reviewed-on: https://gerrit.chromium.org/gerrit/15150
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-02-01 06:09:19 -08:00
parent 22fe627981
commit bcb72afd00
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
setup_board
View File

@ -48,9 +48,9 @@ DEFINE_boolean force $FLAGS_FALSE \
"Force re-creating board root." "Force re-creating board root."
DEFINE_string binutils_version "2.21-r3" \ DEFINE_string binutils_version "2.21-r3" \
"Version of binutils to use." "Version of binutils to use."
DEFINE_string gcc_version "stable" \ DEFINE_string gcc_version "4.6.0-r13" \
"Version of gcc to use." "Version of gcc to use."
DEFINE_string libc_version "stable" \ DEFINE_string libc_version "2.11.1-r3" \
"Version of libc to use." "Version of libc to use."
DEFINE_string kernel_version "3.1" \ DEFINE_string kernel_version "3.1" \
"Version of kernel headers to use." "Version of kernel headers to use."
@ -142,23 +142,9 @@ toolchain_needs_update() {
return 1 return 1
fi fi
# Unmask any ebuilds previously [un]masked by crossdev. crossdev will # Unmask any ebuilds previously masked by crossdev. crossdev will re-setup
# re-setup its masks appropriately the next time we run it. # its masks appropriately the next time we run it.
sudo rm -f /etc/portage/package.{mask,keywords}/cross-$toolchain sudo rm -f /etc/portage/package.mask/cross-$toolchain
pkg_to_flag() {
[ "${1}" = "glibc" ] && echo "libc" || echo "$1"
}
local pkg
for pkg in gcc glibc binutils; do
local flagname=FLAGS_$(pkg_to_flag ${pkg})_version
if [ "${!flagname}" = "stable" ]; then
eval ${flagname}=$( \
portageq best_visible / "cross-$toolchain/${pkg}"| \
sed -e "s,cross-$toolchain/${pkg}-,,")
fi
done
local flags="--pretend --quiet --update" local flags="--pretend --quiet --update"
local pkgs local pkgs