Skip to content

Commit bf2a53a

Browse files
anjannathashley-cui
authored andcommitted
pkginstaller: use correct GOARCH while building podman binaries
we were not using the correct GOARCH to build the podman remote and podman-mac-helper binaries, this uses the ARCH value passed to the make invocation to set the GORACH [NO NEW TESTS NEEDED] Signed-off-by: Anjan Nath <[email protected]>
1 parent d4481a3 commit bf2a53a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

contrib/pkginstaller/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $ make ARCH=<amd64 | aarch64> CODESIGN_IDENTITY=<ID> PRODUCTSIGN_IDENTITY=<ID> N
1111
```
1212

1313
The generated pkg will be written to `out/podman-macos-installer-*.pkg`.
14-
Currently the pkg installs `podman`, `qemu`, `gvproxy` and `podman-mac-helper` to `/Applications/podman`
14+
Currently the pkg installs `podman`, `qemu`, `gvproxy` and `podman-mac-helper` to `/opt/podman`
1515

1616
The `qemu` build it uses is from [containers/podman-machine-qemu](https://github.com/containers/podman-machine-qemu)
1717

contrib/pkginstaller/package.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ arch=$(cat "${BASEDIR}/ARCH")
1717

1818
function build_podman() {
1919
pushd "$1"
20-
make podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}"
21-
make podman-mac-helper
20+
make GOARCH="${arch}" podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}"
21+
make GOARCH="${arch}" podman-mac-helper
2222
cp bin/darwin/podman "contrib/pkginstaller/out/packaging/${binDir}/podman"
2323
cp bin/darwin/podman-mac-helper "contrib/pkginstaller/out/packaging/${binDir}/podman-mac-helper"
2424
popd

0 commit comments

Comments
 (0)