diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-10 11:11:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 11:11:46 -0800 |
| commit | 6524041fb0ebfc35dafe3bb7bebbd4dfa27ba5e8 (patch) | |
| tree | cf6e4191124ea1c44b9cadb504c0b2f5e6269a50 /Makefile | |
| parent | e4525cf844535014923a2253e8531d92d9e556e5 (diff) | |
| parent | 45fb935fe44a383ae14f16ab533281687d642c5e (diff) | |
| download | podman-6524041fb0ebfc35dafe3bb7bebbd4dfa27ba5e8.tar.gz podman-6524041fb0ebfc35dafe3bb7bebbd4dfa27ba5e8.tar.bz2 podman-6524041fb0ebfc35dafe3bb7bebbd4dfa27ba5e8.zip | |
Merge pull request #2119 from jwhonce/wip/python_podman
Move python code from contrib to it's own repo python-podman
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 2 insertions, 27 deletions
@@ -26,8 +26,6 @@ ifneq (,$(findstring varlink,$(BUILDTAGS))) endif CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker) -HAS_PYTHON3 := $(shell command -v python3 2>/dev/null) - BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d @@ -88,9 +86,6 @@ endif lint: .gopathok varlink_generate @echo "checking lint" @./.tool/lint - # Not ready - # @$(MAKE) -C contrib/python/podman lint - # @$(MAKE) -C contrib/python/pypodman lint gofmt: find . -name '*.go' ! -path './vendor/*' -exec gofmt -s -w {} \+ @@ -122,12 +117,6 @@ bin/podman.cross.%: .gopathok GOARCH="$${TARGET##*.}" \ $(GO) build -ldflags '$(LDFLAGS_PODMAN)' -tags '$(BUILDTAGS_CROSS)' -o "$@" $(PROJECT)/cmd/podman -python: -ifdef HAS_PYTHON3 - $(MAKE) -C contrib/python/podman python-podman - $(MAKE) -C contrib/python/pypodman python-pypodman -endif - clean: rm -rf \ .gopathok \ @@ -147,8 +136,6 @@ clean: $(MANPAGES) ||: find . -name \*~ -delete find . -name \#\* -delete - $(MAKE) -C contrib/python/podman clean - $(MAKE) -C contrib/python/pypodman clean libpodimage: ${CONTAINER_RUNTIME} build -t ${LIBPOD_IMAGE} . @@ -181,7 +168,7 @@ localunit: test/goecho/goecho varlink_generate ginkgo: ginkgo -v -tags "$(BUILDTAGS)" -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/. -localintegration: varlink_generate test-binaries clientintegration ginkgo +localintegration: varlink_generate test-binaries ginkgo localsystem: .install.ginkgo .install.gomega ginkgo -v -noColor test/system/ @@ -189,10 +176,6 @@ localsystem: .install.ginkgo .install.gomega system.test-binary: .install.ginkgo .install.gomega $(GO) test -c ./test/system -clientintegration: - $(MAKE) -C contrib/python/podman integration - $(MAKE) -C contrib/python/pypodman integration - perftest: $ cd contrib/perftest;go build @@ -230,7 +213,7 @@ changelog: $(shell cat $(TMPFILE) >> changelog.txt) $(shell rm $(TMPFILE)) -install: .gopathok install.bin install.man install.cni install.systemd install.python +install: .gopathok install.bin install.man install.cni install.systemd install.bin: install ${SELINUXOPT} -d -m 755 $(BINDIR) @@ -268,10 +251,6 @@ install.systemd: install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.service ${SYSTEMDDIR}/io.podman.service install ${SELINUXOPT} -m 644 contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf -install.python: - $(MAKE) DESTDIR=${DESTDIR} -C contrib/python/podman install - $(MAKE) DESTDIR=${DESTDIR} -C contrib/python/pypodman install - uninstall: for i in $(filter %.1,$(MANPAGES)); do \ rm -f $(MANDIR)/man1/$$(basename $${i}); \ @@ -279,8 +258,6 @@ uninstall: for i in $(filter %.5,$(MANPAGES)); do \ rm -f $(MANDIR)/man5/$$(basename $${i}); \ done - $(MAKE) -C contrib/python/pypodman uninstall - $(MAKE) -C contrib/python/podman uninstall .PHONY: .gitvalidation .gitvalidation: .gopathok @@ -382,5 +359,3 @@ build-all-new-commits: changelog \ validate \ install.libseccomp.sudo \ - python \ - clientintegration |