summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2026-03-14 14:36:56 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2026-03-14 15:15:18 +0000
commit8e609e0165302bb49a56c48d861260480c2d6cf3 (patch)
tree80c69a0036001489e94a4a1cdd9e48ec7cf88fca
parenta707a4977254636e25a2e3356f12e2b8488e55ff (diff)
downloadmeta-virtualization-8e609e0165302bb49a56c48d861260480c2d6cf3.tar.gz
lxc: update to v6.0.6
This fixes the build with recent glibc and picks up the following fixes: 2597434ae Release LXC 6.0.6 d128f134d cmd/lxc-user-nic: prevent OOB read in name_is_in_groupnames c43aeaaed lxc/network: define netlink uAPI constants for link properties 42b43b31c lxc/network: save/restore physical network interfaces altnames 810f44ba0 lxc/network: optimize netdev_get_mtu 5e68a7a63 meson.build: fix open_how include with glibc-2.43+ 540f9e2bc meson.build: fix openat2 include typo, fix with glibc-2.43 +FORTIFY 01b9e35a7 lxc: added support OpenRC init system 885496ccc src/confile: fix values of lxc.cap.keep and lxc.cap.drop 99c3206c7 tests/lxc-attach: ensure no data corruption happens during heavy IO on pts b964611b3 lxc/{terminal, file_utils}: ensure complete data writes in ptx/peer io handlers d6ccb9abe github: test io_uring-based event loop 0448c9dd2 build: update Makefile and meson.build aa4212023 Improve the dbus scope creation error handling f9e73517e cgfsng: fix reboots when using dbus 2072ea4c7 copy_rdepends: Don't fail on missing source file c7eac1180 start: Respect lxc.init.groups also in new user namespace 8ed8145d6 start: Remove outdated comment about group dropping e9921c3d7 build(deps): bump actions/upload-artifact from 5 to 6 97a2e4af5 Added documentation on unprivileged LXC containers 59a30025e added doc for --rbduser 54d323a2d added "--rbduser" option in "lxc-create -B rbd" a262afb5d Fallback to XDG_RUNTIME_DIR when /run not found d7068a338 checkonfig: Fixed compatible with toybox/gunzip 4cc343edf Initial changes without testing bdce7a634 Enumerated all values in array edc57196f meson: add meson option for running doxygen in build 058be42aa build: Check if P_PIDFD is defined 099089971 Ensure do_lxcapi_unfreeze returns false when getstate errors f9ff9ea2a build(deps): bump actions/checkout from 5 to 6 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch56
-rw-r--r--recipes-containers/lxc/lxc_git.bb5
2 files changed, 2 insertions, 59 deletions
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
deleted file mode 100644
index b7a2bb05..00000000
--- a/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 4d00d4f8046972907ef34ac5677d07ae39f3aded Mon Sep 17 00:00:00 2001
2From: Jaeyoon Jung <jaeyoon.jung@lge.com>
3Date: Sun, 30 Nov 2025 11:51:13 +0900
4Subject: [PATCH] build: Check if P_PIDFD is defined
5
6It is defined in enum 'idtype_t' in some environment in which causes an
7error like:
8../git/src/lxc/process_utils.h:144:17: error: expected identifier before numeric constant
9 144 | #define P_PIDFD 3
10 | ^
11
12Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
13Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/4614]
14---
15 meson.build | 11 +++++++++++
16 src/lxc/process_utils.h | 2 +-
17 2 files changed, 12 insertions(+), 1 deletion(-)
18
19diff --git a/meson.build b/meson.build
20index ec7524c2..4b3a8f07 100644
21--- a/meson.build
22+++ b/meson.build
23@@ -521,6 +521,17 @@ foreach ccattr: [
24 srcconf.set10('HAVE_COMPILER_ATTR_' + ccattr.underscorify().to_upper(), cc.has_function_attribute(ccattr))
25 endforeach
26
27+## P_PIDFD
28+test_code = '''
29+#include <sys/wait.h>
30+void func() { siginfo_t s; int r = waitid(P_PIDFD, 0, &s, 0); }
31+'''
32+if cc.compiles(test_code, name: 'waitid(P_PIDFD, ...)')
33+ srcconf.set('HAVE_P_PIDFD', 1)
34+ else
35+ srcconf.set('HAVE_P_PIDFD', 0)
36+endif
37+
38 ## Headers.
39 foreach ident: [
40 ['bpf', '''#include <sys/syscall.h>
41diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h
42index effff9bd..f4f53a23 100644
43--- a/src/lxc/process_utils.h
44+++ b/src/lxc/process_utils.h
45@@ -139,7 +139,7 @@
46 #endif
47
48 /* waitid */
49-#if !HAVE_SYS_PIDFD_H
50+#if !HAVE_P_PIDFD
51 #ifndef P_PIDFD
52 #define P_PIDFD 3
53 #endif
54--
552.47.2
56
diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
index 04db2ac0..f08d793d 100644
--- a/recipes-containers/lxc/lxc_git.bb
+++ b/recipes-containers/lxc/lxc_git.bb
@@ -45,13 +45,12 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-6.0;protocol=https \
45 file://0001-download-don-t-try-compatbility-index.patch \ 45 file://0001-download-don-t-try-compatbility-index.patch \
46 file://tests-our-init-is-not-busybox.patch \ 46 file://tests-our-init-is-not-busybox.patch \
47 file://0001-template-if-busybox-contains-init-use-it-in-containe.patch \ 47 file://0001-template-if-busybox-contains-init-use-it-in-containe.patch \
48 file://0001-build-Check-if-P_PIDFD-is-defined.patch \
49 file://dnsmasq.conf \ 48 file://dnsmasq.conf \
50 file://lxc-net \ 49 file://lxc-net \
51 " 50 "
52 51
53SRCREV = "f9ff9ea2a92653a823edf25e8e28c9dab08b3090" 52SRCREV = "2597434ae2472114c70ad2bdf4ae5580c9e22717"
54PV = "v6.0.5" 53PV = "6.0.6"
55 54
56# Let's not configure for the host distro. 55# Let's not configure for the host distro.
57# 56#