From e903bf03d1dffab91e5a4df7ed9f9ab701531ca9 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Sun, 8 May 2016 23:09:55 -0600 Subject: [PATCH] mk-sbuild: Remove references to the obsolete arm architecture, and allow armhf and armel to be native on arm64 systems (LP: #1579619) --- debian/changelog | 7 +++++++ mk-sbuild | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b9b1424..7371ef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.156) unstable; urgency=medium + + * mk-sbuild: Remove references to the obsolete arm architecture, and + allow armhf and armel to be native on arm64 systems (LP: #1579619) + + -- Adam Conrad Sun, 08 May 2016 23:06:34 -0600 + ubuntu-dev-tools (0.155) unstable; urgency=medium [ Dimitri John Ledkov ] diff --git a/mk-sbuild b/mk-sbuild index 184ac9d..3d4f607 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -568,7 +568,7 @@ DEBOOTSTRAP_COMMAND=debootstrap 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|armel-armhf|armhf-armel|arm64-arm|arm64-armel|arm64-armhf|i386-amd64|i386-lpia|lpia-i386|powerpc-ppc64|ppc64-powerpc|sparc-sparc64|sparc64-sparc) + amd64-i386|amd64-lpia|armel-armhf|armhf-armel|arm64-armel|arm64-armhf|armel-arm64|armhf-arm64|i386-amd64|i386-lpia|lpia-i386|powerpc-ppc64|ppc64-powerpc|sparc-sparc64|sparc64-sparc) ;; # Sometimes we do *)