From de09130919fcaefa9f98949c54f60cd80dba1fa6 Mon Sep 17 00:00:00 2001
From: Jaymala Sinha <jsinha@chef.io>
Date: Mon, 9 Mar 2020 15:09:43 -0400
Subject: [PATCH] Map arm64 architecture to aarch64

Ubuntu nodes map architecutre `uname -i` to aarch64 and `dpkg --print-architecture` to arm64 so we need this mapping reflect here

Signed-off-by: Jaymala Sinha <jsinha@chef.io>
---
 .../install/generator/bourne/scripts/platform_detection.sh     | 3 +++
 lib/mixlib/install/options.rb                                  | 1 -
 lib/mixlib/install/util.rb                                     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh b/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh
index f4b80b62..a057063f 100644
--- a/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh
+++ b/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh
@@ -163,6 +163,9 @@ esac
 
 # normalize the architecture we detected
 case $machine in
+  "arm64"|"aarch64")
+    machine="aarch64"
+    ;;
   "x86_64"|"amd64"|"x64")
     machine="x86_64"
     ;;
diff --git a/lib/mixlib/install/options.rb b/lib/mixlib/install/options.rb
index a11bef1f..5b6a6af2 100644
--- a/lib/mixlib/install/options.rb
+++ b/lib/mixlib/install/options.rb
@@ -30,7 +30,6 @@ class InvalidOptions < ArgumentError; end
 
       SUPPORTED_ARCHITECTURES = %w{
         aarch64
-        arm64
         armv7l
         i386
         powerpc
diff --git a/lib/mixlib/install/util.rb b/lib/mixlib/install/util.rb
index 846a2a33..a6a236c1 100644
--- a/lib/mixlib/install/util.rb
+++ b/lib/mixlib/install/util.rb
@@ -162,6 +162,8 @@ def normalize_architecture(architecture)
           case architecture
           when "amd64"
             "x86_64"
+          when "arm64"
+            "aarch64"
           when "i86pc", "i686"
             "i386"
           when "sun4u", "sun4v"