~mdw
/
distorted-chroot
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bin/chroot-maint: Program for maintaining chroots.
[distorted-chroot]
/
bin
/
mkbuildchroot
diff --git
a/bin/mkbuildchroot
b/bin/mkbuildchroot
index
cb17ed2
..
a6ac135
100755
(executable)
--- a/
bin/mkbuildchroot
+++ b/
bin/mkbuildchroot
@@
-78,10
+78,6
@@
chmod 750 $mnt/
## Install the base system.
want=$BASE_PACKAGES
## 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
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 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
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
## Set the chroot's package state up properly.
schroot -uroot -csource:$lv -- eatmydata sh -e -c '
apt-get update