From d1a64db91f2f1d3e4cee50be80a96c7ce0790aa1 Mon Sep 17 00:00:00 2001 From: Mukund Thakur Date: Thu, 25 Jul 2024 17:26:41 -0500 Subject: [PATCH 1/2] 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 8cdcc14acf026..5347bb985c04b 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[@]}" \ From bd3eca591ed01fe61b7fec187f32bbbc1ce9d813 Mon Sep 17 00:00:00 2001 From: Mukund Thakur Date: Mon, 29 Jul 2024 13:26:27 -0500 Subject: [PATCH 2/2] removing extra line --- dev-support/bin/create-release | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release index 5347bb985c04b..148b88a9912fe 100755 --- a/dev-support/bin/create-release +++ b/dev-support/bin/create-release @@ -523,6 +523,7 @@ 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[@]}" \