Merge pull request #12919 from tdawson/2017-02-fix-multiarch-typo

Merged by openshift-bot

Author: OpenShift Bot

hack/build-cross.sh

@@ -28,7 +28,7 @@ if [[ "${host_platform}" == "linux/ppc64le" ]]; then
   platforms+=( "linux/ppc64le" )
 fi
 
-# Special case aarch64
+# Special case arm64
 if [[ "${host_platform}" == "linux/arm64" ]]; then
   platforms+=( "linux/arm64" )
 fi

hack/common.sh

@@ -362,7 +362,7 @@ function os::build::place_bins() {
         elif [[ $platform == "linux-powerpc64" ]]; then
           OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive_tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}"
           OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive_tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}"
-        elif [[ $platform == "linux-aarch64" ]]; then
+        elif [[ $platform == "linux-arm64" ]]; then
           OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive_tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}"
           OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive_tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}"
         elif [[ $platform == "linux-s390" ]]; then
@@ -372,7 +372,7 @@ function os::build::place_bins() {
           echo "++ ERROR: No release type defined for $platform"
         fi
       else
-        if [[ $platform == "linux-64bit" || $platform == "linux-powerpc64" || $platform == "linux-aarch64" || $platform == "linux-s390" ]]; then
+        if [[ $platform == "linux-64bit" || $platform == "linux-powerpc64" || $platform == "linux-arm64" || $platform == "linux-s390" ]]; then
           os::build::archive_tar "./*"
         else
           echo "++ ERROR: No release type defined for $platform"