diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-09 07:43:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 07:43:58 +0000 |
| commit | cd645e8ae958026e42a1522cc6a42bbcfdab7b37 (patch) | |
| tree | 96f17f7ef905ab12cca1a59dfdff28363a72d52d | |
| parent | b3d5ba657b3dfbc2f33083cfd35b7baad12247f8 (diff) | |
| parent | d16b42f2654c1f268a5b09056c276cef5db89305 (diff) | |
| download | podman-cd645e8ae958026e42a1522cc6a42bbcfdab7b37.tar.gz podman-cd645e8ae958026e42a1522cc6a42bbcfdab7b37.tar.bz2 podman-cd645e8ae958026e42a1522cc6a42bbcfdab7b37.zip | |
Merge pull request #15240 from openshift-cherrypick-robot/cherry-pick-15235-to-v4.2
[CI:DOCS] [v4.2] pkginstaller: use correct GOARCH value in case of arm build
| -rwxr-xr-x | contrib/pkginstaller/package.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/pkginstaller/package.sh b/contrib/pkginstaller/package.sh index bb91fe01f..f6f7cef16 100755 --- a/contrib/pkginstaller/package.sh +++ b/contrib/pkginstaller/package.sh @@ -17,8 +17,12 @@ arch=$(cat "${BASEDIR}/ARCH") function build_podman() { pushd "$1" - make GOARCH="${arch}" podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}" - make GOARCH="${arch}" podman-mac-helper + local goArch="${arch}" + if [ "${goArch}" = aarch64 ]; then + goArch=arm64 + fi + make GOARCH="${goArch}" podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}" + make GOARCH="${goArch}" podman-mac-helper cp bin/darwin/podman "contrib/pkginstaller/out/packaging/${binDir}/podman" cp bin/darwin/podman-mac-helper "contrib/pkginstaller/out/packaging/${binDir}/podman-mac-helper" popd |