From 3ac9685580d988a0a70d3eb9c09250689143a7dc Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Mon, 7 Dec 2020 12:14:23 +0100
Subject: [PATCH] Use aarch_64 in a consistent way (#10845)

Motivation:

We should use aarch_64 in our classifier / jni libname on aarch64 as  os.detected.arch uses the name. Being non consistent (especially across our different projects) already gave us a lot of trouble in the past.
Let's fix this once for all.

Modifications:

Use aarch_64

Result:

More consistent classifier usage on aarch64
---
 all/pom.xml                          |  4 ++--
 docker/README.md                     |  2 +-
 docker/docker-compose.yaml           | 13 ++++++++++++-
 transport-native-epoll/pom.xml       |  3 ++-
 transport-native-unix-common/pom.xml |  3 ++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index 34fb802f78..b0fc7c2cc8 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>netty-transport-native-epoll</artifactId>
-          <classifier>linux-aarch64</classifier>
+          <classifier>linux-aarch_64</classifier>
           <scope>compile</scope>
           <optional>true</optional>
         </dependency>
@@ -107,7 +107,7 @@
         <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>netty-transport-native-epoll</artifactId>
-          <classifier>linux-aarch64</classifier>
+          <classifier>linux-aarch_64</classifier>
           <scope>compile</scope>
           <optional>true</optional>
         </dependency>
diff --git a/docker/README.md b/docker/README.md
index 378c673c84..e66c984e2e 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -19,7 +19,7 @@ docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-7.1
 ## aarch64 cross compile for transport-native-epoll on X86_64
 
 ```
-docker-compose -f docker/docker-compose.yaml run cross-compile-aarch64
+docker-compose -f docker/docker-compose.yaml run cross-compile-aarch64-build
 ```
 The default version of aarch64 gcc is `4.9-2016.02`. Update the parameter `gcc_version` in `docker-compose.yaml` to use a version you want.
 
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 10f389a7bc..a1fb55b972 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -49,7 +49,18 @@ services:
       args:
         gcc_version : "4.9-2016.02"
 
-  cross-compile-aarch64:
+  cross-compile-aarch64-shell:
+    image: netty:cross_compile_aarch64
+    depends_on: [cross-compile-aarch64-runtime-setup]
+    volumes:
+      - ~/.ssh:/root/.ssh:delegated
+      - ~/.gnupg:/root/.gnupg:delegated
+      - ..:/code:delegated
+      - ~/.m2:/root/.m2:delegated
+    entrypoint: /bin/bash
+    working_dir: /code
+
+  cross-compile-aarch64-build:
     image: netty:cross_compile_aarch64
     depends_on: [cross-compile-aarch64-runtime-setup]
     volumes:
diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml
index 1a7a48ea9d..becf920e38 100644
--- a/transport-native-epoll/pom.xml
+++ b/transport-native-epoll/pom.xml
@@ -213,7 +213,8 @@
     <profile>
       <id>linux-aarch64</id>
       <properties>
-        <jni.classifier>${os.detected.name}-aarch64</jni.classifier>
+        <!-- use aarch_64 as this is also what os.detected.arch will use on an aarch64 system -->
+        <jni.classifier>${os.detected.name}-aarch_64</jni.classifier>
       </properties>
       <build>
         <pluginManagement>
diff --git a/transport-native-unix-common/pom.xml b/transport-native-unix-common/pom.xml
index d49e00f42b..ee9ba978d9 100644
--- a/transport-native-unix-common/pom.xml
+++ b/transport-native-unix-common/pom.xml
@@ -244,7 +244,8 @@
     <profile>
       <id>linux-aarch64</id>
       <properties>
-        <jni.classifier>${os.detected.name}-aarch64</jni.classifier>
+        <!-- use aarch_64 as this is also what os.detected.arch will use on an aarch64 system -->
+        <jni.classifier>${os.detected.name}-aarch_64</jni.classifier>
         <jni.platform>linux</jni.platform>
         <exe.compiler>aarch64-linux-gnu-gcc</exe.compiler>
         <exe.archiver>aarch64-linux-gnu-ar</exe.archiver>