From 623b0c57f6914573403f803920a7e4926477c928 Mon Sep 17 00:00:00 2001 From: Anjan Nath Date: Thu, 4 Aug 2022 12:18:31 +0530 Subject: 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 --- contrib/pkginstaller/README.md | 2 +- contrib/pkginstaller/package.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib') 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= CODESIGN_IDENTITY= PRODUCTSIGN_IDENTITY= 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 -- cgit v1.2.3-54-g00ecf