* [meta-virtualization][PATCH] lxc: backport fixes to build with glibc 2.43
@ 2026-03-14 7:14 Viswanath Kraleti
2026-03-14 15:17 ` Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: Viswanath Kraleti @ 2026-03-14 7:14 UTC (permalink / raw)
To: meta-virtualization; +Cc: Viswanath Kraleti
Building lxc with glibc 2.43 fails due to stricter header checks and
FORTIFY related validations.
Backport the following upstream fixes to resolve these build failures:
- meson.build: fix open_how include handling for glibc 2.43+
- meson.build: fix openat2 include typo exposed by glibc 2.43 + FORTIFY
Signed-off-by: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com>
---
...fix-open_how-include-with-glibc-2.43.patch | 40 +++++++++++++++++++
...openat2-include-typo-fix-with-glibc-.patch | 29 ++++++++++++++
recipes-containers/lxc/lxc_git.bb | 2 +
3 files changed, 71 insertions(+)
create mode 100644 recipes-containers/lxc/files/0001-meson.build-fix-open_how-include-with-glibc-2.43.patch
create mode 100644 recipes-containers/lxc/files/0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch
diff --git a/recipes-containers/lxc/files/0001-meson.build-fix-open_how-include-with-glibc-2.43.patch b/recipes-containers/lxc/files/0001-meson.build-fix-open_how-include-with-glibc-2.43.patch
new file mode 100644
index 00000000..1b3d4de6
--- /dev/null
+++ b/recipes-containers/lxc/files/0001-meson.build-fix-open_how-include-with-glibc-2.43.patch
@@ -0,0 +1,40 @@
+From 388a511a7070d1ea9c6b8d2d98e6fa9a3efb0e87 Mon Sep 17 00:00:00 2001
+From: Li Lu <1487442471@qq.com>
+Date: Wed, 18 Feb 2026 09:24:26 +0800
+Subject: [PATCH] meson.build: fix open_how include with glibc-2.43+
+
+Signed-off-by: Li Lu <1487442471@qq.com>
+Upstream-Status: Backport [https://github.com/lxc/lxc/commit/5e68a7a633659039d9b114d2b75fdba0df51e52c]
+---
+ meson.build | 1 +
+ src/lxc/open_utils.h | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 31f5472c5..637ee9873 100644
+--- a/meson.build
++++ b/meson.build
+@@ -664,6 +664,7 @@ endforeach
+
+ ## Types.
+ decl_headers = '''
++#include <fcntl.h>
+ #include <uchar.h>
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+diff --git a/src/lxc/open_utils.h b/src/lxc/open_utils.h
+index 7ff5945c7..c9b978dbf 100644
+--- a/src/lxc/open_utils.h
++++ b/src/lxc/open_utils.h
+@@ -25,6 +25,8 @@ struct open_how {
+ __u64 mode;
+ __u64 resolve;
+ };
++#else
++#include <fcntl.h>
+ #endif
+
+ /* how->resolve flags for openat2(2). */
+--
+2.34.1
+
diff --git a/recipes-containers/lxc/files/0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch b/recipes-containers/lxc/files/0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch
new file mode 100644
index 00000000..d84f17c7
--- /dev/null
+++ b/recipes-containers/lxc/files/0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch
@@ -0,0 +1,29 @@
+From 66ca3b2dee22d2d256e74ec55de2e5b0c975037c Mon Sep 17 00:00:00 2001
+From: Joonas Niilola <juippis@gentoo.org>
+Date: Sun, 15 Feb 2026 17:42:39 +0200
+Subject: [PATCH] meson.build: fix openat2 include typo, fix with glibc-2.43
+ +FORTIFY
+
+Closes: https://github.com/lxc/lxc/issues/4641
+Signed-off-by: Joonas Niilola <juippis@gentoo.org>
+Upstream-Status: Backport [https://github.com/lxc/lxc/commit/511e4db8f2a5b47cdd41eef482647492ce5b0f77]
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 637ee9873..a6bb21a94 100644
+--- a/meson.build
++++ b/meson.build
+@@ -557,7 +557,7 @@ foreach ident: [
+ ['move_mount', '''#include <sys/mount.h>'''],
+ ['openat2', '''#include <sys/types.h>
+ #include <sys/stat.h>
+- #include <fctnl.h>'''],
++ #include <fcntl.h>'''],
+ ['open_tree', '''#include <sys/mount.h>'''],
+ ['personality', '''#include <sys/personality.h>'''],
+ ['pidfd_open', '''#include <stdlib.h>
+--
+2.34.1
+
diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
index 04db2ac0..0b6cbb75 100644
--- a/recipes-containers/lxc/lxc_git.bb
+++ b/recipes-containers/lxc/lxc_git.bb
@@ -46,6 +46,8 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-6.0;protocol=https \
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://0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch \
+ file://0001-meson.build-fix-open_how-include-with-glibc-2.43.patch \
file://dnsmasq.conf \
file://lxc-net \
"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-virtualization][PATCH] lxc: backport fixes to build with glibc 2.43
2026-03-14 7:14 [meta-virtualization][PATCH] lxc: backport fixes to build with glibc 2.43 Viswanath Kraleti
@ 2026-03-14 15:17 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2026-03-14 15:17 UTC (permalink / raw)
To: viswanath.kraleti; +Cc: meta-virtualization
Thanks for the patch!
I had an lxc -stable bump in progress, and it has that
fix, so I just pushed it to the top of the queue and it
is in master now.
Bruce
In message: [meta-virtualization][PATCH] lxc: backport fixes to build with glibc 2.43
on 14/03/2026 Viswanath Kraleti via lists.yoctoproject.org wrote:
> Building lxc with glibc 2.43 fails due to stricter header checks and
> FORTIFY related validations.
>
> Backport the following upstream fixes to resolve these build failures:
> - meson.build: fix open_how include handling for glibc 2.43+
> - meson.build: fix openat2 include typo exposed by glibc 2.43 + FORTIFY
>
> Signed-off-by: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com>
> ---
> ...fix-open_how-include-with-glibc-2.43.patch | 40 +++++++++++++++++++
> ...openat2-include-typo-fix-with-glibc-.patch | 29 ++++++++++++++
> recipes-containers/lxc/lxc_git.bb | 2 +
> 3 files changed, 71 insertions(+)
> create mode 100644 recipes-containers/lxc/files/0001-meson.build-fix-open_how-include-with-glibc-2.43.patch
> create mode 100644 recipes-containers/lxc/files/0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch
>
> diff --git a/recipes-containers/lxc/files/0001-meson.build-fix-open_how-include-with-glibc-2.43.patch b/recipes-containers/lxc/files/0001-meson.build-fix-open_how-include-with-glibc-2.43.patch
> new file mode 100644
> index 00000000..1b3d4de6
> --- /dev/null
> +++ b/recipes-containers/lxc/files/0001-meson.build-fix-open_how-include-with-glibc-2.43.patch
> @@ -0,0 +1,40 @@
> +From 388a511a7070d1ea9c6b8d2d98e6fa9a3efb0e87 Mon Sep 17 00:00:00 2001
> +From: Li Lu <1487442471@qq.com>
> +Date: Wed, 18 Feb 2026 09:24:26 +0800
> +Subject: [PATCH] meson.build: fix open_how include with glibc-2.43+
> +
> +Signed-off-by: Li Lu <1487442471@qq.com>
> +Upstream-Status: Backport [https://github.com/lxc/lxc/commit/5e68a7a633659039d9b114d2b75fdba0df51e52c]
> +---
> + meson.build | 1 +
> + src/lxc/open_utils.h | 2 ++
> + 2 files changed, 3 insertions(+)
> +
> +diff --git a/meson.build b/meson.build
> +index 31f5472c5..637ee9873 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -664,6 +664,7 @@ endforeach
> +
> + ## Types.
> + decl_headers = '''
> ++#include <fcntl.h>
> + #include <uchar.h>
> + #include <sys/mount.h>
> + #include <sys/stat.h>
> +diff --git a/src/lxc/open_utils.h b/src/lxc/open_utils.h
> +index 7ff5945c7..c9b978dbf 100644
> +--- a/src/lxc/open_utils.h
> ++++ b/src/lxc/open_utils.h
> +@@ -25,6 +25,8 @@ struct open_how {
> + __u64 mode;
> + __u64 resolve;
> + };
> ++#else
> ++#include <fcntl.h>
> + #endif
> +
> + /* how->resolve flags for openat2(2). */
> +--
> +2.34.1
> +
> diff --git a/recipes-containers/lxc/files/0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch b/recipes-containers/lxc/files/0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch
> new file mode 100644
> index 00000000..d84f17c7
> --- /dev/null
> +++ b/recipes-containers/lxc/files/0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch
> @@ -0,0 +1,29 @@
> +From 66ca3b2dee22d2d256e74ec55de2e5b0c975037c Mon Sep 17 00:00:00 2001
> +From: Joonas Niilola <juippis@gentoo.org>
> +Date: Sun, 15 Feb 2026 17:42:39 +0200
> +Subject: [PATCH] meson.build: fix openat2 include typo, fix with glibc-2.43
> + +FORTIFY
> +
> +Closes: https://github.com/lxc/lxc/issues/4641
> +Signed-off-by: Joonas Niilola <juippis@gentoo.org>
> +Upstream-Status: Backport [https://github.com/lxc/lxc/commit/511e4db8f2a5b47cdd41eef482647492ce5b0f77]
> +---
> + meson.build | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 637ee9873..a6bb21a94 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -557,7 +557,7 @@ foreach ident: [
> + ['move_mount', '''#include <sys/mount.h>'''],
> + ['openat2', '''#include <sys/types.h>
> + #include <sys/stat.h>
> +- #include <fctnl.h>'''],
> ++ #include <fcntl.h>'''],
> + ['open_tree', '''#include <sys/mount.h>'''],
> + ['personality', '''#include <sys/personality.h>'''],
> + ['pidfd_open', '''#include <stdlib.h>
> +--
> +2.34.1
> +
> diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
> index 04db2ac0..0b6cbb75 100644
> --- a/recipes-containers/lxc/lxc_git.bb
> +++ b/recipes-containers/lxc/lxc_git.bb
> @@ -46,6 +46,8 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-6.0;protocol=https \
> 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://0001-meson.build-fix-openat2-include-typo-fix-with-glibc-.patch \
> + file://0001-meson.build-fix-open_how-include-with-glibc-2.43.patch \
> file://dnsmasq.conf \
> file://lxc-net \
> "
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9654): https://lists.yoctoproject.org/g/meta-virtualization/message/9654
> Mute This Topic: https://lists.yoctoproject.org/mt/118310834/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:[~2026-03-14 15:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-14 7:14 [meta-virtualization][PATCH] lxc: backport fixes to build with glibc 2.43 Viswanath Kraleti
2026-03-14 15:17 ` 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.