From ca6415dc89ad6fc903e1665a2e1444ea8f865bc7 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 26 Jul 2013 15:15:57 -0400
Subject: [PATCH] fix(cros_sdk): Support using lbzip2 during chroot creation.

Our SDK tarballs aren't compressed using pbzip2 so there is no advantage
to using pbzip2 to decompress them over bzip2, however lbzip2 does offer
a big advantage. Also trust that the portage config defines a valid
version of bzip2 since we have control over the tarball creation and can
make sure to always include required utilities.
---
 sdk_lib/make_chroot.sh | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 4632d5184c..fbca67417a 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -108,11 +108,10 @@ enter_chroot() {
 
 # Invoke enter_chroot running the command as root, and w/out sudo.
 # This should be used prior to sudo being merged.
-early_env=()
 early_enter_chroot() {
   "$ENTER_CHROOT" --chroot "$FLAGS_chroot" --early_make_chroot \
     --cache_dir "${FLAGS_cache_dir}" \
-    -- "${ENTER_CHROOT_ARGS[@]}" "${early_env[@]}" "$@"
+    -- "${ENTER_CHROOT_ARGS[@]}" "$@"
 }
 
 # Run a command within the chroot.  The main usage of this is to avoid
@@ -378,7 +377,7 @@ then
 else
   info "Unpacking STAGE3..."
   case ${STAGE3} in
-    *.tbz2|*.tar.bz2) DECOMPRESS=$(type -p pbzip2 || echo bzip2) ;;
+    *.tbz2|*.tar.bz2) DECOMPRESS=$(type -p lbzip2 || echo bzip2) ;;
     *.tar.xz) DECOMPRESS="xz" ;;
     *) die "Unknown tarball compression: ${STAGE3}";;
   esac
@@ -409,15 +408,6 @@ if ! [ -f "$CHROOT_STATE" ];then
   INITIALIZE_CHROOT=1
 fi
 
-
-if ! early_enter_chroot bash -c 'type -P pbzip2' >/dev/null ; then
-  # This chroot lacks pbzip2 early on, so we need to disable it.
-  early_env+=(
-    PORTAGE_BZIP2_COMMAND="bzip2"
-    PORTAGE_BUNZIP2_COMMAND="bunzip2"
-  )
-fi
-
 if [ -z "${INITIALIZE_CHROOT}" ];then
   info "chroot already initialized.  Skipping..."
 else