* [meta-virtualization][PATCH] podman: replace GOBUILDFLAGS patch
@ 2022-08-18 9:40 pascal.bach
2022-08-21 3:21 ` Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: pascal.bach @ 2022-08-18 9:40 UTC (permalink / raw)
To: meta-virtualization; +Cc: Pascal Bach
From: Pascal Bach <pascal.bach@siemens.com>
The GOBUILDFLAGS patch is replaced by explicitly setting BUILDFLAGS="${GOBUILDFLAGS}"
in the recipe.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
---
...01-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch | 109 ------------------
recipes-containers/podman/podman_git.bb | 4 +-
2 files changed, 3 insertions(+), 110 deletions(-)
delete mode 100644 recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
diff --git a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
deleted file mode 100644
index 14b2714..0000000
--- a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 3e18f3a4db638a3df48f49aa0a539f8bb048afc9 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei.gherzan@huawei.com>
-Date: Tue, 5 Jul 2022 11:51:56 +0200
-Subject: [PATCH] Rename BUILDFLAGS to GOBUILDFLAGS
-
-Yocto uses GOBUILDFLAGS to pass the right build flags while the Makefile
-uses BUILDFLAGS. Align them accordingly.
-
-See go.bbclass for more information.
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
----
- Makefile | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-Index: import/Makefile
-===================================================================
---- import.orig/Makefile
-+++ import/Makefile
-@@ -242,7 +242,7 @@
-
- .PHONY: test/checkseccomp/checkseccomp
- test/checkseccomp/checkseccomp: $(wildcard test/checkseccomp/*.go)
-- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
-+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
-
- .PHONY: test/testvol/testvol
- test/testvol/testvol: $(wildcard test/testvol/*.go)
-@@ -254,7 +254,7 @@
-
- .PHONY: test/goecho/goecho
- test/goecho/goecho: $(wildcard test/goecho/*.go)
-- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
-+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
-
- test/version/version: version/version.go
- $(GO) build -o $@ ./test/version/
-@@ -296,7 +296,7 @@
- distro for journald support."
- endif
- $(GOCMD) build \
-- $(BUILDFLAGS) \
-+ $(GOBUILDFLAGS) \
- $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
- -tags "$(BUILDTAGS)" \
- -o $@ ./cmd/podman
-@@ -308,7 +308,7 @@
- # '|' is to ignore SRCBINDIR mtime; see: info make 'Types of Prerequisites'
- $(SRCBINDIR)/podman$(BINSFX): $(SOURCES) go.mod go.sum | $(SRCBINDIR)
- $(GOCMD) build \
-- $(BUILDFLAGS) \
-+ $(GOBUILDFLAGS) \
- $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
- -tags "${REMOTETAGS}" \
- -o $@ ./cmd/podman
-@@ -318,7 +318,7 @@
- GOOS=linux \
- GOARCH=$(GOARCH) \
- $(GO) build \
-- $(BUILDFLAGS) \
-+ $(GOBUILDFLAGS) \
- $(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \
- -tags "${REMOTETAGS}" \
- -o $@ ./cmd/podman
-@@ -338,7 +338,7 @@
- CGO_ENABLED=0 \
- GOOS=windows \
- $(GO) build \
-- $(BUILDFLAGS) \
-+ $(GOBUILDFLAGS) \
- -ldflags -H=windowsgui \
- -o bin/windows/winpath.exe \
- ./cmd/winpath
-@@ -349,14 +349,14 @@
- GOOS=darwin \
- GOARCH=$(GOARCH) \
- $(GO) build \
-- $(BUILDFLAGS) \
-+ $(GOBUILDFLAGS) \
- -o bin/darwin/podman-mac-helper \
- ./cmd/podman-mac-helper
-
- bin/rootlessport: $(SOURCES) go.mod go.sum
- CGO_ENABLED=$(CGO_ENABLED) \
- $(GO) build \
-- $(BUILDFLAGS) \
-+ $(GOBUILDFLAGS) \
- -o $@ ./cmd/rootlessport
-
- .PHONY: rootlessport
-@@ -379,7 +379,7 @@
- GOARCH="$${TARGET##*.}"; \
- CGO_ENABLED=0 \
- $(GO) build \
-- $(BUILDFLAGS) \
-+ $(GOBUILDFLAGS) \
- $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
- -tags '$(BUILDTAGS_CROSS)' \
- -o "$@" ./cmd/podman
-@@ -830,7 +830,7 @@
-
- .PHONY: .install.ginkgo
- .install.ginkgo:
-- $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo
-+ $(GO) install $(GOBUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo
-
- .PHONY: .install.golangci-lint
- .install.golangci-lint:
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 52ffa6c..f19d092 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -20,7 +20,6 @@ DEPENDS = " \
SRCREV = "754ec89a8a185d308ca5ed08afaf34d6cbda08da"
SRC_URI = " \
git://github.com/containers/libpod.git;branch=v4.2;protocol=https \
- file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \
${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://00-podman-rootless.conf', '', d)} \
"
@@ -46,6 +45,9 @@ export LDFLAGS=""
# https://github.com/llvm/llvm-project/issues/53999
TOOLCHAIN = "gcc"
+# podmans Makefile expects BUILDFLAGS to be set but go.bbclass defines them in GOBUILDFLAGS
+export BUILDFLAGS="${GOBUILDFLAGS}"
+
inherit go goarch
inherit systemd pkgconfig
--
2.37.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-virtualization][PATCH] podman: replace GOBUILDFLAGS patch
2022-08-18 9:40 [meta-virtualization][PATCH] podman: replace GOBUILDFLAGS patch pascal.bach
@ 2022-08-21 3:21 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2022-08-21 3:21 UTC (permalink / raw)
To: Pascal Bach; +Cc: meta-virtualization
Thanks!
This is now queued on master-next.
Bruce
In message: [meta-virtualization][PATCH] podman: replace GOBUILDFLAGS patch
on 18/08/2022 Pascal Bach wrote:
> From: Pascal Bach <pascal.bach@siemens.com>
>
> The GOBUILDFLAGS patch is replaced by explicitly setting BUILDFLAGS="${GOBUILDFLAGS}"
> in the recipe.
>
> Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
> ---
> ...01-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch | 109 ------------------
> recipes-containers/podman/podman_git.bb | 4 +-
> 2 files changed, 3 insertions(+), 110 deletions(-)
> delete mode 100644 recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
>
> diff --git a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
> deleted file mode 100644
> index 14b2714..0000000
> --- a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
> +++ /dev/null
> @@ -1,109 +0,0 @@
> -From 3e18f3a4db638a3df48f49aa0a539f8bb048afc9 Mon Sep 17 00:00:00 2001
> -From: Andrei Gherzan <andrei.gherzan@huawei.com>
> -Date: Tue, 5 Jul 2022 11:51:56 +0200
> -Subject: [PATCH] Rename BUILDFLAGS to GOBUILDFLAGS
> -
> -Yocto uses GOBUILDFLAGS to pass the right build flags while the Makefile
> -uses BUILDFLAGS. Align them accordingly.
> -
> -See go.bbclass for more information.
> -
> -Upstream-Status: Inappropriate [OE specific]
> -Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
> ----
> - Makefile | 24 ++++++++++++------------
> - 1 file changed, 12 insertions(+), 12 deletions(-)
> -
> -Index: import/Makefile
> -===================================================================
> ---- import.orig/Makefile
> -+++ import/Makefile
> -@@ -242,7 +242,7 @@
> -
> - .PHONY: test/checkseccomp/checkseccomp
> - test/checkseccomp/checkseccomp: $(wildcard test/checkseccomp/*.go)
> -- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
> -+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
> -
> - .PHONY: test/testvol/testvol
> - test/testvol/testvol: $(wildcard test/testvol/*.go)
> -@@ -254,7 +254,7 @@
> -
> - .PHONY: test/goecho/goecho
> - test/goecho/goecho: $(wildcard test/goecho/*.go)
> -- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
> -+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
> -
> - test/version/version: version/version.go
> - $(GO) build -o $@ ./test/version/
> -@@ -296,7 +296,7 @@
> - distro for journald support."
> - endif
> - $(GOCMD) build \
> -- $(BUILDFLAGS) \
> -+ $(GOBUILDFLAGS) \
> - $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
> - -tags "$(BUILDTAGS)" \
> - -o $@ ./cmd/podman
> -@@ -308,7 +308,7 @@
> - # '|' is to ignore SRCBINDIR mtime; see: info make 'Types of Prerequisites'
> - $(SRCBINDIR)/podman$(BINSFX): $(SOURCES) go.mod go.sum | $(SRCBINDIR)
> - $(GOCMD) build \
> -- $(BUILDFLAGS) \
> -+ $(GOBUILDFLAGS) \
> - $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
> - -tags "${REMOTETAGS}" \
> - -o $@ ./cmd/podman
> -@@ -318,7 +318,7 @@
> - GOOS=linux \
> - GOARCH=$(GOARCH) \
> - $(GO) build \
> -- $(BUILDFLAGS) \
> -+ $(GOBUILDFLAGS) \
> - $(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \
> - -tags "${REMOTETAGS}" \
> - -o $@ ./cmd/podman
> -@@ -338,7 +338,7 @@
> - CGO_ENABLED=0 \
> - GOOS=windows \
> - $(GO) build \
> -- $(BUILDFLAGS) \
> -+ $(GOBUILDFLAGS) \
> - -ldflags -H=windowsgui \
> - -o bin/windows/winpath.exe \
> - ./cmd/winpath
> -@@ -349,14 +349,14 @@
> - GOOS=darwin \
> - GOARCH=$(GOARCH) \
> - $(GO) build \
> -- $(BUILDFLAGS) \
> -+ $(GOBUILDFLAGS) \
> - -o bin/darwin/podman-mac-helper \
> - ./cmd/podman-mac-helper
> -
> - bin/rootlessport: $(SOURCES) go.mod go.sum
> - CGO_ENABLED=$(CGO_ENABLED) \
> - $(GO) build \
> -- $(BUILDFLAGS) \
> -+ $(GOBUILDFLAGS) \
> - -o $@ ./cmd/rootlessport
> -
> - .PHONY: rootlessport
> -@@ -379,7 +379,7 @@
> - GOARCH="$${TARGET##*.}"; \
> - CGO_ENABLED=0 \
> - $(GO) build \
> -- $(BUILDFLAGS) \
> -+ $(GOBUILDFLAGS) \
> - $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
> - -tags '$(BUILDTAGS_CROSS)' \
> - -o "$@" ./cmd/podman
> -@@ -830,7 +830,7 @@
> -
> - .PHONY: .install.ginkgo
> - .install.ginkgo:
> -- $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo
> -+ $(GO) install $(GOBUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo
> -
> - .PHONY: .install.golangci-lint
> - .install.golangci-lint:
> diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
> index 52ffa6c..f19d092 100644
> --- a/recipes-containers/podman/podman_git.bb
> +++ b/recipes-containers/podman/podman_git.bb
> @@ -20,7 +20,6 @@ DEPENDS = " \
> SRCREV = "754ec89a8a185d308ca5ed08afaf34d6cbda08da"
> SRC_URI = " \
> git://github.com/containers/libpod.git;branch=v4.2;protocol=https \
> - file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \
> ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://00-podman-rootless.conf', '', d)} \
> "
>
> @@ -46,6 +45,9 @@ export LDFLAGS=""
> # https://github.com/llvm/llvm-project/issues/53999
> TOOLCHAIN = "gcc"
>
> +# podmans Makefile expects BUILDFLAGS to be set but go.bbclass defines them in GOBUILDFLAGS
> +export BUILDFLAGS="${GOBUILDFLAGS}"
> +
> inherit go goarch
> inherit systemd pkgconfig
>
> --
> 2.37.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7540): https://lists.yoctoproject.org/g/meta-virtualization/message/7540
> Mute This Topic: https://lists.yoctoproject.org/mt/93100037/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-21 3:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-18 9:40 [meta-virtualization][PATCH] podman: replace GOBUILDFLAGS patch pascal.bach
2022-08-21 3:21 ` Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.