package/lxc: bump to version 5.0.1
PATCH v2 1/1 package/lxc: bump to version 5.0.1
LXC 5.0 will be supported until June 2027 and our current LTS release, LXC 4.0 will now switch to a slower maintenance pace, only getting critical bugfixes and security updates.
We strongly recommend all LXC users to plan an upgrade to the 5.0 branch.
- Switch to meson-package
- Add an upstream patch to fix the following build failure with glibc 2.36 (unfortunately upstream doesn't plan to fix this for 4.x:
https://github.com/lxc/lxc/issues/4183 and patch is only working with meson, not autotools)
https://discuss.linuxcontainers.org/t/lxc-5-0-lts-has-been-released
https://discuss.linuxcontainers.org/t/lxc-5-0-1-has-been-released
Fixes:
- http://autobuild.buildroot.org/results/f77e2dc44c9a224f280e08089a890e85c302274f
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Rebase patch so it applies cleanly on master
...-where-struct-mount_attr-is-declared.patch | 186 ++++++++++++++++++ package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 36 ++-- 3 files changed, 204 insertions(+), 20 deletions(-) create mode 100644 package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch
package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch new file +186 -0
@@ -0,0 +1,186 @@ +From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 +From: Christian Brauner <[email protected]> +Date: Tue, 9 Aug 2022 16:14:25 +0200 +Subject: [PATCH] build: detect where struct mount_attr is declared + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) <[email protected]> +[Retrieved from: +https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + meson.build | 30 ++++++++++++++++++++++++++++-- + src/lxc/conf.c | 6 +++--- + src/lxc/conf.h | 2 +- + src/lxc/mount_utils.c | 6 +++--- + src/lxc/syscall_wrappers.h | 12 ++++++++++-- + 5 files changed, 45 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index a145faf069..f679aabbc8 100644 +--- a/meson.build ++++ b/meson.build +@@ -590,7 +590,6 @@ decl_headers = ''' + foreach decl: [ + '__aligned_u64', + 'struct clone_args', +- 'struct mount_attr', + 'struct open_how', + 'struct rtnl_link_stats64', + ] +@@ -610,7 +609,6 @@ foreach tuple: [ + ['struct seccomp_notif_sizes'], + ['struct clone_args'], + ['__aligned_u64'], +- ['struct mount_attr'], + ['struct open_how'], + ['struct rtnl_link_stats64'], + ] +@@ -630,6 +628,34 @@ foreach tuple: [ + endif + endforeach + ++## Types. ++decl_headers = ''' ++#include <sys/mount.h> ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (sys/mount.h)' ++else ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (sys/mount.h)' ++endif ++ ++## Types. ++decl_headers = ''' ++#include <linux/mount.h> ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (linux/mount.h)' ++else ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (linux/mount.h)' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include <sys/syscall.h> +diff --git a/src/lxc/conf.c b/src/lxc/conf.c +index ffbe74c2f6..4193cd07f5 100644 +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) + struct lxc_mount_options opts = {}; + int dfd_from; + const char *source_relative, *target_relative; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + + ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); + if (ret < 0) +@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) + + /* Set propagation mount options. */ + if (opts.attr.propagation) { +- attr = (struct lxc_mount_attr) { ++ attr = (struct mount_attr) { + .propagation = opts.attr.propagation, + }; + +@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler) + + for (;;) { + __do_close int fd_from = -EBADF, fd_userns = -EBADF; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + struct lxc_mount_options opts = {}; + ssize_t ret; + +diff --git a/src/lxc/conf.h b/src/lxc/conf.h +index 7dc2f15b60..772479f9e1 100644 +--- a/src/lxc/conf.h ++++ b/src/lxc/conf.h +@@ -223,7 +223,7 @@ struct lxc_mount_options { + unsigned long mnt_flags; + unsigned long prop_flags; + char *data; +- struct lxc_mount_attr attr; ++ struct mount_attr attr; + char *raw_options; + }; + +diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c +index bba75f933c..88dd73ee36 100644 +--- a/src/lxc/mount_utils.c ++++ b/src/lxc/mount_utils.c +@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); + * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the + * @attr_clr field. + */ +-static inline void set_atime(struct lxc_mount_attr *attr) ++static inline void set_atime(struct mount_attr *attr) + { + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: +@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd, + { + __do_close int fd_tree_from = -EBADF; + unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = MOUNT_ATTR_IDMAP | attr_set, + .attr_clr = attr_clr, + .userns_fd = userns_fd, +@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from, + __u64 attr_clr, __u64 propagation, int userns_fd, + bool recursive) + { +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = attr_set, + .attr_clr = attr_clr, + .propagation = propagation, +diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h +index a5e98b565c..c8a7d0c7b7 100644 +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -18,6 +18,12 @@ + #include "macro.h" + #include "syscall_numbers.h" + ++#if HAVE_STRUCT_MOUNT_ATTR ++#include <sys/mount.h> ++#elif HAVE_UAPI_STRUCT_MOUNT_ATTR ++#include <linux/mount.h> ++#endif ++ + #ifdef HAVE_LINUX_MEMFD_H + #include <linux/memfd.h> + #endif +@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags); + /* + * mount_setattr() + */ +-struct lxc_mount_attr { ++#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR ++struct mount_attr { + __u64 attr_set; + __u64 attr_clr; + __u64 propagation; + __u64 userns_fd; + }; ++#endif + + #if !HAVE_MOUNT_SETATTR + static inline int mount_setattr(int dfd, const char *path, unsigned int flags, +- struct lxc_mount_attr *attr, size_t size) ++ struct mount_attr *attr, size_t size) + { + return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); + }
package/lxc/lxc.hash +1 -1
@@ -1,4 +1,4 @@ # Locally calculated -sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz +sha256 d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222 lxc-5.0.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
package/lxc/lxc.mk +17 -19
@@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.12 +LXC_VERSION = 5.0.1 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1
@@ -13,56 +13,54 @@ LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES LXC_CONF_OPTS = \ - --disable-apparmor \ - --disable-examples \ - --with-distro=buildroot \ - --disable-werror \ - $(if $(BR2_PACKAGE_BASH),,--disable-bash) + -Dapparmor=false \ + -Dexamples=false \ + -Dman=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) LXC_DEPENDENCIES += bash-completion endif ifeq ($(BR2_PACKAGE_LIBCAP),y) -LXC_CONF_OPTS += --enable-capabilities +LXC_CONF_OPTS += -Dcapabilities=true LXC_DEPENDENCIES += libcap else -LXC_CONF_OPTS += --disable-capabilities +LXC_CONF_OPTS += -Dcapabilities=false endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -LXC_CONF_OPTS += --enable-seccomp +LXC_CONF_OPTS += -Dseccomp=true LXC_DEPENDENCIES += libseccomp else -LXC_CONF_OPTS += --disable-seccomp +LXC_CONF_OPTS += -Dseccomp=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LXC_CONF_OPTS += --enable-selinux +LXC_CONF_OPTS += -Dselinux=true LXC_DEPENDENCIES += libselinux else -LXC_CONF_OPTS += --disable-selinux +LXC_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_LIBURING),y) -LXC_CONF_OPTS += --enable-liburing +LXC_CONF_OPTS += -Dio-uring-event-loop=true LXC_DEPENDENCIES += liburing else -LXC_CONF_OPTS += --disable-liburing +LXC_CONF_OPTS += -Dio-uring-event-loop=false endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -LXC_CONF_OPTS += --enable-pam +LXC_CONF_OPTS += -Dpam-cgroup=true LXC_DEPENDENCIES += linux-pam else -LXC_CONF_OPTS += --disable-pam +LXC_CONF_OPTS += -Dpam-cgroup=false endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -LXC_CONF_OPTS += --enable-openssl +LXC_CONF_OPTS += -Dopenssl=true LXC_DEPENDENCIES += openssl else -LXC_CONF_OPTS += --disable-openssl +LXC_CONF_OPTS += -Dopenssl=false endif -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 16 lines · On Sat, 5 Nov 2022 22:23:43 +0100 Fabrice Fontaine…
LXC 5.0 will be supported until June 2027 and our current LTS release, LXC 4.0 will now switch to a slower maintenance pace, only getting critical bugfixes and security updates.
We strongly recommend all LXC users to plan an upgrade to the 5.0 branch.
- Switch to meson-package
- Add an upstream patch to fix the following build failure with glibc 2.36 (unfortunately upstream doesn't plan to fix this for 4.x:
https://github.com/lxc/lxc/issues/4183 and patch is only working with meson, not autotools)https://discuss.linuxcontainers.org/t/lxc-5-0-lts-has-been-released
https://discuss.linuxcontainers.org/t/lxc-5-0-1-has-been-released
Quoted 7 lines
Fixes:
- http://autobuild.buildroot.org/results/f77e2dc44c9a224f280e08089a890e85c302274fSigned-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Rebase patch so it applies cleanly on master
It's not great to have to apply such a big version bump in master right now, but oh well, if it's needed to fix the build issue without re-doing quite a bit of autoconf stuff, so be it. Applied to master. Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Fabrice,
Quoted 13 lines · On Sat, 5 Nov 2022 22:23:43 +0100 Fabrice Fontaine…
LXC 5.0 will be supported until June 2027 and our current LTS release, LXC 4.0 will now switch to a slower maintenance pace, only getting critical bugfixes and security updates.
We strongly recommend all LXC users to plan an upgrade to the 5.0 branch.
- Switch to meson-package
- Add an upstream patch to fix the following build failure with glibc 2.36 (unfortunately upstream doesn't plan to fix this for 4.x:
https://github.com/lxc/lxc/issues/4183 and patch is only working with meson, not autotools)
Quoted 7 lines
https://discuss.linuxcontainers.org/t/lxc-5-0-lts-has-been-released
https://discuss.linuxcontainers.org/t/lxc-5-0-1-has-been-releasedFixes:
- http://autobuild.buildroot.org/results/f77e2dc44c9a224f280e08089a890e85c302274fSigned-off-by Fabrice Fontaine <[email protected]>
This change has apparently broken the LXC runtime test:
https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261449
Could you have a look?
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot