From 69e94f001ee8fcd3a92c274b39125f240364f821 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Thu, 7 Feb 2013 19:08:47 -0800 Subject: [PATCH] fix(make_chroot): get openssh and python 2.6 installed new stage3 tarballs have python 3. Get python 2.6 installed and reemerge openssh Change-Id: I903bbb4251534e9a1428d9773a57f2cf0602816f --- sdk_lib/make_chroot.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh index 3a9b1b16aa..31c84be8d1 100755 --- a/sdk_lib/make_chroot.sh +++ b/sdk_lib/make_chroot.sh @@ -426,9 +426,14 @@ echo STAGE3=$STAGE3 > $CHROOT_STATE info "Updating portage" early_enter_chroot emerge -uNv --quiet portage -info "Install python-2.7" -early_enter_chroot emerge -uNv --quiet python:2.7 dev-python/setuptools -early_enter_chroot eselect python set python2.7 + +info "Unmerge openssh temporarily" +early_enter_chroot emerge --unmerge net-misc/openssh + + +info "Install python-2.6" +early_enter_chroot emerge -uNv --quiet python:2.6 dev-python/setuptools +early_enter_chroot eselect python set python2.6 # Packages that inherit cros-workon commonly get a circular dependency @@ -445,7 +450,7 @@ if [[ ! -e "${FLAGS_chroot}/usr/bin/git" ]]; then # (Re-)emerge the full version of git. info "Updating full version of git" - early_enter_chroot $EMERGE_CMD -uNv $USEPKG dev-vcs/git + early_enter_chroot $EMERGE_CMD -uNv $USEPKG dev-vcs/git net-misc/openssh --select $EMERGE_JOBS fi info "Updating host toolchain"