opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 21:07:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: Add podman-mac-helper to darwin client zip

Browse Source 
As well as as small fix for zipping the correct folder when building on Mac

Signed-off-by: Ashley Cui <acui@redhat.com>
This commit is contained in:
Ashley Cui
2022-12-06 15:14:34 -05:00
parent 41af424cd8
commit 9b702460e1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -728,11 +728,14 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$
if [[ "$(GOOS)" == "windows" ]]; then \ if [[ "$(GOOS)" == "windows" ]]; then \
$(MAKE) $(GOPLAT) TMPDIR="" win-sshproxy; \ $(MAKE) $(GOPLAT) TMPDIR="" win-sshproxy; \
fi fi
if [[ "$(GOOS)" == "darwin" ]]; then \
$(MAKE) $(GOPLAT) podman-mac-helper;\
fi
cp -r ./docs/build/remote/$(GOOS) "$(TMPDIR)/$(SUBDIR)/docs/" cp -r ./docs/build/remote/$(GOOS) "$(TMPDIR)/$(SUBDIR)/docs/"
cp ./contrib/remote/containers.conf "$(TMPDIR)/$(SUBDIR)/" cp ./contrib/remote/containers.conf "$(TMPDIR)/$(SUBDIR)/"
$(MAKE) $(GOPLAT) $(_DSTARGS) SELINUXOPT="" install.remote $(MAKE) $(GOPLAT) $(_DSTARGS) SELINUXOPT="" install.remote
cd "$(TMPDIR)" && \ cd "$(TMPDIR)" && \
zip --recurse-paths "$(CURDIR)/$@" "./" zip --recurse-paths "$(CURDIR)/$@" "./$(SUBDIR)"
if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi
-rm -rf "$(TMPDIR)" -rm -rf "$(TMPDIR)"
@ -795,6 +798,8 @@ install.remote:
$(DESTDIR)$(BINDIR)/podman$(BINSFX) $(DESTDIR)$(BINDIR)/podman$(BINSFX)
test "${GOOS}" != "windows" || \ test "${GOOS}" != "windows" || \
install -m 755 $(SRCBINDIR)/win-sshproxy.exe $(DESTDIR)$(BINDIR) install -m 755 $(SRCBINDIR)/win-sshproxy.exe $(DESTDIR)$(BINDIR)
test "${GOOS}" != "darwin" || \
install -m 755 $(SRCBINDIR)/podman-mac-helper $(DESTDIR)$(BINDIR)
test -z "${SELINUXOPT}" || \ test -z "${SELINUXOPT}" || \
chcon --verbose --reference=$(DESTDIR)$(BINDIR)/podman-remote \ chcon --verbose --reference=$(DESTDIR)$(BINDIR)/podman-remote \
bin/podman-remote bin/podman-remote