mk-sbuild: automatically install qemu-kvm-extras-static if requested

This commit is contained in:
Emmet Hikory 2010-02-09 12:07:35 +09:00
parent c2fa613721
commit 7a5de7c877
2 changed files with 5 additions and 5 deletions

1
debian/changelog vendored
View File

@ -5,6 +5,7 @@ ubuntu-dev-tools (0.93) UNRELEASED; urgency=low
[ Emmet Hikory ] [ Emmet Hikory ]
* Support qemu-arm-static -> qemu-kvm-extras-static transition * Support qemu-arm-static -> qemu-kvm-extras-static transition
* mk-sbuild: automatically install qemu-kvm-extras-static if requested
* mk-sbuild: conditionally install lvm2 only for lv-snapshot schroots * mk-sbuild: conditionally install lvm2 only for lv-snapshot schroots
* mk-sbuild: rationalise architecture variables * mk-sbuild: rationalise architecture variables

View File

@ -327,13 +327,12 @@ debian)
esac esac
DEBOOTSTRAP_COMMAND=debootstrap DEBOOTSTRAP_COMMAND=debootstrap
# Use qemu-arm-static / build-arm-chroot for foreign armel chroots # Use qemu-kvm-extras-static / build-arm-chroot for foreign armel chroots
if [ "$CHROOT_ARCH" = 'armel' ] && [ ! "$HOST_ARCH" = 'armel' ] ; then if [ "$CHROOT_ARCH" = 'armel' ] && [ ! "$HOST_ARCH" = 'armel' ] ; then
if [ -f "/usr/bin/build-arm-chroot" ]; then if [ ! -f "/usr/bin/build-arm-chroot" ]; then
DEBOOTSTRAP_COMMAND=build-arm-chroot sudo apt-get install qemu-kvm-extras-static
else
echo Please install qemu-arm-static to use foreign armel chroots
fi fi
DEBOOTSTRAP_COMMAND=build-arm-chroot
fi fi
case "$SRC_TYPE" in case "$SRC_TYPE" in