summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnjan Nath <kaludios@gmail.com>2022-08-04 12:18:31 +0530
committerAnjan Nath <kaludios@gmail.com>2022-08-04 16:54:11 +0530
commit623b0c57f6914573403f803920a7e4926477c928 (patch)
tree20e6fba972ea3e74935757f01646ccad9e0bbcf1
parentccbb8e7444423306691f8ec441ed09387718d6e5 (diff)
downloadpodman-623b0c57f6914573403f803920a7e4926477c928.tar.gz
podman-623b0c57f6914573403f803920a7e4926477c928.tar.bz2
podman-623b0c57f6914573403f803920a7e4926477c928.zip
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 <kaludios@gmail.com>
-rw-r--r--contrib/pkginstaller/README.md2
-rwxr-xr-xcontrib/pkginstaller/package.sh4
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