From ed462071a062bd018b15e51aef0e316f05ef43df Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 29 Apr 2014 14:59:21 +0200
Subject: [PATCH 1/2] Try harder to determine the architecture
---
debootstrap | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/debootstrap b/debootstrap
index fef1ab5..d047b64 100755
--- a/debootstrap
+++ b/debootstrap
@@ -403,7 +403,12 @@ if in_path dpkg && \
elif in_path udpkg && \
udpkg --print-architecture >/dev/null 2>&1; then
HOST_ARCH=`/usr/bin/udpkg --print-architecture`
+elif in_path uname && \
+ uname --hardware-platform >/dev/null 2>&1; then
+ HOST_ARCH=`/bin/uname --hardware-platform |/bin/sed 's/x86_64/amd64/'`
elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
+ # XXX: On host, this is /usr/share, which explicitely MUST be
+ # arch-independent. Ouch.
HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
fi
HOST_OS="$HOST_ARCH"
--
1.8.3.1