1. meta-virtualization@lists.yoctoproject.org
  2. Messages
   Date   
Re: check-layer-nightly failure

Bruce Ashfield
 

On Thu, Jul 7, 2022 at 9:14 AM Alexandre Belloni
<alexandre.belloni@...> wrote:

Hello,

Since python3-colorama got upgraded to 0.4.5 in meta-python,
check-layer-nightly is failing for meta-virtualization:

AssertionError: Adding layer meta-virtualization changed signatures.
23 signatures changed, initial differences (first hash before, second after):
python3-colorama:do_fetch: 0ac42383a6557a119738c7fda6a53a08837ffe2686b34f8fa5c2db83213bfe39 -> e2cfb137b2ed19476cbfba1402316e3433f7f03d1065fc8c74837ff631ff89c4
bitbake-diffsigs --task python3-colorama do_fetch --signature 0ac42383a6557a119738c7fda6a53a08837ffe2686b34f8fa5c2db83213bfe39 e2cfb137b2ed19476cbfba1402316e3433f7f03d1065fc8c74837ff631ff89c4
NOTE: Starting bitbake server...
Task dependencies changed from:
['BPN', 'PN', 'PV', 'PYPI_ARCHIVE_NAME', 'PYPI_PACKAGE', 'PYPI_PACKAGE_EXT', 'PYPI_SRC_URI', 'SPECIAL_PKGSUFFIX', 'SRCREV', 'SRC_URI', 'SRC_URI[sha256sum]', 'base_do_fetch', 'do_fetch[network]', 'pypi_package', 'pypi_src_uri']
to:
['BPN', 'PN', 'PV', 'PYPI_ARCHIVE_NAME', 'PYPI_PACKAGE', 'PYPI_PACKAGE_EXT', 'PYPI_SRC_URI', 'SPECIAL_PKGSUFFIX', 'SRCREV', 'SRC_URI', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]', 'base_do_fetch', 'do_fetch[network]', 'pypi_package', 'pypi_src_uri']
basehash changed from e3e476f44ff3905e371e1451a0e6e301baf5bdfb2f39c4140b75925fb331cd57 to 998a2a96caa4512c9c77acab928aa7246b2e1cecf44e59babf5fa94bcce4a413
List of dependencies for variable SRC_URI changed from '{'SRC_URI[sha256sum]', 'PYPI_SRC_URI'}' to '{'SRC_URI[md5sum]', 'SRC_URI[sha256sum]', 'PYPI_SRC_URI'}'
changed items: {'SRC_URI[md5sum]'}
Dependency on variable SRC_URI[md5sum] was added
Variable PV value changed from '0.4.5' to '0.4.4'
Variable SRC_URI[sha256sum] value changed from 'e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4' to '5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b'
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



--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


--
- 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:

Looks ok to me. I'll give it another day to hear from Christopher, and then
I'll do the merge.
He just did (thanks Christopher), would you mind also pushing this to kirkstone branch ?

Thanks
Bertrand


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
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-core/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 115200 hvc0" >> ${D}${sysconfdir}/inittab
+ # if SERIAL_CONSOLES contains hvc0, it is already added in inittab so 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
}
--
2.25.1
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:

Looks ok to me. I'll give it another day to hear from Christopher, and then
I'll do the merge.
Ack from me - thanks

Christopher


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
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-core/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 115200 hvc0" >> ${D}${sysconfdir}/inittab
+ # if SERIAL_CONSOLES contains hvc0, it is already added in inittab so 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
}
--
2.25.1
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
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
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-core/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 115200 hvc0" >> ${D}${sysconfdir}/inittab
+ # if SERIAL_CONSOLES contains hvc0, it is already added in inittab so 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
}
--
2.25.1
Re: [kirkstone][PATCH 1/3] podman: Fix host contamination

Bruce Ashfield
 

merged to kirkstone.

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@...>

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
Re: [PATCH 1/2] podman: Fix host contamination

Bruce Ashfield
 

