diff options
| author | Anjan Nath <kaludios@gmail.com> | 2022-08-08 12:18:20 +0530 |
|---|---|---|
| committer | openshift-cherrypick-robot <> | 2022-08-08 13:37:28 +0000 |
| commit | d16b42f2654c1f268a5b09056c276cef5db89305 (patch) | |
| tree | b1844669acede1d8c27c89c169300916f7c1cb7b | |
| parent | 518b7cdd3956fb3c144535b400c2bfd9df09cd32 (diff) | |
| download | podman-d16b42f2654c1f268a5b09056c276cef5db89305.tar.gz podman-d16b42f2654c1f268a5b09056c276cef5db89305.tar.bz2 podman-d16b42f2654c1f268a5b09056c276cef5db89305.zip | |
pkginstaller: use correct GOARCH value in case of arm build
to compile arm bits the GOARCH should be set to amd64 script
was wrongly using aarch64 instead
[NO NEW TESTS NEEDED]
Signed-off-by: Anjan Nath <kaludios@gmail.com>
| -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 |