big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-19238. Fix create-release script for arm64 based MacOS (#6962)

Browse Source 
Contributed by Mukund Thakur
This commit is contained in:
Mukund Thakur 2024-07-29 13:45:14 -05:00 committed by GitHub
parent a5806a9e7b
commit 038636a1b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-support/bin/create-release
View File

@ -205,7 +205,7 @@ function set_defaults
DOCKERRAN=false DOCKERRAN=false
CPU_ARCH=$(echo "$MACHTYPE" | cut -d- -f1) 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" DOCKERFILE="${BASEDIR}/dev-support/docker/Dockerfile_aarch64"
fi fi
@ -514,7 +514,7 @@ function dockermode
# we always force build with the OpenJDK JDK # we always force build with the OpenJDK JDK
# but with the correct version # 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" echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-arm64"
else else
echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-amd64" echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-amd64"