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>
chef · Mar 9, 2020 · de09130 · de09130
1 parent 9868755
commit de09130
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -162,6 +162,8 @@ def normalize_architecture(architecture)
           case architecture
           when "amd64"
             "x86_64"
+          when "arm64"
+            "aarch64"
           when "i86pc", "i686"
             "i386"
           when "sun4u", "sun4v"
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ class InvalidOptions < ArgumentError; end @@
           SUPPORTED_ARCHITECTURES = %w{
             aarch64
-            arm64
             armv7l
             i386
             powerpc
@@ Expand Down @@