X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-chroot/blobdiff_plain/27922408e861f9d0939afa1f408636302f8d943a..a98c9dba94d44ada3a7e7f3b4ce8b6df6911a2d2:/bin/mkbuildchroot?ds=sidebyside

diff --git a/bin/mkbuildchroot b/bin/mkbuildchroot
index cb17ed2..a6ac135 100755
--- a/bin/mkbuildchroot
+++ b/bin/mkbuildchroot
@@ -78,10 +78,6 @@ chmod 750 $mnt/
 
 ## Install the base system.
 want=$BASE_PACKAGES
-case $qemup in
-  t) want="$want $FOREIGN_BASE_PACKAGES" ;;
-  nil) want="$want $NATIVE_BASE_PACKAGES" ;;
-esac
 pkgs=; for p in $want; do pkgs=${pkgs:+$pkgs,}$p; done
 eatmydata debootstrap $dbsopts --arch=$a --variant=minbase \
 	  --include=$pkgs $d $mnt/fs/ $DEBMIRROR
@@ -163,13 +159,13 @@ case $qemup in
 
     ## Install faster native tools.
     $STATE/bin/install-cross-tools $d $a
-
-    ## Install `build-essential', which had been delayed from earlier.
-    schroot -uroot -csource:$lv -- \
-	    eatmydata apt-get -y install build-essential
-    ;;
 esac
 
+## Install extra packages now that everything should go fairly quickly.
+want=$EXTRA_PACKAGES
+pkgs=; for p in $want; do pkgs=${pkgs:+$pkgs,}$p; done
+schroot -uroot -csource:$lv -- eatmydata apt-get -y install $pkgs
+
 ## Set the chroot's package state up properly.
 schroot -uroot -csource:$lv -- eatmydata sh -e -c '
 	apt-get update