From 6778eeda8332a692d91e2b2bf677436bfaa2a815 Mon Sep 17 00:00:00 2001
From: Michael Marineau <mike@marineau.org>
Date: Wed, 23 Oct 2013 12:53:15 -0700
Subject: [PATCH] fix(bootstrap_sdk): Remove toolchain build step, replaced by
 build_toolchains

---
 bootstrap_sdk                                 |  2 +-
 build_container                               |  2 +-
 ...t_stage4.sh => catalyst_default_stage4.sh} |  0
 build_library/catalyst_sdk_stage4.sh          | 36 -------------------
 4 files changed, 2 insertions(+), 38 deletions(-)
 rename build_library/{catalyst_buildbot_stage4.sh => catalyst_default_stage4.sh} (100%)
 delete mode 100644 build_library/catalyst_sdk_stage4.sh

diff --git a/bootstrap_sdk b/bootstrap_sdk
index 59a1634109..747ddeb1c3 100755
--- a/bootstrap_sdk
+++ b/bootstrap_sdk
@@ -48,7 +48,7 @@ cat <<EOF
 target: stage4
 pkgcache_path: $BINPKGS
 stage4/packages: coreos-devel/sdk-depends
-stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_sdk_stage4.sh
+stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_default_stage4.sh
 stage4/root_overlay: ${TEMPDIR}/stage4_overlay
 EOF
 catalyst_stage_default
diff --git a/build_container b/build_container
index 6ae9bc69ab..9f76ae86af 100755
--- a/build_container
+++ b/build_container
@@ -24,7 +24,7 @@ cat <<EOF
 target: stage4
 pkgcache_path: $BINPKGS
 stage4/packages: coreos-devel/buildhost-depends
-stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_buildbot_stage4.sh
+stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_default_stage4.sh
 EOF
 catalyst_stage_default
 }
diff --git a/build_library/catalyst_buildbot_stage4.sh b/build_library/catalyst_default_stage4.sh
similarity index 100%
rename from build_library/catalyst_buildbot_stage4.sh
rename to build_library/catalyst_default_stage4.sh
diff --git a/build_library/catalyst_sdk_stage4.sh b/build_library/catalyst_sdk_stage4.sh
deleted file mode 100644
index 2012daa05f..0000000000
--- a/build_library/catalyst_sdk_stage4.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-source /tmp/chroot-functions.sh
-
-# Build cross toolchains
-for cross_chost in x86_64-cros-linux-gnu; do
-    echo "Installing toolchain for ${cross_chost}"
-    cross_pkgs=( cross-${cross_chost}/{binutils,gcc,gdb,glibc,linux-headers} )
-    crossdev --ov-output "/usr/local/portage/crossdev" \
-        --env 'FEATURES=splitdebug' \
-        --stable --ex-gdb --init-target \
-        --target "${cross_chost}" || exit 1
-
-    # If PKGCACHE is enabled check to see if binary packages are available.
-    # If so then don't perform a full bootstrap and just call emerge instead.
-    if [[ -n "${clst_PKGCACHE}" ]] && \
-        emerge ${clst_myemergeopts} --usepkgonly --binpkg-respect-use=y \
-            --pretend "${cross_pkgs[@]}" &>/dev/null
-    then
-        run_merge -u "${cross_pkgs[@]}"
-    else
-        crossdev --ov-output "/usr/local/portage/crossdev" \
-            --portage "${clst_myemergeopts}" \
-            --env 'FEATURES=splitdebug' \
-            --stable --ex-gdb --stage4 \
-            --target "${cross_chost}" || exit 1
-    fi
-
-    # There is no point to including the built packages in the final tarball
-    # because the packages will have to be downloaded anyway due to how the
-    # cross toolchains are managed in board sysroots.
-    crossdev --force -C "${cross_chost}"
-done
-
-echo "Double checking everything is fresh and happy."
-run_merge -uDN --with-bdeps=y world