mk-sbuild: Really don't use build-arm-chroot

This commit is contained in:
Emmet Hikory 2010-03-09 08:34:59 +09:00
parent f77f947359
commit f9570af63f
2 changed files with 7 additions and 4 deletions

5
debian/changelog vendored
View File

@ -3,7 +3,10 @@ ubuntu-dev-tools (0.96) UNRELEASED; urgency=low
[ Michael Bienia ] [ Michael Bienia ]
* ubuntu-build: missed updating a function call. * ubuntu-build: missed updating a function call.
-- Michael Bienia <geser@ubuntu.com> Mon, 08 Mar 2010 17:49:49 +0100 [ Emmet Hikory ]
* mk-sbuild: Really don't use build-arm-chroot
-- Emmet Hikory <persia@ubuntu.com> Tue, 09 Mar 2010 08:32:50 +0900
ubuntu-dev-tools (0.95) lucid; urgency=low ubuntu-dev-tools (0.95) lucid; urgency=low

View File

@ -363,7 +363,7 @@ debian)
esac esac
DEBOOTSTRAP_COMMAND=debootstrap DEBOOTSTRAP_COMMAND=debootstrap
# Use qemu-kvm-extras-static / build-arm-chroot for foreign chroots # Use qemu-kvm-extras-static for foreign chroots
if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then
case "$CHROOT_ARCH-$HOST_ARCH" in case "$CHROOT_ARCH-$HOST_ARCH" in
# Sometimes we don't need qemu # Sometimes we don't need qemu
@ -371,10 +371,10 @@ if [ "$CHROOT_ARCH" != "$HOST_ARCH" ] ; then
;; ;;
# Sometimes we do # Sometimes we do
*) *)
if [ ! -f "/usr/bin/build-arm-chroot" ]; then DEBOOTSTRAP_COMMAND=qemu-debootstrap
if ! which "$DEBOOTSTRAP_COMMAND"; then
sudo apt-get install qemu-kvm-extras-static sudo apt-get install qemu-kvm-extras-static
fi fi
DEBOOTSTRAP_COMMAND=qemu-debootstrap
;; ;;
esac esac
fi fi