From 9b4d2a22e4d1ee3d85bf582035d966cda256d4a4 Mon Sep 17 00:00:00 2001
From: "d.marlin" <dmarlin@redhat.com>
Date: Wed, 16 Nov 2016 21:47:26 -0500
Subject: [PATCH] Fedora AArch64 (64-bit ARM) support in diskimage-builder

Add some checks for AArch64 to avoid the "Unknown architecture" or
"architecture not supported" messages, and allow builds to complete.

Change-Id: I89ba609abaeeb7019eb317cf13473929b2065230
---
 .../extra-data.d/01-copy-binary                                | 2 +-
 elements/rpm-distro/pre-install.d/01-override-yum-arch         | 3 +++
 lib/common-defaults                                            | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary b/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary
index 014099063..ee970b01e 100755
--- a/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary
+++ b/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary
@@ -53,7 +53,7 @@ case "$ARCH" in
         qemu_binary_file="/usr/bin/qemu-arm-static"
         copy_binary $qemu_binary_file $ARCH
     ;;
-    "arm64")
+    "arm64" | "aarch64")
         qemu_binary_file="/usr/bin/qemu-aarch64-static"
         copy_binary $qemu_binary_file $ARCH
     ;;
diff --git a/elements/rpm-distro/pre-install.d/01-override-yum-arch b/elements/rpm-distro/pre-install.d/01-override-yum-arch
index 138bf3134..1e0aaf50f 100755
--- a/elements/rpm-distro/pre-install.d/01-override-yum-arch
+++ b/elements/rpm-distro/pre-install.d/01-override-yum-arch
@@ -18,6 +18,9 @@ elif [[ "$ARCH" = "ppc64" ]]; then
 elif [[ "$ARCH" = "ppc64el" ]]; then
     basearch=ppc64el
     arch=ppc64el
+elif [[ "$ARCH" = "aarch64" ]]; then
+    basearch=aarch64
+    arch=aarch64
 else
     echo "********************"
     echo "Unknown arch '$ARCH'"
diff --git a/lib/common-defaults b/lib/common-defaults
index e04718559..428f58fb3 100644
--- a/lib/common-defaults
+++ b/lib/common-defaults
@@ -26,6 +26,8 @@ else
     "armv"*)
       _ARCH="armhf"
       ;;
+    "aarch64")
+      ;;
     *)
       echo "WARNING: Unknown architecture: $_ARCH"
       ;;