diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-20 20:26:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 20:26:09 +0200 |
| commit | 9567d87bdf244de62f7c6763191dc7bf12e425cd (patch) | |
| tree | 6fff8783c09387a9647c164de0e60029ae1ea93b | |
| parent | 0804b28825e9c0e5cb9f7f3d4039bd087ff87295 (diff) | |
| parent | 6154ba4a8060f6ea9fd7e80e3f8085d34c816422 (diff) | |
| download | podman-9567d87bdf244de62f7c6763191dc7bf12e425cd.tar.gz podman-9567d87bdf244de62f7c6763191dc7bf12e425cd.tar.bz2 podman-9567d87bdf244de62f7c6763191dc7bf12e425cd.zip | |
Merge pull request #3152 from rhatdan/remote
install.remote should be separate for install.bin
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 1 |
2 files changed, 7 insertions, 3 deletions
@@ -259,14 +259,17 @@ changelog: ## Generate changelog $(shell cat $(TMPFILE) >> changelog.txt) $(shell rm $(TMPFILE)) -install: .gopathok install.bin install.man install.cni install.systemd ## Install binaries to system locations +install: .gopathok install.bin install.remote install.man install.cni install.systemd ## Install binaries to system locations + +install.remote: + install ${SELINUXOPT} -d -m 755 $(BINDIR) + install ${SELINUXOPT} -m 755 bin/podman-remote $(BINDIR)/podman-remote + test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman-remote install.bin: install ${SELINUXOPT} -d -m 755 $(BINDIR) install ${SELINUXOPT} -m 755 bin/podman $(BINDIR)/podman - install ${SELINUXOPT} -m 755 bin/podman-remote $(BINDIR)/podman-remote test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman - test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman-remote install.man: docs install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1 diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 228f65b50..985dbbc74 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -387,6 +387,7 @@ popd install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ + install.remote \ install.man \ install.cni \ install.systemd \ |