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

Merge pull request #102 from marineam/sdk-depends

Browse Source 
fix(sdk): Use coreos-devel/sdk-depends instead of hard-host-depends
This commit is contained in:
Michael Marineau 2013-08-29 08:51:31 -07:00
commit 753e1ea820
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap_sdk
View File

@ -47,7 +47,7 @@ catalyst_stage4() {
cat <<EOF cat <<EOF
target: stage4 target: stage4
pkgcache_path: $BINPKGS pkgcache_path: $BINPKGS
stage4/packages: dev-python/setuptools dev-vcs/git app-arch/pbzip2 net-misc/curl app-admin/sudo app-shells/bash-completion sys-devel/crossdev coreos-base/hard-host-depends stage4/packages: coreos-devel/sdk-depends
stage4/fsscript: ${SCRIPT_ROOT}/lib/catalyst_sdk_stage4.sh stage4/fsscript: ${SCRIPT_ROOT}/lib/catalyst_sdk_stage4.sh
stage4/root_overlay: ${TEMPDIR}/stage4_overlay stage4/root_overlay: ${TEMPDIR}/stage4_overlay
EOF EOF

2
setup_board
View File

@ -342,7 +342,7 @@ if ${HOST_BOARD}; then
if [[ $FLAGS_fast -eq $FLAGS_TRUE ]]; then if [[ $FLAGS_fast -eq $FLAGS_TRUE ]]; then
EMERGE_CMD="${GCLIENT_ROOT}/chromite/bin/parallel_emerge" EMERGE_CMD="${GCLIENT_ROOT}/chromite/bin/parallel_emerge"
fi fi
PACKAGES="system hard-host-depends world" PACKAGES="system coreos-devel/sdk-depends world"
# First, rebuild all packages from scratch. This is needed to make sure # First, rebuild all packages from scratch. This is needed to make sure
# we rebuild all chroot packages. # we rebuild all chroot packages.

4
update_chroot
View File

@ -105,7 +105,7 @@ if [[ "${FLAGS_jobs}" -ne -1 ]]; then
EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}" EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}"
fi fi
# Perform an update of hard-host-depends and world in the chroot. # Perform an update of coreos-devel/sdk-depends and world in the chroot.
EMERGE_CMD="emerge" EMERGE_CMD="emerge"
CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin" CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin"
if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
@ -137,7 +137,7 @@ done
# Second pass, update everything else. # Second pass, update everything else.
EMERGE_FLAGS+=" --deep" EMERGE_FLAGS+=" --deep"
sudo -E ${EMERGE_CMD} ${EMERGE_FLAGS} \ sudo -E ${EMERGE_CMD} ${EMERGE_FLAGS} \
coreos-base/hard-host-depends world coreos-devel/sdk-depends world
# Automatically discard all CONFIG_PROTECT'ed files. Those that are # Automatically discard all CONFIG_PROTECT'ed files. Those that are
# protected should not be overwritten until the variable is changed. # protected should not be overwritten until the variable is changed.