fix(catalyst): Move catalyst scripts from lib to build_library.

Just seems like a better place for them.
This commit is contained in:
Michael Marineau 2013-10-04 14:36:31 -07:00
parent 456af72625
commit 5adbfd8a32
5 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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
}