From 91818c32c556ffae64164abe48c645a3d25d3634 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Tue, 7 Apr 2020 06:03:32 -0400
Subject: [PATCH] Fix aarch64 architecture for packages (#54856)

This commit fixes the architecture reported in the packages on aarch64.
---
 distribution/packages/build.gradle | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
index 105f244e6bc..bf828bf9d7e 100644
--- a/distribution/packages/build.gradle
+++ b/distribution/packages/build.gradle
@@ -105,7 +105,22 @@ Closure commonPackageConfig(String type, boolean oss, boolean jdk, String archit
     }
     dependsOn "process${oss ? 'Oss' : ''}${jdk ? '' : 'NoJdk'}${type.capitalize()}Files"
     packageName "elasticsearch${oss ? '-oss' : ''}"
-    arch(architecture == 'aarch64' ? 'aarch64' : type == 'deb' ? 'amd64' : 'X86_64')
+    if (type == 'deb') {
+      if (architecture == 'x64') {
+        arch('amd64')
+      } else {
+        assert architecture == 'aarch64' : architecture
+        arch('arm64')
+      }
+    } else {
+      assert type == 'rpm' : type
+      if (architecture == 'x64') {
+        arch('X86_64')
+      } else {
+        assert architecture == 'aarch64' : architecture
+        arch('aarch64')
+      }
+    }
     // Follow elasticsearch's file naming convention
     String jdkString = jdk ? "" : "no-jdk-"
     String prefix = "${architecture == 'aarch64' ? 'aarch64-' : ''}${oss ? 'oss-' : ''}${jdk ? '' : 'no-jdk-'}${type}"