From 8e9b7a5525a89d8b30e9a9af584292142921e155 Mon Sep 17 00:00:00 2001 From: Prashanth Sundararaman Date: Wed, 14 Jul 2021 16:35:28 -0700 Subject: [PATCH] support for arm64 with the developer preview of ARM available for 4.9, adding support in it for SNC so we can work toward having crc support for macs --- snc-library.sh | 2 +- snc.sh | 2 +- tools.sh | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/snc-library.sh b/snc-library.sh index 0e471c41..b60a7395 100755 --- a/snc-library.sh +++ b/snc-library.sh @@ -58,7 +58,7 @@ function run_preflight_checks() { #Just warn if architecture is not supported case $ARCH in - x86_64|ppc64le|s390x) + x86_64|ppc64le|s390x|aarch64) echo "The host arch is ${ARCH}.";; *) echo "The host arch is ${ARCH}. This is not supported by SNC!";; diff --git a/snc.sh b/snc.sh index 3e2fe113..faf780e8 100755 --- a/snc.sh +++ b/snc.sh @@ -66,7 +66,7 @@ echo "Setting OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE to ${OPENSHIFT_INSTALL_RE # Extract openshift-install binary if not present in current directory if test -z ${OPENSHIFT_INSTALL-}; then echo "Extracting OpenShift baremetal installer binary" - ${OC} adm release -a ${OPENSHIFT_PULL_SECRET_PATH} extract ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE} --command=openshift-baremetal-install --to . + ${OC} adm release extract -a ${OPENSHIFT_PULL_SECRET_PATH} ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE} --command=openshift-baremetal-install --to . OPENSHIFT_INSTALL=./openshift-baremetal-install fi diff --git a/tools.sh b/tools.sh index 78670bd8..ff2d3e5a 100755 --- a/tools.sh +++ b/tools.sh @@ -22,7 +22,12 @@ case "${ARCH}" in x86_64) yq_ARCH="amd64" SNC_GENERATE_MACOS_BUNDLE=1 - SNC_GENERATE_WINDOWS_BUNDLE=1 + SNC_GENERATE_WINDOWS_BUNDLE=1 + ;; + aarch64) + yq_ARCH="arm64" + SNC_GENERATE_MACOS_BUNDLE=1 + SNC_GENERATE_WINDOWS_BUNDLE= ;; *) yq_ARCH=${ARCH}