From fa1efe1d42ec2381d6aed6e6df88011281ef96a8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Thu, 16 Jul 2020 17:29:00 -0300
Subject: [PATCH] enter-chroot: Make use of linux32/setarch more generic
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Matías Fonzo <selk@dragora.org>
---
 enter-chroot | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/enter-chroot b/enter-chroot
index d0995e79..341c9798 100755
--- a/enter-chroot
+++ b/enter-chroot
@@ -96,22 +96,23 @@ mount -o bind "${CWD}/patches" "${rootdir}/usr/src/qi/patches"
 mount -o bind "${CWD}/recipes" "${rootdir}/usr/src/qi/recipes"
 mount -o bind "${CWD}/sources" "${rootdir}/usr/src/qi/sources"
 
-# Change reported architecture for a proper chroot environment
-_setarch=""
-for architecture in /tools/bin/*-linux*
-do
-    case $architecture in
-    *i486-*)  _setarch="setarch i486"; break;;
-    *i586-*)  _setarch="setarch i586"; break;;
-    esac
-done
-unset architecture
+# Change reported architecture for an appropriate environment
+_machine_type=""
+
+if file /tools/bin/busybox | grep -q "32-bit"
+then
+    if command -v linux32 > /dev/null
+    then
+        echo "Using the linux32 command for this machine type: $(uname -m) ..."
+        _machine_type="linux32"
+    fi
+fi
 
 # Add trap for unmount the series, signalled or not
-trap 'echo ; unmountSeries' EXIT HUP QUIT ABRT TERM
+trap 'echo ""; unmountSeries' EXIT HUP QUIT ABRT TERM
 
 echo "Entering via chroot $rootdir ..."
-$_setarch chroot "$rootdir" /tools/bin/env -i \
+$_machine_type chroot "$rootdir" /tools/bin/env -i \
   PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin:/opt/trinity/bin \
   SHELL=/bin/sh \
   HOME=/root \
-- 
2.11.4.GIT