From 510cdbd726417ddd4b9f5d6a5c31906b1f0a2b85 Mon Sep 17 00:00:00 2001 From: Emmet Hikory Date: Mon, 8 Mar 2010 18:05:37 +0900 Subject: [PATCH] * mk-sbuild: switch to use qemu-debootstrap for foreign chroots * mk-sbuild: allow any foreign chroot (may not work, but we can try) --- debian/changelog | 7 ++++++- mk-sbuild | 20 ++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98eae51..b09ee0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ ubuntu-dev-tools (0.94) UNRELEASED; urgency=low + [ Luca Falavigna ] * docs/lp-set-dup.1: add manpage for lp-set-dup. * debian/control: bump Standards-Version to 3.8.4, no changes needed. - -- Luca Falavigna Sat, 06 Mar 2010 12:55:40 +0100 + [ Emmet Hikory ] + * mk-sbuild: switch to use qemu-debootstrap for foreign chroots + * mk-sbuild: allow any foreign chroot (may not work, but we can try) + + -- Emmet Hikory Mon, 08 Mar 2010 17:56:30 +0900 ubuntu-dev-tools (0.93) lucid; urgency=low diff --git a/mk-sbuild b/mk-sbuild index 902648b..bb98658 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -363,12 +363,20 @@ debian) esac DEBOOTSTRAP_COMMAND=debootstrap -# 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 - sudo apt-get install qemu-kvm-extras-static - fi - DEBOOTSTRAP_COMMAND=build-arm-chroot +# Use qemu-kvm-extras-static / build-arm-chroot for foreign chroots +if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then + case "$CHROOT_ARCH-$HOST_ARCH" in + # Sometimes we don't need qemu + amd64-i386|amd64-lpia|arm-armel|armel-arm|i386-amd64|i386-lpia|lpia-i386|powerpc-ppc64|ppc64-powerpc|sparc-sparc64|sparc64-sparc) + ;; + # Sometimes we do + *) + if [ ! -f "/usr/bin/build-arm-chroot" ]; then + sudo apt-get install qemu-kvm-extras-static + fi + DEBOOTSTRAP_COMMAND=qemu-debootstrap + ;; + esac fi case "$SCHROOT_TYPE" in