You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by mt...@apache.org on 2024/07/25 22:27:31 UTC

(hadoop) 01/01: HADOOP-19238. Fix create-release script for arm64 based MacOS

This is an automated email from the ASF dual-hosted git repository.

mthakur pushed a commit to branch HADOOP-19238
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit d1a64db91f2f1d3e4cee50be80a96c7ce0790aa1
Author: Mukund Thakur <mt...@cloudera.com>
AuthorDate: Thu Jul 25 17:26:41 2024 -0500

    HADOOP-19238. Fix create-release script for arm64 based MacOS
---
 dev-support/bin/create-release | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index 8cdcc14acf0..5347bb985c0 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -205,7 +205,7 @@ function set_defaults
   DOCKERRAN=false
 
   CPU_ARCH=$(echo "$MACHTYPE" | cut -d- -f1)
-  if [ "$CPU_ARCH" = "aarch64" ]; then
+  if [[ "$CPU_ARCH" = "aarch64" || "$CPU_ARCH" = "arm64" ]]; then
     DOCKERFILE="${BASEDIR}/dev-support/docker/Dockerfile_aarch64"
   fi
 
@@ -514,7 +514,7 @@ function dockermode
 
     # we always force build with the OpenJDK JDK
     # but with the correct version
-    if [ "$CPU_ARCH" = "aarch64" ]; then
+    if [[ "$CPU_ARCH" = "aarch64" || "$CPU_ARCH" = "arm64" ]]; then
       echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-arm64"
     else
       echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-amd64"
@@ -523,7 +523,6 @@ function dockermode
     echo "USER ${user_name}"
     printf "\n\n"
   ) | docker build -t "${imgname}" -f - "${BASEDIR}"/dev-support/docker/
-
   run docker run -i -t \
     --privileged \
     "${extrad[@]}"  \


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org