diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-16 17:33:56 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-27 06:48:20 +0000 |
| commit | 3aa63b2b941aac40c5e3639b0880922b842052ab (patch) | |
| tree | 83bc6337500b3f5ef0f94a0f94f87f6a3549f01b /Makefile | |
| parent | fb58b873981d2fd0d4f97036afab2aa2ce9e1633 (diff) | |
| download | podman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.gz podman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.bz2 podman-3aa63b2b941aac40c5e3639b0880922b842052ab.zip | |
Remove conmon, get package from CRI-O
conmon should not be built in two different places.
conmon is now a separate package in Fedora so we can just
add requires, for use on Ubuntu we can just require cri-o to
be installed.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #151
Approved by: mheon
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -52,7 +52,7 @@ help: @echo "Usage: make <target>" @echo @echo " * 'install' - Install binaries to system locations" - @echo " * 'binaries' - Build conmon and podman" + @echo " * 'binaries' - Build podmon" @echo " * 'integration' - Execute integration tests" @echo " * 'clean' - Clean artifacts" @echo " * 'lint' - Execute the source code linter" @@ -75,9 +75,6 @@ gofmt: fix_gofmt: @./hack/verify-gofmt.sh -f -conmon: - $(MAKE) -C $@ - test/bin2img/bin2img: .gopathok $(wildcard test/bin2img/*.go) $(GO) build $(LDFLAGS) -tags "$(BUILDTAGS) containers_image_ostree_stub" -o $@ $(PROJECT)/test/bin2img @@ -100,7 +97,6 @@ endif find . -name \*~ -delete find . -name \#\* -delete rm -f bin/podman - make -C conmon clean rm -f test/bin2img/bin2img rm -f test/copyimg/copyimg rm -f test/checkseccomp/checkseccomp @@ -123,7 +119,7 @@ localintegration: test-binaries vagrant-check: BOX=$(BOX) sh ./vagrant.sh -binaries: conmon podman +binaries: podman test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/checkseccomp @@ -142,7 +138,6 @@ install: .gopathok install.bin install.man install.cni install.bin: install ${SELINUXOPT} -D -m 755 bin/podman $(BINDIR)/podman - install ${SELINUXOPT} -D -m 755 bin/conmon $(LIBEXECDIR)/crio/conmon install.man: docs install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1 @@ -165,7 +160,6 @@ install.docker: docker-docs install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1 uninstall: - rm -f $(LIBEXECDIR)/crio/conmon for i in $(filter %.1,$(MANPAGES)); do \ rm -f $(MANDIR)/man1/$$(basename $${i}); \ done @@ -208,7 +202,6 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .PHONY: \ binaries \ clean \ - conmon \ default \ docs \ gofmt \ |