From 5adbfd8a32be25b7a0637e99a1e264dea9a461ce Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 4 Oct 2013 14:36:31 -0700
Subject: [PATCH] fix(catalyst): Move catalyst scripts from lib to
 build_library.

Just seems like a better place for them.
---
 bootstrap_sdk                                      | 4 ++--
 build_container                                    | 4 ++--
 {lib => build_library}/catalyst.sh                 | 0
 {lib => build_library}/catalyst_buildbot_stage4.sh | 0
 {lib => build_library}/catalyst_sdk_stage4.sh      | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {lib => build_library}/catalyst.sh (100%)
 rename {lib => build_library}/catalyst_buildbot_stage4.sh (100%)
 rename {lib => build_library}/catalyst_sdk_stage4.sh (100%)

diff --git a/bootstrap_sdk b/bootstrap_sdk
index 4a551b2bca..59a1634109 100755
--- a/bootstrap_sdk
+++ b/bootstrap_sdk
@@ -37,7 +37,7 @@ TYPE="coreos-sdk"
 ARCH=$(portageq envvar ARCH)
 DEFAULT_PROFILE="coreos:default/linux/${ARCH}/10.0"
 
-. "${SCRIPT_ROOT}/lib/catalyst.sh" || exit 1
+. "${BUILD_LIBRARY_DIR}/catalyst.sh" || exit 1
 
 # include upload options
 . "${BUILD_LIBRARY_DIR}/release_util.sh" || exit 1
@@ -48,7 +48,7 @@ cat <<EOF
 target: stage4
 pkgcache_path: $BINPKGS
 stage4/packages: coreos-devel/sdk-depends
-stage4/fsscript: ${SCRIPT_ROOT}/lib/catalyst_sdk_stage4.sh
+stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_sdk_stage4.sh
 stage4/root_overlay: ${TEMPDIR}/stage4_overlay
 EOF
 catalyst_stage_default
diff --git a/build_container b/build_container
index 181a41140c..6ae9bc69ab 100755
--- a/build_container
+++ b/build_container
@@ -13,7 +13,7 @@ DEFAULT_SEED="builds/coreos-sdk/stage4-${ARCH}-latest.tar.bz2"
 DEFAULT_PROFILE="coreos:default/linux/${ARCH}/10.0"
 FORCE_STAGES="stage4"
 
-. "${SCRIPT_ROOT}/lib/catalyst.sh" || exit 1
+. "${BUILD_LIBRARY_DIR}/catalyst.sh" || exit 1
 
 # include upload options
 . "${BUILD_LIBRARY_DIR}/release_util.sh" || exit 1
@@ -24,7 +24,7 @@ cat <<EOF
 target: stage4
 pkgcache_path: $BINPKGS
 stage4/packages: coreos-devel/buildhost-depends
-stage4/fsscript: ${SCRIPT_ROOT}/lib/catalyst_buildbot_stage4.sh
+stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_buildbot_stage4.sh
 EOF
 catalyst_stage_default
 }
diff --git a/lib/catalyst.sh b/build_library/catalyst.sh
similarity index 100%
rename from lib/catalyst.sh
rename to build_library/catalyst.sh
diff --git a/lib/catalyst_buildbot_stage4.sh b/build_library/catalyst_buildbot_stage4.sh
similarity index 100%
rename from lib/catalyst_buildbot_stage4.sh
rename to build_library/catalyst_buildbot_stage4.sh
diff --git a/lib/catalyst_sdk_stage4.sh b/build_library/catalyst_sdk_stage4.sh
similarity index 100%
rename from lib/catalyst_sdk_stage4.sh
rename to build_library/catalyst_sdk_stage4.sh