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

fix(sdk_lib/make_chroot): make using prebuilt sdk work

Browse Source 
fix a couple of buglets related to using a prebuilt sdk chroot
This commit is contained in:
Brandon Philips 2013-03-06 17:04:40 -08:00
parent 81e546cb0b
commit 2f5399b103
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdk_lib/make_chroot.sh
View File

@ -444,10 +444,7 @@ early_enter_chroot eselect python set python2.6
# fetch via remote git trees (for some bot configs). # fetch via remote git trees (for some bot configs).
if [[ ! -e "${FLAGS_chroot}/usr/bin/git" ]]; then if [[ ! -e "${FLAGS_chroot}/usr/bin/git" ]]; then
info "Installing early git" info "Installing early git"
early_enter_chroot $EMERGE_CMD -uNv $USEPKG dev-vcs/git app-shells/bash-completion early_enter_chroot $EMERGE_CMD -uNv $USEPKG dev-vcs/git
# Enable git terminal prompt
early_enter_chroot eselect bashcomp enable --global git-prompt
early_enter_chroot $EMERGE_CMD -uNv $USEPKG --select $EMERGE_JOBS \ early_enter_chroot $EMERGE_CMD -uNv $USEPKG --select $EMERGE_JOBS \
dev-libs/openssl net-misc/curl dev-libs/openssl net-misc/curl
@ -457,6 +454,11 @@ if [[ ! -e "${FLAGS_chroot}/usr/bin/git" ]]; then
early_enter_chroot $EMERGE_CMD -uNv $USEPKG net-misc/openssh --select $EMERGE_JOBS early_enter_chroot $EMERGE_CMD -uNv $USEPKG net-misc/openssh --select $EMERGE_JOBS
fi fi
# Enable git terminal prompt
early_enter_chroot $EMERGE_CMD -uNv $USEPKG app-shells/bash-completion
early_enter_chroot eselect bashcomp enable --global git-prompt
info "Updating host toolchain" info "Updating host toolchain"
early_enter_chroot $EMERGE_CMD -uNv crossdev early_enter_chroot $EMERGE_CMD -uNv crossdev
TOOLCHAIN_ARGS=( --deleteold ) TOOLCHAIN_ARGS=( --deleteold )
@ -474,7 +476,8 @@ early_enter_chroot $EMERGE_CMD --deselect dhcpcd
# openrc is included in stage3. We don't need it. # openrc is included in stage3. We don't need it.
info "Unmerge openrc" info "Unmerge openrc"
early_enter_chroot $EMERGE_CMD --unmerge sys-apps/openrc sys-apps/sysvinit sys-fs/udev-init-scripts early_enter_chroot $EMERGE_CMD --unmerge sys-apps/openrc sys-apps/sysvinit sys-fs/udev-init-scripts \
|| echo "openrc not installed, ignoring"
early_enter_chroot INSTALL_MASK="" $EMERGE_CMD coreos-base/efunctions early_enter_chroot INSTALL_MASK="" $EMERGE_CMD coreos-base/efunctions