diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-29 10:40:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 10:40:08 -0400 |
| commit | 599b7d746a6ccad6ebbd70abb72be30bead094a6 (patch) | |
| tree | 31451b0b94962ed37507fa2ccab3d849e9acbaac | |
| parent | c260cbd29d831597df660fcf095e9db587ab856a (diff) | |
| parent | 1edada477dbd30b360b54ddabfceab92f1993075 (diff) | |
| download | podman-599b7d746a6ccad6ebbd70abb72be30bead094a6.tar.gz podman-599b7d746a6ccad6ebbd70abb72be30bead094a6.tar.bz2 podman-599b7d746a6ccad6ebbd70abb72be30bead094a6.zip | |
Merge pull request #10803 from lsm5/remove-cni-conflist
Makefile: remove install.cni
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 |
2 files changed, 2 insertions, 9 deletions
@@ -613,7 +613,7 @@ podman-release.tar.gz: binaries docs ## Build all binaries, docs., and installa $(eval TMPDIR := $(shell mktemp -d podman_tmp_XXXX)) $(eval SUBDIR := podman-v$(RELEASE_NUMBER)) mkdir -p "$(TMPDIR)/$(SUBDIR)" - $(MAKE) install.bin install.man install.cni \ + $(MAKE) install.bin install.man \ install.systemd "DESTDIR=$(TMPDIR)/$(SUBDIR)" "PREFIX=/usr" tar -czvf $@ --xattrs -C "$(TMPDIR)" "./$(SUBDIR)" -rm -rf "$(TMPDIR)" @@ -666,7 +666,7 @@ package-install: package ## Install rpm packages /usr/bin/podman info # will catch a broken conmon .PHONY: install -install: .gopathok install.bin install.remote install.man install.cni install.systemd ## Install binaries to system locations +install: .gopathok install.bin install.remote install.man install.systemd ## Install binaries to system locations .PHONY: install.catatonit install.catatonit: @@ -719,11 +719,6 @@ install.completions: install ${SELINUXOPT} -m 644 completions/fish/podman-remote.fish ${DESTDIR}${FISHINSTALLDIR} # There is no common location for powershell files so do not install them. Users have to source the file from their powershell profile. -.PHONY: install.cni -install.cni: - install ${SELINUXOPT} -d -m 755 ${DESTDIR}${ETCDIR}/cni/net.d/ - install ${SELINUXOPT} -m 644 cni/87-podman-bridge.conflist ${DESTDIR}${ETCDIR}/cni/net.d/87-podman-bridge.conflist - .PHONY: install.docker install.docker: install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index ef8523f8c..fa513932f 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -441,7 +441,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build %if %{with doc} install.man-nobuild \ %endif - install.cni \ install.systemd \ install.completions @@ -526,7 +525,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/* %{_datadir}/zsh/site-functions/* %{_datadir}/fish/vendor_completions.d/* -%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_unitdir}/podman-auto-update.service %{_unitdir}/podman-auto-update.timer %{_unitdir}/podman.service |