Re: check-layer-nightly failure
Bruce Ashfield
On Thu, Jul 7, 2022 at 9:14 AM Alexandre Belloni
<alexandre.belloni@...> wrote: docker-compose has a history of being sensitive to changes in this package. Once again, I'll put on the record that we continue to ignore the lack of an elegant way to deal with language layers and the insistence that somehow the whole world of dependencies can align on one version of a package. I'll do a version bump this time, since it does look ok .. but I won't be dropping the recipe from the layer, and I may have to just fork it into a version specific package and handle the upgrade cadence in meta-virtualization. Bruce
-- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
[master][kirkstone][PATCH] containerd: upgrade to 1.6.6
Chen Qi
Signed-off-by: Chen Qi <Qi.Chen@...>
--- .../containerd/containerd-opencontainers_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index b0f92b12..c28b1510 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and support as well as checkpoint and restore for cloning and live migration of containers." -SRCREV = "d12516713c315ea9e651eb1df89cf32ff7c8137c" +SRCREV = "10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1" SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \ file://0001-Add-build-option-GODEBUG-1.patch \ file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" -CONTAINERD_VERSION = "v1.6.1" -CVE_VERSION = "1.6.1" +CONTAINERD_VERSION = "v1.6.6" +CVE_VERSION = "1.6.6" EXTRA_OEMAKE += "GODEBUG=1" @@ -56,7 +56,7 @@ do_compile() { metrics filters identifiers labels leases plugin server services \ cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \ cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \ - shutdown schedcore tracing; do + shutdown schedcore tracing kmutex; do if [ -d ${S}/src/import/${c} ]; then ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c} fi -- 2.37.0
|
|
[kirkstone][PATCH 1/2] runc: update to 1.1.2
Chen Qi
From: Bruce Ashfield <bruce.ashfield@...>
Bumping runc to version v1.1.2-9-gb507e2da, which comprises the following commits: bf1cd884 ci: use golangci-lint-action v3, GO_VERSION 1feafc31 ci: bump golangci-lint to v1.44 89f79ff0 libct: StartInitialization: fix %w related warning 3b7f2605 Format sources using gofumpt 0.2.1 eeac4e77 build(deps): bump actions/checkout from 2 to 3 cd7fa00d Vagrantfile.fedora: fix build wrt new git cdfdbe55 VERSION: back to development a916309f VERSION: release 1.1.2 364ec0f1 runc: do not set inheritable capabilities 8959e372 VERSION: back to development 52de29d7 VERSION: release 1.1.1 2636e1cb CHANGELOG.md: add 1.1.1 release notes 036cc348 CI/cirrus: add centos-stream-9 db953158 README.md: add cirrus-ci badge ea19181e README,libct/README: fix pkg.go.dev badges 8290c4cf libct/cg: IsCgroup2HybridMode: don't panic ee7ba6cb configs/validate: looser validation for RDT 96193422 libct/cg/sd/v2: fix ENOENT on cgroup delegation 35784a3e ensure the path is a sub-cgroup path 986e7c53 libct: fixStdioPermissions: ignore EROFS 5053a065 libct: fixStdioPermissions: skip chown if not needed d2939b6b libct: fixStdioPermissions: minor refactoring Signed-off-by: Bruce Ashfield <bruce.ashfield@...> Signed-off-by: Chen Qi <Qi.Chen@...> --- recipes-containers/runc/runc-opencontainers_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb index ab573107..14570b9d 100644 --- a/recipes-containers/runc/runc-opencontainers_git.bb +++ b/recipes-containers/runc/runc-opencontainers_git.bb @@ -1,10 +1,10 @@ include runc.inc -SRCREV = "b9460f26b49efa086b99f32557219d0f24bd23ae" +SRCREV = "b507e2da6c6a3a328f208fa415a56ad7cd58761b" SRC_URI = " \ git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \ file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ " -RUNC_VERSION = "1.1.0" +RUNC_VERSION = "1.1.2" CVE_PRODUCT = "runc" -- 2.37.0
|
|
[kirkstone][PATCH 2/2] runc/docker: update to 1.1.2
Chen Qi
From: Bruce Ashfield <bruce.ashfield@...>
Bumping runc to version v1.1.2-9-gb507e2da, which comprises the following commits: bf1cd884 ci: use golangci-lint-action v3, GO_VERSION 1feafc31 ci: bump golangci-lint to v1.44 89f79ff0 libct: StartInitialization: fix %w related warning 3b7f2605 Format sources using gofumpt 0.2.1 eeac4e77 build(deps): bump actions/checkout from 2 to 3 cd7fa00d Vagrantfile.fedora: fix build wrt new git cdfdbe55 VERSION: back to development a916309f VERSION: release 1.1.2 364ec0f1 runc: do not set inheritable capabilities 8959e372 VERSION: back to development 52de29d7 VERSION: release 1.1.1 2636e1cb CHANGELOG.md: add 1.1.1 release notes 036cc348 CI/cirrus: add centos-stream-9 db953158 README.md: add cirrus-ci badge ea19181e README,libct/README: fix pkg.go.dev badges 8290c4cf libct/cg: IsCgroup2HybridMode: don't panic ee7ba6cb configs/validate: looser validation for RDT 96193422 libct/cg/sd/v2: fix ENOENT on cgroup delegation 35784a3e ensure the path is a sub-cgroup path 986e7c53 libct: fixStdioPermissions: ignore EROFS 5053a065 libct: fixStdioPermissions: skip chown if not needed d2939b6b libct: fixStdioPermissions: minor refactoring Signed-off-by: Bruce Ashfield <bruce.ashfield@...> Signed-off-by: Chen Qi <Qi.Chen@...> --- recipes-containers/runc/runc-docker_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb index dc93a7c0..f2c0613b 100644 --- a/recipes-containers/runc/runc-docker_git.bb +++ b/recipes-containers/runc/runc-docker_git.bb @@ -2,13 +2,13 @@ include runc.inc # Note: this rev is before the required protocol field, update when all components # have been updated to match. -SRCREV_runc-docker = "b9460f26b49efa086b99f32557219d0f24bd23ae" +SRCREV_runc-docker = "b507e2da6c6a3a328f208fa415a56ad7cd58761b" SRC_URI = "git://github.com/opencontainers/runc;branch=release-1.1;name=runc-docker;protocol=https \ file://0001-runc-Add-console-socket-dev-null.patch \ file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ file://0001-runc-docker-SIGUSR1-daemonize.patch \ " -RUNC_VERSION = "1.1.0" +RUNC_VERSION = "1.1.2" CVE_PRODUCT = "runc" -- 2.37.0
|
|
Re: [PATCH] xen/sysvinit: add hvc0 console only if not there already
Bertrand Marquis
Hi Bruce,
On 5 Jul 2022, at 21:29, Bruce Ashfield <bruce.ashfield@...> wrote:He just did (thanks Christopher), would you mind also pushing this to kirkstone branch ? Thanks Bertrand
|
|
Re: [PATCH] xen/sysvinit: add hvc0 console only if not there already
Christopher Clark
On Tue, Jul 5, 2022 at 1:29 PM Bruce Ashfield <bruce.ashfield@...> wrote:
Ack from me - thanks Christopher
|
|
Re: [PATCH] xen/sysvinit: add hvc0 console only if not there already
Bruce Ashfield
Looks ok to me. I'll give it another day to hear from Christopher, and then
toggle quoted messageShow quoted text
I'll do the merge. Bruce In message: [meta-virtualization] [PATCH] xen/sysvinit: add hvc0 console only if not there already on 28/06/2022 Bertrand Marquis wrote:
The base inittab recipe is creating inittab entries for consoles listed
|
|
Re: [kirkstone][PATCH 1/3] podman: Fix host contamination
Bruce Ashfield
merged to kirkstone.
toggle quoted messageShow quoted text
Bruce In message: [meta-virtualization][kirkstone][PATCH 1/3] podman: Fix host contamination on 05/07/2022 Andrei Gherzan wrote:
From: Andrei Gherzan <andrei.gherzan@...>
|
|
Re: [PATCH 1/2] podman: Fix host contamination
Bruce Ashfield
merged.
toggle quoted messageShow quoted text
I'll wait on the upstream-status changes for now, since I'll be going through a refresh and will re-consider them then. Bruce In message: [meta-virtualization][PATCH 1/2] podman: Fix host contamination on 05/07/2022 Andrei Gherzan wrote:
From: Andrei Gherzan <andrei.gherzan@...>
|
|
[kirkstone][PATCH 3/3] runc: Add Upstream-Status to patch 0001
Andrei Gherzan
From: Andrei Gherzan <andrei.gherzan@...>
Signed-off-by: Andrei Gherzan <andrei.gherzan@...> --- ...01-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch index 4d35e58..1186330 100644 --- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch +++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch @@ -4,6 +4,7 @@ Date: Tue, 24 Aug 2021 11:38:23 -0400 Subject: [PATCH] Makefile: respect GOBUILDFLAGS for runc and remove recvtty from static +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Chen Qi <Qi.Chen@...> [bva: refreshed for release 1.0.2] Signed-off-by: Bruce Ashfield <bruce.ashfield@...> -- 2.25.1
|
|
[kirkstone][PATCH 2/3] oci-image-tools: Add Upstream-Status to patch 0001
Andrei Gherzan
From: Andrei Gherzan <andrei.gherzan@...>
Signed-off-by: Andrei Gherzan <andrei.gherzan@...> --- .../0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch b/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch index 7e0b2a1..956bb2c 100644 --- a/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch +++ b/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch @@ -8,6 +8,7 @@ build flags from our environemnt. Otherwise, we'll use the host settings for each and end up with a binary that cannot be run on the target. +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Bruce Ashfield <bruce.ashfield@...> --- Makefile | 2 +- -- 2.25.1
|
|
[kirkstone][PATCH 1/3] podman: Fix host contamination
Andrei Gherzan
From: Andrei Gherzan <andrei.gherzan@...>
The project's internal Makefile uses BUILDFLAGS variable to pass arguments to `go build` while Yocto/OE defines it as GOBUILDFLAGS. Add a patch to align this and avoid using host headers in which case, a musl build will fail similarly to: | [...]ld: /tmp/go-link-3172010154/000015.o: in function `vfprintf': | /usr/include/x86_64-linux-gnu/bits/stdio2.h:130: undefined reference to `__vfprintf_chk' | [...]ld: /tmp/go-link-3172010154/000016.o: in function `fprintf': | /usr/include/x86_64-linux-gnu/bits/stdio2.h:100: undefined reference to `__fprintf_chk' | collect2: error: ld returned 1 exit status Signed-off-by: Andrei Gherzan <andrei.gherzan@...> --- ...01-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch | 125 ++++++++++++++++++ recipes-containers/podman/podman_git.bb | 1 + 2 files changed, 126 insertions(+) create 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 new file mode 100644 index 0000000..13a736e --- /dev/null +++ b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch @@ -0,0 +1,125 @@ +From 3e18f3a4db638a3df48f49aa0a539f8bb048afc9 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei.gherzan@...> +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@...> +--- + Makefile | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index cb230d8e9..538b28d41 100644 +--- a/Makefile ++++ b/Makefile +@@ -69,7 +69,7 @@ PRE_COMMIT = $(shell command -v bin/venv/bin/pre-commit ~/.local/bin/pre-commit + # triggered. + SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print) + +-BUILDFLAGS := -mod=vendor $(BUILDFLAGS) ++GOBUILDFLAGS := -mod=vendor $(GOBUILDFLAGS) + + 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) +@@ -264,11 +264,11 @@ gofmt: ## Verify the source code gofmt + + .PHONY: test/checkseccomp/checkseccomp + test/checkseccomp/checkseccomp: .gopathok $(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: .gopathok $(wildcard test/testvol/*.go) +- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol ++ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol + + .PHONY: volume-plugin-test-image + volume-plugin-test-img: +@@ -276,7 +276,7 @@ volume-plugin-test-img: + + .PHONY: test/goecho/goecho + test/goecho/goecho: .gopathok $(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: .gopathok version/version.go + $(GO) build -o $@ ./test/version/ +@@ -318,7 +318,7 @@ ifeq (,$(findstring systemd,$(BUILDTAGS))) + distro for journald support." + endif + $(GOCMD) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ + -tags "$(BUILDTAGS)" \ + -o $@ ./cmd/podman +@@ -329,14 +329,14 @@ $(SRCBINDIR): + + $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum + $(GOCMD) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ + -tags "${REMOTETAGS}" \ + -o $@ ./cmd/podman + + $(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum + $(GOCMD) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + $(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \ + -tags "${REMOTETAGS}" \ + -o $@ ./cmd/podman +@@ -371,7 +371,7 @@ podman-winpath: .gopathok $(SOURCES) go.mod go.sum + CGO_ENABLED=0 \ + GOOS=windows \ + $(GO) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + -ldflags -H=windowsgui \ + -o bin/windows/winpath.exe \ + ./cmd/winpath +@@ -390,14 +390,14 @@ podman-mac-helper: ## Build podman-mac-helper for macOS + GOOS=darwin \ + GOARCH=$(GOARCH) \ + $(GO) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + -o bin/darwin/podman-mac-helper \ + ./cmd/podman-mac-helper + + bin/rootlessport: .gopathok $(SOURCES) go.mod go.sum + CGO_ENABLED=$(CGO_ENABLED) \ + $(GO) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + -o $@ ./cmd/rootlessport + + .PHONY: rootlessport +@@ -420,7 +420,7 @@ bin/podman.cross.%: .gopathok + GOARCH="$${TARGET##*.}"; \ + CGO_ENABLED=0 \ + $(GO) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ + -tags '$(BUILDTAGS_CROSS)' \ + -o "$@" ./cmd/podman +@@ -864,7 +864,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal + .PHONY: .install.ginkgo + .install.ginkgo: .gopathok + if [ ! -x "$(GOBIN)/ginkgo" ]; then \ +- $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \ ++ $(GO) install $(GOBUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \ + fi + + .PHONY: .install.gitvalidation +-- +2.25.1 + diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index f805cb6..727a298 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb @@ -20,6 +20,7 @@ DEPENDS = " \ SRCREV = "717edd7b844dcd66468f5d991991d87e9fc14c12" SRC_URI = " \ git://github.com/containers/libpod.git;branch=v4.0;protocol=https \ + file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \ " LICENSE = "Apache-2.0" -- 2.25.1
|
|
[PATCH 2/2] oci-image-tools: Add Upstream-Status to patch 0001
Andrei Gherzan
From: Andrei Gherzan <andrei.gherzan@...>
Signed-off-by: Andrei Gherzan <andrei.gherzan@...> --- .../0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch b/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch index 7e0b2a1..956bb2c 100644 --- a/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch +++ b/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch @@ -8,6 +8,7 @@ build flags from our environemnt. Otherwise, we'll use the host settings for each and end up with a binary that cannot be run on the target. +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Bruce Ashfield <bruce.ashfield@...> --- Makefile | 2 +- -- 2.25.1
|
|
[PATCH 1/2] podman: Fix host contamination
Andrei Gherzan
From: Andrei Gherzan <andrei.gherzan@...>
The project's internal Makefile uses BUILDFLAGS variable to pass arguments to `go build` while Yocto/OE defines it as GOBUILDFLAGS. Add a patch to align this and avoid using host headers in which case, a musl build will fail similarly to: | [...]ld: /tmp/go-link-3172010154/000015.o: in function `vfprintf': | /usr/include/x86_64-linux-gnu/bits/stdio2.h:130: undefined reference to `__vfprintf_chk' | [...]ld: /tmp/go-link-3172010154/000016.o: in function `fprintf': | /usr/include/x86_64-linux-gnu/bits/stdio2.h:100: undefined reference to `__fprintf_chk' | collect2: error: ld returned 1 exit status Signed-off-by: Andrei Gherzan <andrei.gherzan@...> --- ...01-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch | 125 ++++++++++++++++++ recipes-containers/podman/podman_git.bb | 1 + 2 files changed, 126 insertions(+) create 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 new file mode 100644 index 0000000..13a736e --- /dev/null +++ b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch @@ -0,0 +1,125 @@ +From 3e18f3a4db638a3df48f49aa0a539f8bb048afc9 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei.gherzan@...> +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@...> +--- + Makefile | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index cb230d8e9..538b28d41 100644 +--- a/Makefile ++++ b/Makefile +@@ -69,7 +69,7 @@ PRE_COMMIT = $(shell command -v bin/venv/bin/pre-commit ~/.local/bin/pre-commit + # triggered. + SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print) + +-BUILDFLAGS := -mod=vendor $(BUILDFLAGS) ++GOBUILDFLAGS := -mod=vendor $(GOBUILDFLAGS) + + 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) +@@ -264,11 +264,11 @@ gofmt: ## Verify the source code gofmt + + .PHONY: test/checkseccomp/checkseccomp + test/checkseccomp/checkseccomp: .gopathok $(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: .gopathok $(wildcard test/testvol/*.go) +- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol ++ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol + + .PHONY: volume-plugin-test-image + volume-plugin-test-img: +@@ -276,7 +276,7 @@ volume-plugin-test-img: + + .PHONY: test/goecho/goecho + test/goecho/goecho: .gopathok $(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: .gopathok version/version.go + $(GO) build -o $@ ./test/version/ +@@ -318,7 +318,7 @@ ifeq (,$(findstring systemd,$(BUILDTAGS))) + distro for journald support." + endif + $(GOCMD) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ + -tags "$(BUILDTAGS)" \ + -o $@ ./cmd/podman +@@ -329,14 +329,14 @@ $(SRCBINDIR): + + $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum + $(GOCMD) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ + -tags "${REMOTETAGS}" \ + -o $@ ./cmd/podman + + $(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum + $(GOCMD) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + $(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \ + -tags "${REMOTETAGS}" \ + -o $@ ./cmd/podman +@@ -371,7 +371,7 @@ podman-winpath: .gopathok $(SOURCES) go.mod go.sum + CGO_ENABLED=0 \ + GOOS=windows \ + $(GO) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + -ldflags -H=windowsgui \ + -o bin/windows/winpath.exe \ + ./cmd/winpath +@@ -390,14 +390,14 @@ podman-mac-helper: ## Build podman-mac-helper for macOS + GOOS=darwin \ + GOARCH=$(GOARCH) \ + $(GO) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + -o bin/darwin/podman-mac-helper \ + ./cmd/podman-mac-helper + + bin/rootlessport: .gopathok $(SOURCES) go.mod go.sum + CGO_ENABLED=$(CGO_ENABLED) \ + $(GO) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + -o $@ ./cmd/rootlessport + + .PHONY: rootlessport +@@ -420,7 +420,7 @@ bin/podman.cross.%: .gopathok + GOARCH="$${TARGET##*.}"; \ + CGO_ENABLED=0 \ + $(GO) build \ +- $(BUILDFLAGS) \ ++ $(GOBUILDFLAGS) \ + $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ + -tags '$(BUILDTAGS_CROSS)' \ + -o "$@" ./cmd/podman +@@ -864,7 +864,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal + .PHONY: .install.ginkgo + .install.ginkgo: .gopathok + if [ ! -x "$(GOBIN)/ginkgo" ]; then \ +- $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \ ++ $(GO) install $(GOBUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \ + fi + + .PHONY: .install.gitvalidation +-- +2.25.1 + diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index 913aea8..547bc4e 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb @@ -20,6 +20,7 @@ DEPENDS = " \ SRCREV = "cedbbfa543651a13055a1fe093a4d0a2a28ccdfd" SRC_URI = " \ git://github.com/containers/libpod.git;branch=v4.1;protocol=https \ + file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \ " LICENSE = "Apache-2.0" -- 2.25.1
|
|
[PATCH] runc: Add Upstream-Status to patch 0001
Andrei Gherzan
From: Andrei Gherzan <andrei.gherzan@...>
Signed-off-by: Andrei Gherzan <andrei.gherzan@...> --- ...01-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch index 4d35e58..1186330 100644 --- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch +++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch @@ -4,6 +4,7 @@ Date: Tue, 24 Aug 2021 11:38:23 -0400 Subject: [PATCH] Makefile: respect GOBUILDFLAGS for runc and remove recvtty from static +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Chen Qi <Qi.Chen@...> [bva: refreshed for release 1.0.2] Signed-off-by: Bruce Ashfield <bruce.ashfield@...> -- 2.25.1
|
|
[PATCH] xen/sysvinit: add hvc0 console only if not there already
Bertrand Marquis
The base inittab recipe is creating inittab entries for consoles listed
in SERIAL_CONSOLES. For qemu, this contains "115200,hvc0" so an entry is created in inittab for it. Prevent to create a second entry if hvc0 is present in SERIAL_CONSOLES. On qemuarm, this solves issues with the console when starting on top of Xen as dom0. Signed-off-by: Bertrand Marquis <bertrand.marquis@...> --- recipes-core/sysvinit/sysvinit-inittab_xen.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/recipes-core/sysvinit/sysvinit-inittab_xen.inc b/recipes-cor= e/sysvinit/sysvinit-inittab_xen.inc index 7f92bd1..724f47d 100644 --- a/recipes-core/sysvinit/sysvinit-inittab_xen.inc +++ b/recipes-core/sysvinit/sysvinit-inittab_xen.inc @@ -1,4 +1,10 @@ + + do_install:append() { - echo "" >> ${D}${sysconfdir}/inittab - echo "X0:12345:respawn:${base_sbindir}/getty-wrapper 115= 200 hvc0" >> ${D}${sysconfdir}/inittab + # if SERIAL_CONSOLES contains hvc0, it is already added in inittab s= o do + # not add it twice + if echo "${SERIAL_CONSOLES}" | grep -vq "hvc0"; then + echo "" >> ${D}${sysconfdir}/inittab + echo "X0:12345:respawn:${base_sbindir}/getty-wrapper 115200 hvc0= " >> ${D}${sysconfdir}/inittab + fi } --=20 2.25.1
|
|
Re: [meta-cloud-services][PATCH] python3-arrow: drop python3-backports-functools-lru-cache dependency
Bruce Ashfield
merged.
toggle quoted messageShow quoted text
Bruce In message: [meta-virtualization] [meta-cloud-services][PATCH] python3-arrow: drop python3-backports-functools-lru-cache dependency on 14/06/2022 Jonas Gorski wrote:
python3-backports-functools-lru-cache was recently dropped from
|
|
Re: [meta-cloud-services][PATCH] python3-heat-cfntools: fix typo
Bruce Ashfield
merged.
toggle quoted messageShow quoted text
Bruce In message: [meta-virtualization] [meta-cloud-services][PATCH] python3-heat-cfntools: fix typo on 08/06/2022 Yi Zhao wrote:
Fix typo:
|
|
Re: [master|kirkstone][PATCH 1/2] cloud-init: add rdpends for netifaces and charset-normalizer
Bruce Ashfield
Thanks Jeremy,
toggle quoted messageShow quoted text
All three patches have been merged to master and kirskstone. Bruce In message: [meta-virtualization][master|kirkstone][PATCH 1/2] cloud-init: add rdpends for netifaces and charset-normalizer on 21/06/2022 Jeremy Puhlman wrote:
Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
|
|
Re: K3s service not starting after go-lang version update in poky
Bruce Ashfield
On Mon, Jun 27, 2022 at 6:00 AM Kamil Dzieżyk <Kamil.Dziezyk@...> wrote:
That warning has actually been around for a while. ```I have a 1.24 update already underway. So hopefully things will be sorted out shortly. Bruce
-- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|