make_chroot: drop git/curl/openssl manual updating
This code is necessary when openssl is a cros-workon package, but we
migrated away from that a while ago. Dropping this logic speeds up
chroot creation and simplifies the code.
BUG=chromium:342199
TEST=`cbuildbot chromiumos-sdk` passes
TEST=creating a new chroot works
Change-Id: I8eb7b307a39ae892f8613daee320132cd61a41a1
Reviewed-on: https://chromium-review.googlesource.com/227601
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 64e8f4f..e277417 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -454,23 +454,6 @@
sudo ln -s -fT "${CHROOT_TRUNK_DIR}"/chromite "${python_path}"/chromite
done
-# Packages that inherit cros-workon commonly get a circular dependency
-# curl->openssl->git->curl that is broken by emerging an early version of git
-# without curl (and webdav that depends on it).
-# We also need to do this before the toolchain as those will sometimes also
-# fetch via remote git trees (for some bot configs).
-if [[ ! -e "${FLAGS_chroot}/usr/bin/git" ]]; then
- info "Updating early git"
- USE="-curl -webdav" early_enter_chroot $EMERGE_CMD -uNv $USEPKG dev-vcs/git
-
- early_enter_chroot $EMERGE_CMD -uNv $USEPKG --select $EMERGE_JOBS \
- dev-libs/openssl net-misc/curl
-
- # (Re-)emerge the full version of git.
- info "Updating full version of git"
- early_enter_chroot $EMERGE_CMD -uNv $USEPKG dev-vcs/git
-fi
-
info "Updating host toolchain"
early_enter_chroot $EMERGE_CMD -uNv crossdev
TOOLCHAIN_ARGS=( --deleteold )
