From f24a02e034d87b91b85c464368fdea35acedc04c Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sat, 13 Jul 2013 21:06:29 -0400
Subject: [PATCH] fix(catalyst): Use new COREOS_SDK_VERSION var from
 version.txt

The current SDK version is now provided by the manifest's version.txt
file which is already sourced by common.sh.
---
 lib/catalyst.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/catalyst.sh b/lib/catalyst.sh
index c218bd46d7..334b39410c 100644
--- a/lib/catalyst.sh
+++ b/lib/catalyst.sh
@@ -24,8 +24,7 @@ STAGES=
 
 # For searching for alternatives when DEFAULT_SEED doesn't exist
 # unset SDK_SEARCH=1 to disable this fallback
-SDK_VERSION_FILE="coreos/binhost/host/sdk_version.conf"
-SDK_TARBALL_FMT="coreos-sdk-${ARCH}-%s.tar.bz2"
+SDK_TARBALL="coreos-sdk-${ARCH}-${COREOS_SDK_VERSION}.tar.bz2"
 SDK_SEARCH=1
 
 DEFINE_string catalyst_root "${DEFAULT_CATALYST_ROOT}" \
@@ -212,11 +211,7 @@ search_for_sdk_seed() {
     # User set the option so we shouldn't change it
     [[ "${FLAGS_seed_tarball}" != "${DEFAULT_SEED}" ]] && return
 
-    local SDK_LATEST_VERSION SDK_TARBALL check_path
-    eval $(grep "^SDK_LATEST_VERSION=" \
-            "${FLAGS_coreos_overlay}/${SDK_VERSION_FILE}")
-    SDK_TARBALL=$(printf "${SDK_TARBALL_FMT}" "${SDK_LATEST_VERSION}")
-
+    local check_path
     for check_path in \
         "${CATALYST_ROOT}/builds/coreos-sdk/${SDK_TARBALL}" \
         "${CATALYST_ROOT}/builds/seeds/${SDK_TARBALL}" \