diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-08-04 13:39:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 13:39:40 +0000 |
| commit | d7ce5dfe2778c64b0a98a5a19097eb39eea5d2fb (patch) | |
| tree | 3df9c244a24ef19683d667b2e295ac235d6aa66d | |
| parent | 773149d5691d24c637ea6a720fc815cd97113a19 (diff) | |
| parent | 623b0c57f6914573403f803920a7e4926477c928 (diff) | |
| download | podman-d7ce5dfe2778c64b0a98a5a19097eb39eea5d2fb.tar.gz podman-d7ce5dfe2778c64b0a98a5a19097eb39eea5d2fb.tar.bz2 podman-d7ce5dfe2778c64b0a98a5a19097eb39eea5d2fb.zip | |
Merge pull request #15183 from anjannath/pkg-goarch
pkginstaller: use correct GOARCH while building podman binaries
| -rw-r--r-- | contrib/pkginstaller/README.md | 2 | ||||
| -rwxr-xr-x | contrib/pkginstaller/package.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pkginstaller/README.md b/contrib/pkginstaller/README.md index 1951d4eab..7aaf64808 100644 --- a/contrib/pkginstaller/README.md +++ b/contrib/pkginstaller/README.md @@ -11,7 +11,7 @@ $ make ARCH=<amd64 | aarch64> CODESIGN_IDENTITY=<ID> PRODUCTSIGN_IDENTITY=<ID> N ``` The generated pkg will be written to `out/podman-macos-installer-*.pkg`. -Currently the pkg installs `podman`, `qemu`, `gvproxy` and `podman-mac-helper` to `/Applications/podman` +Currently the pkg installs `podman`, `qemu`, `gvproxy` and `podman-mac-helper` to `/opt/podman` The `qemu` build it uses is from [containers/podman-machine-qemu](https://github.com/containers/podman-machine-qemu) diff --git a/contrib/pkginstaller/package.sh b/contrib/pkginstaller/package.sh index ca8d54f7f..bb91fe01f 100755 --- a/contrib/pkginstaller/package.sh +++ b/contrib/pkginstaller/package.sh @@ -17,8 +17,8 @@ arch=$(cat "${BASEDIR}/ARCH") function build_podman() { pushd "$1" - make podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}" - make podman-mac-helper + make GOARCH="${arch}" podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}" + make GOARCH="${arch}" 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 |