* [PATCH v2] lxc: Fix build with musl
@ 2025-11-30 3:24 jaeyoon.jung
2025-12-02 4:52 ` [meta-virtualization] " Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: jaeyoon.jung @ 2025-11-30 3:24 UTC (permalink / raw)
To: meta-virtualization; +Cc: Jaeyoon Jung
From: Jaeyoon Jung <jaeyoon.jung@lge.com>
Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
---
...01-build-Check-if-P_PIDFD-is-defined.patch | 56 +++++++++++++++++++
recipes-containers/lxc/lxc_git.bb | 1 +
2 files changed, 57 insertions(+)
create mode 100644 recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
diff --git a/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch b/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
new file mode 100644
index 00000000..b7a2bb05
--- /dev/null
+++ b/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
@@ -0,0 +1,56 @@
+From 4d00d4f8046972907ef34ac5677d07ae39f3aded Mon Sep 17 00:00:00 2001
+From: Jaeyoon Jung <jaeyoon.jung@lge.com>
+Date: Sun, 30 Nov 2025 11:51:13 +0900
+Subject: [PATCH] build: Check if P_PIDFD is defined
+
+It is defined in enum 'idtype_t' in some environment in which causes an
+error like:
+../git/src/lxc/process_utils.h:144:17: error: expected identifier before numeric constant
+ 144 | #define P_PIDFD 3
+ | ^
+
+Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
+Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/4614]
+---
+ meson.build | 11 +++++++++++
+ src/lxc/process_utils.h | 2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ec7524c2..4b3a8f07 100644
+--- a/meson.build
++++ b/meson.build
+@@ -521,6 +521,17 @@ foreach ccattr: [
+ srcconf.set10('HAVE_COMPILER_ATTR_' + ccattr.underscorify().to_upper(), cc.has_function_attribute(ccattr))
+ endforeach
+
++## P_PIDFD
++test_code = '''
++#include <sys/wait.h>
++void func() { siginfo_t s; int r = waitid(P_PIDFD, 0, &s, 0); }
++'''
++if cc.compiles(test_code, name: 'waitid(P_PIDFD, ...)')
++ srcconf.set('HAVE_P_PIDFD', 1)
++ else
++ srcconf.set('HAVE_P_PIDFD', 0)
++endif
++
+ ## Headers.
+ foreach ident: [
+ ['bpf', '''#include <sys/syscall.h>
+diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h
+index effff9bd..f4f53a23 100644
+--- a/src/lxc/process_utils.h
++++ b/src/lxc/process_utils.h
+@@ -139,7 +139,7 @@
+ #endif
+
+ /* waitid */
+-#if !HAVE_SYS_PIDFD_H
++#if !HAVE_P_PIDFD
+ #ifndef P_PIDFD
+ #define P_PIDFD 3
+ #endif
+--
+2.47.2
+
diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
index 2f0e8e74..5d4494a6 100644
--- a/recipes-containers/lxc/lxc_git.bb
+++ b/recipes-containers/lxc/lxc_git.bb
@@ -45,6 +45,7 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-6.0;protocol=https \
file://0001-download-don-t-try-compatbility-index.patch \
file://tests-our-init-is-not-busybox.patch \
file://0001-template-if-busybox-contains-init-use-it-in-containe.patch \
+ file://0001-build-Check-if-P_PIDFD-is-defined.patch \
file://dnsmasq.conf \
file://lxc-net \
"
--
2.47.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-virtualization] [PATCH v2] lxc: Fix build with musl
2025-11-30 3:24 [PATCH v2] lxc: Fix build with musl jaeyoon.jung
@ 2025-12-02 4:52 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2025-12-02 4:52 UTC (permalink / raw)
To: jaeyoon.jung; +Cc: meta-virtualization
staged to master-next.
Bruce
In message: [meta-virtualization] [PATCH v2] lxc: Fix build with musl
on 30/11/2025 Jaeyoon Jung (LGE) via lists.yoctoproject.org wrote:
> From: Jaeyoon Jung <jaeyoon.jung@lge.com>
>
> Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
> ---
> ...01-build-Check-if-P_PIDFD-is-defined.patch | 56 +++++++++++++++++++
> recipes-containers/lxc/lxc_git.bb | 1 +
> 2 files changed, 57 insertions(+)
> create mode 100644 recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
>
> diff --git a/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch b/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
> new file mode 100644
> index 00000000..b7a2bb05
> --- /dev/null
> +++ b/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
> @@ -0,0 +1,56 @@
> +From 4d00d4f8046972907ef34ac5677d07ae39f3aded Mon Sep 17 00:00:00 2001
> +From: Jaeyoon Jung <jaeyoon.jung@lge.com>
> +Date: Sun, 30 Nov 2025 11:51:13 +0900
> +Subject: [PATCH] build: Check if P_PIDFD is defined
> +
> +It is defined in enum 'idtype_t' in some environment in which causes an
> +error like:
> +../git/src/lxc/process_utils.h:144:17: error: expected identifier before numeric constant
> + 144 | #define P_PIDFD 3
> + | ^
> +
> +Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
> +Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/4614]
> +---
> + meson.build | 11 +++++++++++
> + src/lxc/process_utils.h | 2 +-
> + 2 files changed, 12 insertions(+), 1 deletion(-)
> +
> +diff --git a/meson.build b/meson.build
> +index ec7524c2..4b3a8f07 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -521,6 +521,17 @@ foreach ccattr: [
> + srcconf.set10('HAVE_COMPILER_ATTR_' + ccattr.underscorify().to_upper(), cc.has_function_attribute(ccattr))
> + endforeach
> +
> ++## P_PIDFD
> ++test_code = '''
> ++#include <sys/wait.h>
> ++void func() { siginfo_t s; int r = waitid(P_PIDFD, 0, &s, 0); }
> ++'''
> ++if cc.compiles(test_code, name: 'waitid(P_PIDFD, ...)')
> ++ srcconf.set('HAVE_P_PIDFD', 1)
> ++ else
> ++ srcconf.set('HAVE_P_PIDFD', 0)
> ++endif
> ++
> + ## Headers.
> + foreach ident: [
> + ['bpf', '''#include <sys/syscall.h>
> +diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h
> +index effff9bd..f4f53a23 100644
> +--- a/src/lxc/process_utils.h
> ++++ b/src/lxc/process_utils.h
> +@@ -139,7 +139,7 @@
> + #endif
> +
> + /* waitid */
> +-#if !HAVE_SYS_PIDFD_H
> ++#if !HAVE_P_PIDFD
> + #ifndef P_PIDFD
> + #define P_PIDFD 3
> + #endif
> +--
> +2.47.2
> +
> diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
> index 2f0e8e74..5d4494a6 100644
> --- a/recipes-containers/lxc/lxc_git.bb
> +++ b/recipes-containers/lxc/lxc_git.bb
> @@ -45,6 +45,7 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-6.0;protocol=https \
> file://0001-download-don-t-try-compatbility-index.patch \
> file://tests-our-init-is-not-busybox.patch \
> file://0001-template-if-busybox-contains-init-use-it-in-containe.patch \
> + file://0001-build-Check-if-P_PIDFD-is-defined.patch \
> file://dnsmasq.conf \
> file://lxc-net \
> "
> --
> 2.47.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9464): https://lists.yoctoproject.org/g/meta-virtualization/message/9464
> Mute This Topic: https://lists.yoctoproject.org/mt/116535047/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-12-02 4:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-30 3:24 [PATCH v2] lxc: Fix build with musl jaeyoon.jung
2025-12-02 4:52 ` [meta-virtualization] " Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.