浏览代码

HADOOP-19238. Fix create-release script for arm64 based MacOS

Mukund Thakur 9 月之前
父节点
当前提交
d1a64db91f
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      dev-support/bin/create-release

+ 2 - 3
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[@]}"  \