From 7a5de7c8776b765241acbc4c7f5cd19f7512f1df Mon Sep 17 00:00:00 2001 From: Emmet Hikory Date: Tue, 9 Feb 2010 12:07:35 +0900 Subject: [PATCH] mk-sbuild: automatically install qemu-kvm-extras-static if requested --- debian/changelog | 1 + mk-sbuild | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 290eb25..52d7e23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ ubuntu-dev-tools (0.93) UNRELEASED; urgency=low [ Emmet Hikory ] * 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: rationalise architecture variables diff --git a/mk-sbuild b/mk-sbuild index 904a447..e0a7ced 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -327,13 +327,12 @@ debian) esac 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 [ -f "/usr/bin/build-arm-chroot" ]; then - DEBOOTSTRAP_COMMAND=build-arm-chroot - else - echo Please install qemu-arm-static to use foreign armel chroots + if [ ! -f "/usr/bin/build-arm-chroot" ]; then + sudo apt-get install qemu-kvm-extras-static fi + DEBOOTSTRAP_COMMAND=build-arm-chroot fi case "$SRC_TYPE" in