merged.

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@...>

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
[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.

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
meta-python with 620689d4efba ("python3-backports-functional-lru-cache:
remove, not needed for Python 3").

Since the functionality it provides is already part of python3, we can
just drop the dependency.

Fixes the following error when trying to build python3-arrow in
kirkstone or newer:

NOTE: Resolving any missing task queue dependencies
ERROR: Nothing RPROVIDES 'python3-backports-functools-lru-cache' (but /home/jonas/poky/meta-cloud-services/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'python3-backports-functools-lru-cache' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['python3-backports-functools-lru-cache']
ERROR: Required build target 'python3-arrow' has no buildable providers.
Missing or unbuildable dependency chain was: ['python3-arrow', 'python3-backports-functools-lru-cache']

Signed-off-by: Jonas Gorski <jonas.gorski@...>
---
I hope this is the right list. As mentioned in the commit message, this
applies to kirkstone and master (but not e.g. honister, since the
dependency still exists there). Patch is based on master.

meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb | 1 -
1 file changed, 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb
index 449063f0b6fb..9ef1d8faa2c4 100644
--- a/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb
@@ -11,5 +11,4 @@ inherit setuptools3 pypi

RDEPENDS:${PN} += " \
${PYTHON_PN}-dateutil \
- ${PYTHON_PN}-backports-functools-lru-cache \
"
--
2.36.1


--
BISDN GmbH
Körnerstraße 7-10
10785 Berlin
Germany


Phone:
+49-30-6108-1-6100


Managing Directors: 
Dr.-Ing. Hagen Woesner, Andreas
Köpsel


Commercial register: 
Amtsgericht Berlin-Charlottenburg HRB 141569
B
VAT ID No: DE283257294
Re: [meta-cloud-services][PATCH] python3-heat-cfntools: fix typo

Bruce Ashfield
 

merged.

Bruce

In message: [meta-virtualization] [meta-cloud-services][PATCH] python3-heat-cfntools: fix typo
on 08/06/2022 Yi Zhao wrote:

Fix typo:
RDPENDS_${PN} -> RDEPENDS:${PN}

Signed-off-by: Yi Zhao <yi.zhao@...>
---
.../recipes-devtools/python/python3-heat-cfntools_1.4.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb b/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb
index 8439daa..a6dee5c 100644
--- a/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb
@@ -18,6 +18,6 @@ DEPENDS += " \
python3-pbr-native \
"

-RDPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
python3-pbr \
"
--
2.25.1
Re: [master|kirkstone][PATCH 1/2] cloud-init: add rdpends for netifaces and charset-normalizer

Bruce Ashfield
 

Thanks Jeremy,

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@...>
---
recipes-extended/cloud-init/cloud-init_21.4.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/recipes-extended/cloud-init/cloud-init_21.4.bb b/recipes-extended/cloud-init/cloud-init_21.4.bb
index c6e64b3..9c2dae7 100644
--- a/recipes-extended/cloud-init/cloud-init_21.4.bb
+++ b/recipes-extended/cloud-init/cloud-init_21.4.bb
@@ -56,6 +56,8 @@ RDEPENDS:${PN} = "python3 \
python3-jsonschema \
python3-pyyaml \
python3-oauthlib \
+ python3-netifaces \
+ python3-charset-normalizer \
bash \
"

--
2.35.3
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:

Hello Bruce,

There is a problem with the k3s service starting when the Yocto image is built with the meta-virtualization master branch.

This issue might be related to the go-lang version(1.18) used to build the k3s.
After this patch was merged: https://git.yoctoproject.org/poky/commit/?id=8dc1f28aa10c775e64b5275679b1f8142e8cd038
a warning pops up during the k3s build:
```
WARNING: k3s-v1.22.6+k3s1+git4262c6b91a43ef8411870f72ff8b8715949f90e2-r0 do_package_qa: QA Issue: k3s: ELF binary /usr/local/bin/k3s has relocations in .text [textrel]
That warning has actually been around for a while.

```
See k3s service start logs here: https://pastebin.com/uXvsjPFu
I have tried a more recent version of k3s 1.22.8 with a small change and this version of the k3s starts successfully.
However, I did not manage to update all k3s build dependency sources from the recipes-container/k3s/src_uri.inc.
I have built the k3s with this change: https://pastebin.com/3QGvcqta

Could you update the k3s recipe on the master branch, to build a more recent version 1.23 or 1.24?
I have a 1.24 update already underway. So hopefully things will be
sorted out shortly.

Bruce


Thanks,

Kamil Dzieżyk

--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
1 - 20 of 7409