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

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

Browse Source 
This reverts commit 19754342048a44304150981b2938f604751605e7

The tree is on fire: the x86 canaries and x86 generic full
bots are dying with internal gold link errors.
http://crosbug.com/26168

Only happens on new sdks, so we're shotgunning a few
suspicious revs and hoping for the best.

Change-Id: Iae05c876ff2a84f4a9f549f74b2ee7e0903f2b5a
Reviewed-on: https://gerrit.chromium.org/gerrit/15669
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-02-10 09:31:33 -08:00
parent cdf3bad8a3
commit d5d23b8d5a
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
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."
@ -134,11 +134,6 @@ toolchain_needs_update() {
# If toolchain symlinks weren't created yet, we definitely need to update. # If toolchain symlinks weren't created yet, we definitely need to update.
if [ ! -d /usr/local/portage/crossdev/cross-$toolchain ]; then if [ ! -d /usr/local/portage/crossdev/cross-$toolchain ]; then
# NOTE: In this branch, the versions have not been resolved, and will
# be passed directly to crossdev. That works because crossdev understands
# '[stable]'.
# We cannot resolve the versions because the cross-$toolchain category is
# not yet set up.
return 0 return 0
fi fi
@ -147,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
@ -225,11 +206,8 @@ build_toolchain() {
if [ $FLAGS_latest_toolchain -ne $FLAGS_TRUE ]; then if [ $FLAGS_latest_toolchain -ne $FLAGS_TRUE ]; then
CROSS_ARGS+=" --binutils $FLAGS_binutils_version" CROSS_ARGS+=" --binutils $FLAGS_binutils_version"
CROSS_ARGS+=" --gcc $FLAGS_gcc_version" CROSS_ARGS+=" --gcc $FLAGS_gcc_version"
if [[ "$toolchain" != "arm-none-eabi" ]]; then CROSS_ARGS+=" --kernel $FLAGS_kernel_version"
# arm-none-eabi needs no version specification CROSS_ARGS+=" --libc $FLAGS_libc_version"
CROSS_ARGS+=" --kernel $FLAGS_kernel_version"
CROSS_ARGS+=" --libc $FLAGS_libc_version"
fi
fi fi
CROSS_ARGS+=" --ex-gdb" CROSS_ARGS+=" --ex-gdb"