From a824186ac9803ef5f7548df790988a4ebd2d9c07 Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 25 Apr 2018 13:26:52 -0500 Subject: Use buildah commit and bud in podman Vendor in buildah and use as much of commit and bug as possible for podman build and commit. Resolves #586 Signed-off-by: baude Closes: #681 Approved by: mheon --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1fa92492f..13948db02 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true) GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}") BUILD_INFO := $(shell date +%s) ISODATE := $(shell date --iso-8601) +LIBSECCOMP_COMMIT := release-2.3 # If GOPATH not specified, use one in the local directory ifeq ($(GOPATH),) @@ -249,6 +250,13 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man varlink_generate: .gopathok cmd/podman/varlink/ioprojectatomicpodman.go +.PHONY: install.libseccomp +install.libseccomp: + rm -rf ../../seccomp/libseccomp + git clone https://github.com/seccomp/libseccomp ../../seccomp/libseccomp + cd ../../seccomp/libseccomp && git checkout $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && make install + + cmd/podman/varlink/ioprojectatomicpodman.go: cmd/podman/varlink/io.projectatomic.podman.varlink $(GO) generate ./cmd/podman/varlink/... @@ -267,4 +275,5 @@ validate: gofmt .gitvalidation uninstall \ shell \ changelog \ - validate + validate \ + install.libseccomp -- cgit v1.2.3-54-g00ecf