From be48317fc354cdd33c3de85ae4b6797e9fa259bc Mon Sep 17 00:00:00 2001
From: Chris Jones <cmsj@tenshu.net>
Date: Fri, 12 Apr 2013 10:53:44 +0100
Subject: [PATCH] Improve Fedora build host support: architectures.

Instead of blindly calling dpkg, we will now perform an appropriate test
and fall back on uname with some subsequent massaging of uname's output
on amd64 and ARM build hosts.

Based on a patch from Lucas Alvares Gomes

Change-Id: I363addd9f8b4d748d50b69f4509ce627aa5676aa
---
 lib/img-defaults | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/img-defaults b/lib/img-defaults
index 0f707cc5..57bc898e 100644
--- a/lib/img-defaults
+++ b/lib/img-defaults
@@ -14,7 +14,25 @@
 # under the License.
 
 # options for create-baremetal-image.sh
-export ARCH=${ARCH:-$(dpkg --print-architecture)}
+if [ -f /etc/debian_version ]; then
+  _ARCH=$(dpkg --print-architecture)
+else
+  _ARCH=$(uname -m)
+fi
+ARCH=${ARCH:-_ARCH}
+
+case $ARCH in
+  "x86_64")
+    ARCH="amd64"
+    ;;
+  "armv"*)
+    ARCH="armhf"
+    ;;
+  *)
+    echo "WARNING: Unknown architecture: $ARCH"
+    ;;
+esac
+
 FS_TYPE=${FS_TYPE:-ext4}
 # Used to set the file extension only at this stage.
 IMAGE_TYPE=${IMAGE_TYPE:-qcow2}