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

Merge pull request #32 from marineam/sdk-version

Browse Source 
fix(catalyst): Use new COREOS_SDK_VERSION var from version.txt
This commit is contained in:
Michael Marineau 2013-07-13 18:35:35 -07:00
commit e03e9dbfdc
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/catalyst.sh
View File

@ -24,8 +24,7 @@ STAGES=
# For searching for alternatives when DEFAULT_SEED doesn't exist # For searching for alternatives when DEFAULT_SEED doesn't exist
# unset SDK_SEARCH=1 to disable this fallback # unset SDK_SEARCH=1 to disable this fallback
SDK_VERSION_FILE="coreos/binhost/host/sdk_version.conf" SDK_TARBALL="coreos-sdk-${ARCH}-${COREOS_SDK_VERSION}.tar.bz2"
SDK_TARBALL_FMT="coreos-sdk-${ARCH}-%s.tar.bz2"
SDK_SEARCH=1 SDK_SEARCH=1
DEFINE_string catalyst_root "${DEFAULT_CATALYST_ROOT}" \ 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 # User set the option so we shouldn't change it
[[ "${FLAGS_seed_tarball}" != "${DEFAULT_SEED}" ]] && return [[ "${FLAGS_seed_tarball}" != "${DEFAULT_SEED}" ]] && return
local SDK_LATEST_VERSION SDK_TARBALL check_path local check_path
eval $(grep "^SDK_LATEST_VERSION=" \
"${FLAGS_coreos_overlay}/${SDK_VERSION_FILE}")
SDK_TARBALL=$(printf "${SDK_TARBALL_FMT}" "${SDK_LATEST_VERSION}")
for check_path in \ for check_path in \
"${CATALYST_ROOT}/builds/coreos-sdk/${SDK_TARBALL}" \ "${CATALYST_ROOT}/builds/coreos-sdk/${SDK_TARBALL}" \
"${CATALYST_ROOT}/builds/seeds/${SDK_TARBALL}" \ "${CATALYST_ROOT}/builds/seeds/${SDK_TARBALL}" \