github.com/containers/storage v1.12.13

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

vendor/github.com/containers/storage/Makefile

@@ -1,4 +1,27 @@
-.PHONY: all binary clean cross default docs gccgo help install.tools local-binary local-cross local-gccgo local-test-integration local-test-unit local-validate test test-integration test-unit validate
+export GO111MODULE=off
+
+.PHONY: \
+	all \
+	binary \
+	clean \
+	cross \
+	default \
+	docs \
+	gccgo \
+	help \
+	install.tools \
+	local-binary \
+	local-cross \
+	local-gccgo \
+	local-test-integration \
+	local-test-unit \
+	local-validate \
+	lint \
+	test \
+	test-integration \
+	test-unit \
+	validate \
+	vendor
 
 PACKAGE := github.com/containers/storage
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
@@ -10,6 +33,7 @@ BUILDFLAGS := -tags "$(AUTOTAGS) $(TAGS)" $(FLAGS)
 GO := go
 
 RUNINVM := vagrant/runinvm.sh
+FFJSON := tests/tools/build/ffjson
 
 default all: local-binary docs local-validate local-cross local-gccgo test-unit test-integration ## validate all checks, build and cross-build\nbinaries and docs, run tests in a VM
 
@@ -23,19 +47,19 @@ containers-storage: $(sources) ## build using gc on the host
 
 layers_ffjson.go: layers.go
 	$(RM) $@
-	ffjson layers.go
+	$(FFJSON) layers.go
 
 images_ffjson.go: images.go
 	$(RM) $@
-	ffjson images.go
+	$(FFJSON) images.go
 
 containers_ffjson.go: containers.go
 	$(RM) $@
-	ffjson containers.go
+	$(FFJSON) containers.go
 
 pkg/archive/archive_ffjson.go: pkg/archive/archive.go
 	$(RM) $@
-	ffjson pkg/archive/archive.go
+	$(FFJSON) pkg/archive/archive.go
 
 binary local-binary: containers-storage
 
@@ -43,17 +67,18 @@ local-gccgo: ## build using gccgo on the host
 	GCCGO=$(PWD)/hack/gccgo-wrapper.sh $(GO) build -compiler gccgo $(BUILDFLAGS) -o containers-storage.gccgo ./cmd/containers-storage
 
 local-cross: ## cross build the binaries for arm, darwin, and\nfreebsd
-	@for target in linux/amd64 linux/386 linux/arm darwin/amd64 windows/amd64 ; do \
+	@for target in linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64 linux/ppc64le darwin/amd64 windows/amd64 ; do \
 		os=`echo $${target} | cut -f1 -d/` ; \
 		arch=`echo $${target} | cut -f2 -d/` ; \
 		suffix=$${os}.$${arch} ; \
-		$(MAKE) GOOS=$${os} GOARCH=$${arch} FLAGS="-o containers-storage.$${suffix}" AUTOTAGS="$(NATIVETAGS)" local-binary || exit 1; \
+		echo env CGO_ENABLED=0 GOOS=$${os} GOARCH=$${arch} $(GO) build -compiler gc -tags \"$(NATIVETAGS) $(TAGS)\" $(FLAGS) -o containers-storage.$${suffix} ./cmd/containers-storage ; \
+		env CGO_ENABLED=0 GOOS=$${os} GOARCH=$${arch} $(GO) build -compiler gc -tags "$(NATIVETAGS) $(TAGS)" $(FLAGS) -o containers-storage.$${suffix} ./cmd/containers-storage || exit 1 ; \
 	done
 
 cross: ## cross build the binaries for arm, darwin, and\nfreebsd using VMs
 	$(RUNINVM) make local-$@
 
-docs: ## build the docs on the host
+docs: install.tools ## build the docs on the host
 	$(MAKE) -C docs docs
 
 gccgo: ## build using gccgo using VMs
@@ -82,11 +107,21 @@ validate: ## validate DCO, gofmt, ./pkg/ isolation, golint,\ngo vet and vendor u
 	$(RUNINVM) make local-$@
 
 install.tools:
-	go get -u $(BUILDFLAGS) github.com/cpuguy83/go-md2man
-	go get -u $(BUILDFLAGS) github.com/vbatts/git-validation
-	go get -u $(BUILDFLAGS) gopkg.in/alecthomas/gometalinter.v1
-	go get -u $(BUILDFLAGS) github.com/pquerna/ffjson
-	gometalinter.v1 -i
+	make -C tests/tools
+
+install.docs: docs
+	make -C docs install
+
+install: install.docs
+
+lint: install.tools
+	tests/tools/build/golangci-lint run
 
 help: ## this help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-z A-Z_-]+:.*?## / {gsub(" ",",",$$1);gsub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-21s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+vendor:
+	export GO111MODULE=on \
+		$(GO) mod tidy && \
+		$(GO) mod vendor && \
+		$(GO) mod verify