* [meta-virtualization][PATCH V2 2/3] libvirt: add json-c for driver_qemu
2025-02-10 7:46 [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed Hongxu Jia
@ 2025-02-10 7:46 ` Hongxu Jia
2025-02-10 7:47 ` [meta-virtualization][PATCH V2 3/3] libvirt: fix installed-vs-shipped QA error Hongxu Jia
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Hongxu Jia @ 2025-02-10 7:46 UTC (permalink / raw)
To: meta-virtualization
After upstreamm applied commit [meson: switch checks to depend on json-c as well
as yajl][1], json-c is required to build QEMU driver.
Using latest poky + meta-virtualization + meta-openembedded on master branch,
build libvirt failed at do_configure
$ bitbake libvirt
...
../git/meson.build:1672:6: ERROR: Problem encountered: json-c is required to build QEMU driver
...
[1] https://github.com/libvirt/libvirt/commit/28c987263980afc5b606a36a8d264b68cb01e9b9
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
recipes-extended/libvirt/libvirt_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
index 432b5da8..6a524977 100644
--- a/recipes-extended/libvirt/libvirt_git.bb
+++ b/recipes-extended/libvirt/libvirt_git.bb
@@ -149,7 +149,7 @@ PACKAGECONFIG:remove:armeb = "numactl"
# enable,disable,depends,rdepends
#
PACKAGECONFIG[gnutls] = ",,,gnutls-bin"
-PACKAGECONFIG[qemu] = "-Ddriver_qemu=enabled -Dqemu_user=qemu -Dqemu_group=qemu,-Ddriver_qemu=disabled,qemu,"
+PACKAGECONFIG[qemu] = "-Ddriver_qemu=enabled -Dqemu_user=qemu -Dqemu_group=qemu,-Ddriver_qemu=disabled,qemu json-c,"
PACKAGECONFIG[libxl] = "-Ddriver_libxl=enabled,-Ddriver_libxl=disabled,xen,"
PACKAGECONFIG[openvz] = "-Ddriver_openvz=enabled,-Ddriver_openvz=disabled,,"
PACKAGECONFIG[vmware] = "-Ddriver_vmware=enabled,-Ddriver_vmware=disabled,,"
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta-virtualization][PATCH V2 3/3] libvirt: fix installed-vs-shipped QA error
2025-02-10 7:46 [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed Hongxu Jia
2025-02-10 7:46 ` [meta-virtualization][PATCH V2 2/3] libvirt: add json-c for driver_qemu Hongxu Jia
@ 2025-02-10 7:47 ` Hongxu Jia
2025-02-10 18:30 ` [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed Bruce Ashfield
2025-02-18 19:35 ` Bruce Ashfield
3 siblings, 0 replies; 6+ messages in thread
From: Hongxu Jia @ 2025-02-10 7:47 UTC (permalink / raw)
To: meta-virtualization
In commit [1], it created an empty file libvirt-qemu.conf to solve the issue
of gid mismatch. In commit [2], upstream add sysusers config file for qemu
& kvm user/groups
Remove the one of upstream to fix conflict and QA error while usrmerge not in
DISTRO_FEATURES
...
ERROR: QA Issue: libvirt: Files/directories were installed but not shipped in any package:
/usr/lib/sysusers.d
/usr/lib/sysusers.d/libvirt-qemu.conf
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
libvirt: 2 installed and not shipped files. [installed-vs-shipped]
...
[1] https://git.yoctoproject.org/meta-virtualization/commit/?id=8138d9cc7e0c31171230110db0cfa881c46a821b
[2] https://github.com/libvirt/libvirt/commit/a2c3e390f7bedf36f4ddc544d09fe3b8772c5c6f
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...ysusers-config-file-for-qemu-kvm-use.patch | 37 +++++++++++++++++++
recipes-extended/libvirt/libvirt_git.bb | 1 +
2 files changed, 38 insertions(+)
create mode 100644 recipes-extended/libvirt/libvirt/0001-do-not-install-sysusers-config-file-for-qemu-kvm-use.patch
diff --git a/recipes-extended/libvirt/libvirt/0001-do-not-install-sysusers-config-file-for-qemu-kvm-use.patch b/recipes-extended/libvirt/libvirt/0001-do-not-install-sysusers-config-file-for-qemu-kvm-use.patch
new file mode 100644
index 00000000..8f771d5a
--- /dev/null
+++ b/recipes-extended/libvirt/libvirt/0001-do-not-install-sysusers-config-file-for-qemu-kvm-use.patch
@@ -0,0 +1,37 @@
+From 077d8bbb7e6697121179bdfaf9499d45cd2a8c6d Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Mon, 10 Feb 2025 15:23:58 +0800
+Subject: [PATCH] do not install sysusers config file for qemu & kvm
+ user/groups
+
+Yocto has define its own sysusers config file for qemu & kvm user/groups,
+remove the one from upstream to avoid conflict
+
+Upstream-Status: Inappropriate [Yocto specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ src/qemu/meson.build | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/qemu/meson.build b/src/qemu/meson.build
+index 43a8ad7c3b..97d988881f 100644
+--- a/src/qemu/meson.build
++++ b/src/qemu/meson.build
+@@ -161,13 +161,6 @@ if conf.has('WITH_QEMU')
+ configuration: qemu_user_group_hack_conf,
+ )
+
+- # Install the sysuser config for the qemu driver
+- install_data(
+- 'libvirt-qemu.sysusers.conf',
+- install_dir: sysusersdir,
+- rename: [ 'libvirt-qemu.conf' ],
+- )
+-
+ virt_conf_files += qemu_conf
+ virt_aug_files += files('libvirtd_qemu.aug')
+ virt_test_aug_files += {
+--
+2.34.1
+
diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
index 6a524977..a1ae7f69 100644
--- a/recipes-extended/libvirt/libvirt_git.bb
+++ b/recipes-extended/libvirt/libvirt_git.bb
@@ -41,6 +41,7 @@ SRC_URI = "gitsm://github.com/libvirt/libvirt.git;name=libvirt;protocol=https;br
file://0001-meson.build-clear-abs_top_builddir-to-avoid-QA-warni.patch \
file://0001-tests-meson-clear-absolute-directory-paths.patch \
file://0001-qemu_nbdkit.c-use-llu-to-print-time_t.patch \
+ file://0001-do-not-install-sysusers-config-file-for-qemu-kvm-use.patch \
"
S = "${WORKDIR}/git"
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed
2025-02-10 7:46 [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed Hongxu Jia
2025-02-10 7:46 ` [meta-virtualization][PATCH V2 2/3] libvirt: add json-c for driver_qemu Hongxu Jia
2025-02-10 7:47 ` [meta-virtualization][PATCH V2 3/3] libvirt: fix installed-vs-shipped QA error Hongxu Jia
@ 2025-02-10 18:30 ` Bruce Ashfield
2025-02-12 2:14 ` Hongxu Jia
2025-02-18 19:35 ` Bruce Ashfield
3 siblings, 1 reply; 6+ messages in thread
From: Bruce Ashfield @ 2025-02-10 18:30 UTC (permalink / raw)
To: hongxu.jia; +Cc: meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 4655 bytes --]
On Mon, Feb 10, 2025 at 2:47 AM hongxu via lists.yoctoproject.org
<hongxu.jia=eng.windriver.com@lists.yoctoproject.org> wrote:
> Using latest poky + meta-virtualization + meta-openembedded, build multlib
> failed
>
> ...local.conf...
> MACHINE = "qemux86-64"
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
>
Aha. In my experience, the entire stack doesn't function all that well on
32 bit.
Have you confirmed the runtime management of containers on 32bit ? (I'd
prefer to depreciate it and just support 64 bit arches).
Bruce
>
> $ bitbake lib32-nerdctl
> ...
> -buildmode=pie requires external (cgo) linking, but cgo is not enabled
> make: *** [Makefile:63: nerdctl] Error 1
> ...
>
> Get back the patch to allow external specification of build settings and
> rebase to v2.0.2
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> ...xternal-specification-of-build-setti.patch | 28 +++++++++++--------
> recipes-containers/nerdctl/nerdctl_git.bb | 1 +
> 2 files changed, 18 insertions(+), 11 deletions(-)
>
> diff --git
> a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> index ca7b3042..cf7037f3 100644
> ---
> a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> +++
> b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> @@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: allow external specification
> of build settings
> Upstream-Status: Inappropriate [embedded specific]
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> +
> +Rebase to v2.0.2
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> - Makefile | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> + src/import/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
> -Index: nerdctl-v2.0.0-beta.1/src/import/Makefile
> -===================================================================
> ---- nerdctl-v2.0.0-beta.1.orig/src/import/Makefile
> -+++ nerdctl-v2.0.0-beta.1/src/import/Makefile
> -@@ -38,7 +38,7 @@
> +diff --git a/src/import/Makefile b/src/import/Makefile
> +index ae4e18c..eb22f9f 100644
> +--- a/src/import/Makefile
> ++++ b/src/import/Makefile
> +@@ -45,7 +45,7 @@ endif
>
> GO_BUILD_LDFLAGS ?= -s -w
> GO_BUILD_FLAGS ?=
> --export GO_BUILD=GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) $(GO) build
> -ldflags "$(GO_BUILD_LDFLAGS) -X $(PACKAGE)/pkg/version.Version=$(VERSION)
> -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> -+export GO_BUILD=$(GO) build -ldflags "$(GO_BUILD_LDFLAGS) -X
> $(PACKAGE)/pkg/version.Version=$(VERSION) -X
> $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> +-export GO_BUILD=CGO_ENABLED=0 GOOS=$(GOOS) $(GO) -C $(MAKEFILE_DIR)
> build -ldflags "$(GO_BUILD_LDFLAGS) $(VERBOSE_FLAG) -X
> $(PACKAGE)/pkg/version.Version=$(VERSION) -X
> $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> ++export GO_BUILD=GOOS=$(GOOS) $(GO) -C $(MAKEFILE_DIR) build -ldflags
> "$(GO_BUILD_LDFLAGS) $(VERBOSE_FLAG) -X
> $(PACKAGE)/pkg/version.Version=$(VERSION) -X
> $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> +
> + recursive_wildcard=$(wildcard $1$2) $(foreach e,$(wildcard $1*),$(call
> recursive_wildcard,$e/,$2))
>
> - ifdef VERBOSE
> - VERBOSE_FLAG := -v
> +--
> +2.34.1
> +
> diff --git a/recipes-containers/nerdctl/nerdctl_git.bb
> b/recipes-containers/nerdctl/nerdctl_git.bb
> index 63b96846..84734c9f 100644
> --- a/recipes-containers/nerdctl/nerdctl_git.bb
> +++ b/recipes-containers/nerdctl/nerdctl_git.bb
> @@ -19,6 +19,7 @@ include src_uri.inc
>
> # patches and config
> SRC_URI += " \
> +
> file://0001-Makefile-allow-external-specification-of-build-setti.patch \
> file://modules.txt \
> "
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9131):
> https://lists.yoctoproject.org/g/meta-virtualization/message/9131
> Mute This Topic: https://lists.yoctoproject.org/mt/111098600/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [
> bruce.ashfield@gmail.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
[-- Attachment #2: Type: text/html, Size: 6973 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed
2025-02-10 18:30 ` [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed Bruce Ashfield
@ 2025-02-12 2:14 ` Hongxu Jia
0 siblings, 0 replies; 6+ messages in thread
From: Hongxu Jia @ 2025-02-12 2:14 UTC (permalink / raw)
To: Bruce Ashfield, hongxu.jia; +Cc: meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 7343 bytes --]
On 2/11/25 02:30, Bruce Ashfield wrote:
> **
> *CAUTION: This email comes from a non Wind River email account!*
> Do not click links or open attachments unless you recognize the sender
> and know the content is safe.
>
>
> On Mon, Feb 10, 2025 at 2:47 AM hongxu via lists.yoctoproject.org
> <https://urldefense.com/v3/__http://lists.yoctoproject.org__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgQw-HzB_$>
> <hongxu.jia=eng.windriver.com@lists.yoctoproject.org> wrote:
>
> Using latest poky + meta-virtualization + meta-openembedded, build
> multlib failed
>
> ...local.conf...
> MACHINE = "qemux86-64"
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
>
>
> Aha. In my experience, the entire stack doesn't function all that well
> on 32 bit.
>
> Have you confirmed the runtime management of containers on 32bit ?
> (I'd prefer to depreciate it and just support 64 bit arches).
>
No, but it also failed on beaglebone-yocto build which is 32bit arm
//Hongxu
> Bruce
>
>
> $ bitbake lib32-nerdctl
> ...
> -buildmode=pie requires external (cgo) linking, but cgo is not enabled
> make: *** [Makefile:63: nerdctl] Error 1
> ...
>
> Get back the patch to allow external specification of build
> settings and rebase to v2.0.2
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> ...xternal-specification-of-build-setti.patch | 28
> +++++++++++--------
> recipes-containers/nerdctl/nerdctl_git.bb
> <https://urldefense.com/v3/__http://nerdctl_git.bb__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgZbIXqdf$>
> | 1 +
> 2 files changed, 18 insertions(+), 11 deletions(-)
>
> diff --git
> a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> index ca7b3042..cf7037f3 100644
> ---
> a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> +++
> b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> @@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: allow external
> specification of build settings
> Upstream-Status: Inappropriate [embedded specific]
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> +
> +Rebase to v2.0.2
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> - Makefile | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> + src/import/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
> -Index: nerdctl-v2.0.0-beta.1/src/import/Makefile
> -===================================================================
> ---- nerdctl-v2.0.0-beta.1.orig/src/import/Makefile
> -+++ nerdctl-v2.0.0-beta.1/src/import/Makefile
> -@@ -38,7 +38,7 @@
> +diff --git a/src/import/Makefile b/src/import/Makefile
> +index ae4e18c..eb22f9f 100644
> +--- a/src/import/Makefile
> ++++ b/src/import/Makefile
> +@@ -45,7 +45,7 @@ endif
>
> GO_BUILD_LDFLAGS ?= -s -w
> GO_BUILD_FLAGS ?=
> --export GO_BUILD=GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) $(GO)
> build -ldflags "$(GO_BUILD_LDFLAGS) -X
> $(PACKAGE)/pkg/version.Version=$(VERSION) -X
> $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> -+export GO_BUILD=$(GO) build -ldflags "$(GO_BUILD_LDFLAGS) -X
> $(PACKAGE)/pkg/version.Version=$(VERSION) -X
> $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> +-export GO_BUILD=CGO_ENABLED=0 GOOS=$(GOOS) $(GO) -C
> $(MAKEFILE_DIR) build -ldflags "$(GO_BUILD_LDFLAGS)
> $(VERBOSE_FLAG) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X
> $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> ++export GO_BUILD=GOOS=$(GOOS) $(GO) -C $(MAKEFILE_DIR) build
> -ldflags "$(GO_BUILD_LDFLAGS) $(VERBOSE_FLAG) -X
> $(PACKAGE)/pkg/version.Version=$(VERSION) -X
> $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> +
> + recursive_wildcard=$(wildcard $1$2) $(foreach e,$(wildcard
> $1*),$(call recursive_wildcard,$e/,$2))
>
> - ifdef VERBOSE
> - VERBOSE_FLAG := -v
> +--
> +2.34.1
> +
> diff --git a/recipes-containers/nerdctl/nerdctl_git.bb
> <https://urldefense.com/v3/__http://nerdctl_git.bb__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgZbIXqdf$>
> b/recipes-containers/nerdctl/nerdctl_git.bb
> <https://urldefense.com/v3/__http://nerdctl_git.bb__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgZbIXqdf$>
> index 63b96846..84734c9f 100644
> --- a/recipes-containers/nerdctl/nerdctl_git.bb
> <https://urldefense.com/v3/__http://nerdctl_git.bb__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgZbIXqdf$>
> +++ b/recipes-containers/nerdctl/nerdctl_git.bb
> <https://urldefense.com/v3/__http://nerdctl_git.bb__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgZbIXqdf$>
> @@ -19,6 +19,7 @@ include src_uri.inc
> <https://urldefense.com/v3/__http://src_uri.inc__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgUTSe_z1$>
>
> # patches and config
> SRC_URI += " \
> +
> file://0001-Makefile-allow-external-specification-of-build-setti.patch
> \
> file://modules.txt \
> "
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9131):
> https://lists.yoctoproject.org/g/meta-virtualization/message/9131
> <https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-virtualization/message/9131__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgRASzqh2$>
> Mute This Topic:
> https://lists.yoctoproject.org/mt/111098600/1050810
> <https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/111098600/1050810__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgQMaaRQI$>
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> <mailto:meta-virtualization%2Bowner@lists.yoctoproject.org>
> Unsubscribe:
> https://lists.yoctoproject.org/g/meta-virtualization/unsub
> <https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-virtualization/unsub__;!!AjveYdw8EvQ!Z_MA5tmBr1b3nH-d4fMpgXg69kLMDY2Dxb2OLMyVI-zbZqb8CFnbjwY3cBUnZxPYNjW4QCxEKoFJ2BixUSGPsW8jgZGeqNJW$>
> [bruce.ashfield@gmail.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
>
[-- Attachment #2: Type: text/html, Size: 13059 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed
2025-02-10 7:46 [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed Hongxu Jia
` (2 preceding siblings ...)
2025-02-10 18:30 ` [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed Bruce Ashfield
@ 2025-02-18 19:35 ` Bruce Ashfield
3 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2025-02-18 19:35 UTC (permalink / raw)
To: hongxu.jia; +Cc: meta-virtualization
I'm not quite ready to remove support for all 32bit arches, so
this is now staged on master-next.
Bruce
In message: [meta-virtualization][PATCH V2 1/3] nerdctl: fix do_compile failed
on 10/02/2025 hongxu via lists.yoctoproject.org wrote:
> Using latest poky + meta-virtualization + meta-openembedded, build multlib failed
>
> ...local.conf...
> MACHINE = "qemux86-64"
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
>
> $ bitbake lib32-nerdctl
> ...
> -buildmode=pie requires external (cgo) linking, but cgo is not enabled
> make: *** [Makefile:63: nerdctl] Error 1
> ...
>
> Get back the patch to allow external specification of build settings and rebase to v2.0.2
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> ...xternal-specification-of-build-setti.patch | 28 +++++++++++--------
> recipes-containers/nerdctl/nerdctl_git.bb | 1 +
> 2 files changed, 18 insertions(+), 11 deletions(-)
>
> diff --git a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> index ca7b3042..cf7037f3 100644
> --- a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> +++ b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch
> @@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: allow external specification of build settings
> Upstream-Status: Inappropriate [embedded specific]
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> +
> +Rebase to v2.0.2
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> - Makefile | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> + src/import/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
> -Index: nerdctl-v2.0.0-beta.1/src/import/Makefile
> -===================================================================
> ---- nerdctl-v2.0.0-beta.1.orig/src/import/Makefile
> -+++ nerdctl-v2.0.0-beta.1/src/import/Makefile
> -@@ -38,7 +38,7 @@
> +diff --git a/src/import/Makefile b/src/import/Makefile
> +index ae4e18c..eb22f9f 100644
> +--- a/src/import/Makefile
> ++++ b/src/import/Makefile
> +@@ -45,7 +45,7 @@ endif
>
> GO_BUILD_LDFLAGS ?= -s -w
> GO_BUILD_FLAGS ?=
> --export GO_BUILD=GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) $(GO) build -ldflags "$(GO_BUILD_LDFLAGS) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> -+export GO_BUILD=$(GO) build -ldflags "$(GO_BUILD_LDFLAGS) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> +-export GO_BUILD=CGO_ENABLED=0 GOOS=$(GOOS) $(GO) -C $(MAKEFILE_DIR) build -ldflags "$(GO_BUILD_LDFLAGS) $(VERBOSE_FLAG) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> ++export GO_BUILD=GOOS=$(GOOS) $(GO) -C $(MAKEFILE_DIR) build -ldflags "$(GO_BUILD_LDFLAGS) $(VERBOSE_FLAG) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
> +
> + recursive_wildcard=$(wildcard $1$2) $(foreach e,$(wildcard $1*),$(call recursive_wildcard,$e/,$2))
>
> - ifdef VERBOSE
> - VERBOSE_FLAG := -v
> +--
> +2.34.1
> +
> diff --git a/recipes-containers/nerdctl/nerdctl_git.bb b/recipes-containers/nerdctl/nerdctl_git.bb
> index 63b96846..84734c9f 100644
> --- a/recipes-containers/nerdctl/nerdctl_git.bb
> +++ b/recipes-containers/nerdctl/nerdctl_git.bb
> @@ -19,6 +19,7 @@ include src_uri.inc
>
> # patches and config
> SRC_URI += " \
> + file://0001-Makefile-allow-external-specification-of-build-setti.patch \
> file://modules.txt \
> "
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9131): https://lists.yoctoproject.org/g/meta-virtualization/message/9131
> Mute This Topic: https://lists.yoctoproject.org/mt/111098600/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] 6+ messages in thread