MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

podman; fix patch fuzz/failure

Browse Source 
patch a33188f [podman: Fix host contamination] appears to have
introduced fuzz/failures. Which strangely wasn't picked up on
merge testing.

We refresh the patch to fix the issues.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2022-07-17 14:34:38 -04:00
parent fb14913e22
commit 7ec4b4746d
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
View File

@ -14,11 +14,11 @@ Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Makefile | 24 ++++++++++++------------ Makefile | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-) 1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile Index: import/Makefile
index cb230d8e9..538b28d41 100644 ===================================================================
--- a/Makefile --- import.orig/Makefile
+++ b/Makefile +++ import/Makefile
@@ -69,7 +69,7 @@ PRE_COMMIT = $(shell command -v bin/venv/bin/pre-commit ~/.local/bin/pre-commit @@ -69,7 +69,7 @@
# triggered. # triggered.
SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print) SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print)
@ -27,7 +27,7 @@ index cb230d8e9..538b28d41 100644
BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker) CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
@@ -264,11 +264,11 @@ gofmt: ## Verify the source code gofmt @@ -264,11 +264,11 @@
.PHONY: test/checkseccomp/checkseccomp .PHONY: test/checkseccomp/checkseccomp
test/checkseccomp/checkseccomp: .gopathok $(wildcard test/checkseccomp/*.go) test/checkseccomp/checkseccomp: .gopathok $(wildcard test/checkseccomp/*.go)
@ -41,7 +41,7 @@ index cb230d8e9..538b28d41 100644
.PHONY: volume-plugin-test-image .PHONY: volume-plugin-test-image
volume-plugin-test-img: volume-plugin-test-img:
@@ -276,7 +276,7 @@ volume-plugin-test-img: @@ -276,7 +276,7 @@
.PHONY: test/goecho/goecho .PHONY: test/goecho/goecho
test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go) test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go)
@ -50,7 +50,7 @@ index cb230d8e9..538b28d41 100644
test/version/version: .gopathok version/version.go test/version/version: .gopathok version/version.go
$(GO) build -o $@ ./test/version/ $(GO) build -o $@ ./test/version/
@@ -318,7 +318,7 @@ ifeq (,$(findstring systemd,$(BUILDTAGS))) @@ -318,7 +318,7 @@
distro for journald support." distro for journald support."
endif endif
$(GOCMD) build \ $(GOCMD) build \
@ -59,7 +59,7 @@ index cb230d8e9..538b28d41 100644
$(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
-tags "$(BUILDTAGS)" \ -tags "$(BUILDTAGS)" \
-o $@ ./cmd/podman -o $@ ./cmd/podman
@@ -329,14 +329,14 @@ $(SRCBINDIR): @@ -329,7 +329,7 @@
$(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum
$(GOCMD) build \ $(GOCMD) build \
@ -68,15 +68,16 @@ index cb230d8e9..538b28d41 100644
$(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
-tags "${REMOTETAGS}" \ -tags "${REMOTETAGS}" \
-o $@ ./cmd/podman -o $@ ./cmd/podman
@@ -339,7 +339,7 @@
$(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum GOOS=$(GOOS) \
$(GOCMD) build \ GOARCH=$(GOARCH) \
$(GO) build \
- $(BUILDFLAGS) \ - $(BUILDFLAGS) \
+ $(GOBUILDFLAGS) \ + $(GOBUILDFLAGS) \
$(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \ $(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \
-tags "${REMOTETAGS}" \ -tags "${REMOTETAGS}" \
-o $@ ./cmd/podman -o $@ ./cmd/podman
@@ -371,7 +371,7 @@ podman-winpath: .gopathok $(SOURCES) go.mod go.sum @@ -374,7 +374,7 @@
CGO_ENABLED=0 \ CGO_ENABLED=0 \
GOOS=windows \ GOOS=windows \
$(GO) build \ $(GO) build \
@ -85,7 +86,7 @@ index cb230d8e9..538b28d41 100644
-ldflags -H=windowsgui \ -ldflags -H=windowsgui \
-o bin/windows/winpath.exe \ -o bin/windows/winpath.exe \
./cmd/winpath ./cmd/winpath
@@ -390,14 +390,14 @@ podman-mac-helper: ## Build podman-mac-helper for macOS @@ -393,14 +393,14 @@
GOOS=darwin \ GOOS=darwin \
GOARCH=$(GOARCH) \ GOARCH=$(GOARCH) \
$(GO) build \ $(GO) build \
@ -102,7 +103,7 @@ index cb230d8e9..538b28d41 100644
-o $@ ./cmd/rootlessport -o $@ ./cmd/rootlessport
.PHONY: rootlessport .PHONY: rootlessport
@@ -420,7 +420,7 @@ bin/podman.cross.%: .gopathok @@ -423,7 +423,7 @@
GOARCH="$${TARGET##*.}"; \ GOARCH="$${TARGET##*.}"; \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
$(GO) build \ $(GO) build \
@ -111,7 +112,7 @@ index cb230d8e9..538b28d41 100644
$(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
-tags '$(BUILDTAGS_CROSS)' \ -tags '$(BUILDTAGS_CROSS)' \
-o "$@" ./cmd/podman -o "$@" ./cmd/podman
@@ -864,7 +864,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal @@ -871,7 +871,7 @@
.PHONY: .install.ginkgo .PHONY: .install.ginkgo
.install.ginkgo: .gopathok .install.ginkgo: .gopathok
if [ ! -x "$(GOBIN)/ginkgo" ]; then \ if [ ! -x "$(GOBIN)/ginkgo" ]; then \
@ -120,6 +121,3 @@ index cb230d8e9..538b28d41 100644
fi fi
.PHONY: .install.gitvalidation .PHONY: .install.gitvalidation
--
2.25.1