diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-02 19:35:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 19:35:33 -0400 |
| commit | 7bb1d240281e95aeb5eb5f761823e766d2804683 (patch) | |
| tree | c03a19ce82df57651218a0133d571c7887ce8b88 /Makefile | |
| parent | f0f5b51ff27d8eec790f2d5fc12c28c536149bb7 (diff) | |
| parent | 6e37df18ef4e2750e954bf64f7dc46d57dcade3a (diff) | |
| download | podman-7bb1d240281e95aeb5eb5f761823e766d2804683.tar.gz podman-7bb1d240281e95aeb5eb5f761823e766d2804683.tar.bz2 podman-7bb1d240281e95aeb5eb5f761823e766d2804683.zip | |
Merge pull request #6 from rhatdan/papr
Add Papr support
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 43 |
1 files changed, 14 insertions, 29 deletions
@@ -3,14 +3,14 @@ EPOCH_TEST_COMMIT ?= 1cc5a27 PROJECT := github.com/projectatomic/libpod GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") -CRIO_IMAGE := crio_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) -CRIO_INSTANCE := crio_dev +LIBPOD_IMAGE := libpod_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) +LIBPOD_INSTANCE := libpod_dev PREFIX ?= ${DESTDIR}/usr/local BINDIR ?= ${PREFIX}/bin LIBEXECDIR ?= ${PREFIX}/libexec MANDIR ?= ${PREFIX}/share/man ETCDIR ?= ${DESTDIR}/etc -ETCDIR_CRIO ?= ${ETCDIR}/crio +ETCDIR_LIBPOD ?= ${ETCDIR}/crio BUILDTAGS ?= seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) $(shell hack/btrfs_installed_tag.sh) $(shell hack/ostree_tag.sh) $(shell hack/selinux_tag.sh) BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions @@ -89,7 +89,7 @@ ifneq ($(GOPATH),) rm -f "$(GOPATH)/.gopathok" endif rm -rf _output - rm -f docs/*.1 docs/*.5 docs/*.8 + rm -f docs/*.1 rm -fr test/testdata/redis-image find . -name \*~ -delete find . -name \#\* -delete @@ -99,22 +99,23 @@ endif rm -f test/copyimg/copyimg rm -f test/checkseccomp/checkseccomp -crioimage: - docker build -t ${CRIO_IMAGE} . +libpodimage: + docker build -t ${LIBPOD_IMAGE} . -dbuild: crioimage - docker run --name=${CRIO_INSTANCE} --privileged ${CRIO_IMAGE} -v ${PWD}:/go/src/${PROJECT} --rm make binaries +dbuild: libpodimage + docker run --name=${LIBPOD_INSTANCE} --privileged ${LIBPOD_IMAGE} -v ${PWD}:/go/src/${PROJECT} --rm make binaries -integration: crioimage - docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${CRIO_IMAGE} make localintegration +integration: libpodimage + docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} make localintegration testunit: $(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES) -localintegration: clean binaries test-binaries +localintegration: test-binaries ./test/test_runner.sh ${TESTFLAGS} binaries: conmon kpod + test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/checkseccomp MANPAGES_MD := $(wildcard docs/*.md) @@ -123,12 +124,6 @@ MANPAGES := $(MANPAGES_MD:%.md=%) docs/%.1: docs/%.1.md .gopathok (go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) || ($(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) -docs/%.5: docs/%.5.md .gopathok - (go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) || ($(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) - -docs/%.8: docs/%.8.md .gopathok - (go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) || ($(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) - docs: $(MANPAGES) install: .gopathok install.bin install.man @@ -139,14 +134,10 @@ install.bin: install.man: install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1 - install ${SELINUXOPT} -d -m 755 $(MANDIR)/man5 - install ${SELINUXOPT} -d -m 755 $(MANDIR)/man8 install ${SELINUXOPT} -m 644 $(filter %.1,$(MANPAGES)) -t $(MANDIR)/man1 - install ${SELINUXOPT} -m 644 $(filter %.5,$(MANPAGES)) -t $(MANDIR)/man5 - install ${SELINUXOPT} -m 644 $(filter %.8,$(MANPAGES)) -t $(MANDIR)/man8 install.config: - install ${SELINUXOPT} -D -m 644 seccomp.json $(ETCDIR_CRIO)/seccomp.json + install ${SELINUXOPT} -D -m 644 seccomp.json $(ETCDIR_LIBPOD)/seccomp.json install ${SELINUXOPT} -D -m 644 crio-umount.conf $(OCIUMOUNTINSTALLDIR)/crio-umount.conf install.completions: @@ -156,13 +147,7 @@ install.completions: uninstall: rm -f $(LIBEXECDIR)/crio/conmon for i in $(filter %.1,$(MANPAGES)); do \ - rm -f $(MANDIR)/man8/$$(basename $${i}); \ - done - for i in $(filter %.5,$(MANPAGES)); do \ - rm -f $(MANDIR)/man5/$$(basename $${i}); \ - done - for i in $(filter %.8,$(MANPAGES)); do \ - rm -f $(MANDIR)/man8/$$(basename $${i}); \ + rm -f $(MANDIR)/man1/$$(basename $${i}); \ done .PHONY: .gitvalidation |