diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-08 13:17:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 13:17:09 +0000 |
| commit | 70b03400b18c80ee8a2864d0af1012ec8683a26a (patch) | |
| tree | 0d34e678c64965d9b6c2d46b28787cc8a405418a | |
| parent | 635293ed149a6680c5999360ce39daf4625bfa92 (diff) | |
| parent | 771a35e4b51c46f3af99b380e71e89a86f2a9782 (diff) | |
| download | podman-70b03400b18c80ee8a2864d0af1012ec8683a26a.tar.gz podman-70b03400b18c80ee8a2864d0af1012ec8683a26a.tar.bz2 podman-70b03400b18c80ee8a2864d0af1012ec8683a26a.zip | |
Merge pull request #15235 from anjannath/pkg-goarch
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 |