From ae9c80de3764d1b28a5fc3a7eda893ff1f204576 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 4 Jun 2019 11:07:10 +0100 Subject: [PATCH] mk-sbuild: Set personality=linux32 on armel/armhf --- debian/changelog | 7 +++++++ mk-sbuild | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d3eed2..f562ca4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.169) UNRELEASED; urgency=medium + + * mk-sbuild: + + Set personality=linux32 by default on armel and armhf as well. + + -- Colin Watson Tue, 04 Jun 2019 10:50:06 +0100 + ubuntu-dev-tools (0.168) eoan; urgency=medium * grep-merges: flake8-clean. diff --git a/mk-sbuild b/mk-sbuild index 7e5be0a..bf3c68e 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -120,10 +120,13 @@ while :; do ;; --arch) CHROOT_ARCH="$2" - if [ "$2" = "i386" ] || [ "$2" = "lpia" ] && [ -z "$personality" ]; - then - personality="linux32" - fi + case $2 in + armel|armhf|i386|lpia) + if [ -z "$personality" ]; then + personality="linux32" + fi + ;; + esac shift 2 ;; --personality)