From: Fernando Luiz Cola via ptxdist <ptxdist@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Fernando Luiz Cola <fernando.luiz@pantacor.com>,
Michael Grzeschik <mgr@pengutronix.de>
Subject: [ptxdist] [PATCH] lxc: version bump 3.0.1 -> 6.0.6
Date: Tue, 17 Nov 2026 11:30:34 -0300 [thread overview]
Message-ID: <20261117143034.15388-1-fernando.luiz@pantacor.com> (raw)
LXC 6.0 is the current LTS series. It builds with meson only, so
convert the rule and pin every option. distrosysconfdir is pinned as
well: when empty, meson picks sysconfig or default from the build
host's /etc.
lxc-apparmor-load is now only installed together with the systemd
units and is useless without AppArmor support, so stop installing it.
Install init.lxc, which lxc-execute needs. Update the list of test
programs, and create /var/lib/lxc and /usr/lib/lxc/rootfs with mode
0755 instead of 0644.
Set the license, which was 'unknown'.
Signed-off-by: Fernando Luiz Cola <fernando.luiz@pantacor.com>
---
Build-tested for DistroKit v8a (arm64): lxc-6.0.6 compiles and installs
with LXC_TEST_TOOLS enabled, 'ptxdist lint' reports nothing for lxc,
'ptxdist licensecheck lxc' passes and configure_helper.py shows no
missing meson options. Not built with LXC_SYSTEMD_UNIT, not run on target.
rules/lxc.in | 1 +
rules/lxc.make | 177 ++++++++++++++++++++++++++++---------------------
2 files changed, 103 insertions(+), 75 deletions(-)
diff --git a/rules/lxc.in b/rules/lxc.in
index e8dc765e6..5af939294 100644
--- a/rules/lxc.in
+++ b/rules/lxc.in
@@ -3,6 +3,7 @@
menuconfig LXC
tristate
prompt "lxc "
+ select HOST_MESON
select LIBCAP
select LIBSECCOMP
select GLIBC_GETENT
diff --git a/rules/lxc.make b/rules/lxc.make
index 762a68ed4..ad786e468 100644
--- a/rules/lxc.make
+++ b/rules/lxc.make
@@ -14,57 +14,63 @@ PACKAGES-$(PTXCONF_LXC) += lxc
#
# Paths and names
#
-LXC_VERSION := 3.0.1
-LXC_SHA256 := 45986c49be1c048fa127bd3e7ea1bd3347e25765c008a09a2e4c233151a2d5db
+LXC_VERSION := 6.0.6
+LXC_SHA256 := b0ba4537258d2b848fd07dedb1044dab132de3fb3f1976d240da40a7dee1b8cf
LXC := lxc-$(LXC_VERSION)
LXC_SUFFIX := tar.gz
LXC_URL := https://linuxcontainers.org/downloads/lxc/$(LXC).$(LXC_SUFFIX)
LXC_SOURCE := $(SRCDIR)/$(LXC).$(LXC_SUFFIX)
LXC_DIR := $(BUILDDIR)/$(LXC)
-LXC_LICENSE := unknown
+LXC_LICENSE := LGPL-2.1-or-later AND GPL-2.0-only
+LXC_LICENSE_FILES := \
+ file://COPYING;md5=4b6551da9cb7d5b3017d1c0a3e31469b \
+ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
+ file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-#LXC_CONF_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-LXC_CONF_TOOL := autoconf
+# distrosysconfdir is pinned: when empty, meson picks sysconfig or default
+# from the build host's /etc.
+LXC_CONF_TOOL := meson
LXC_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --enable-silent-rules \
- --enable-dependency-tracking \
- --enable-shared \
- --disable-static \
- --disable-fast-install \
- --disable-libtool-lock \
- --disable-werror \
- --disable-rpath \
- --disable-doc \
- --disable-api-docs \
- --disable-apparmor \
- --disable-gnutls \
- --$(call ptx/endis, PTXCONF_GLOBAL_SELINUX)-selinux \
- --enable-seccomp \
- --enable-capabilities \
- --disable-examples \
- --disable-mutex-debugging \
- --disable-bash \
- --enable-tools \
- --enable-commands \
- --$(call ptx/endis, PTXCONF_LXC_TEST_TOOLS)-tests \
- --enable-configpath-log \
- --disable-pam \
- --with-init-script=systemd \
- --with-systemdsystemunitdir=/usr/lib/systemd/system/ \
- --with-distro=unknown \
- --with-usernic-conf \
- --with-usernic-db \
- --with-log-path=/var/log \
- --with-pamdir=none
+ $(CROSS_MESON_USR) \
+ -Dapi-docs=false \
+ -Dapparmor=false \
+ -Dapparmor-cache-path=cache/lxc/apparmor \
+ -Dcapabilities=true \
+ -Dcgroup-pattern= \
+ -Dcommands=true \
+ -Dcoverity-build=false \
+ -Ddata-path=lib/lxc \
+ -Ddbus=false \
+ -Ddistrosysconfdir=default \
+ -Ddoc-path=doc/lxc \
+ -Dexamples=false \
+ -Dglobal-config-path=lxc \
+ -Dinit-script=$(call ptx/ifdef,PTXCONF_LXC_SYSTEMD_UNIT,systemd,[]) \
+ -Dinstall-init-files=true \
+ -Dinstall-state-dirs=true \
+ -Dio-uring-event-loop=false \
+ -Dlog-path=log/lxc \
+ -Dman=false \
+ -Dmemfd-rexec=true \
+ -Dopenssl=false \
+ -Doss-fuzz=false \
+ -Dpam-cgroup=false \
+ -Drootfs-mount-path=lxc/rootfs \
+ -Druntime-path=/run \
+ -Dseccomp=true \
+ -Dselinux=$(call ptx/truefalse,PTXCONF_GLOBAL_SELINUX) \
+ -Dspecfile=false \
+ -Dsystemd-unitdir=/usr/lib/systemd/system \
+ -Dtests=$(call ptx/truefalse,PTXCONF_LXC_TEST_TOOLS) \
+ -Dthread-safety=true \
+ -Dtools=true \
+ -Dtools-multicall=false \
+ -Dusernet-config-path=lxc/lxc-usernet \
+ -Dusernet-db-path=lxc/nics
LXC_APPLICATIONS := \
copy \
@@ -95,51 +101,70 @@ LXC_APPLICATIONS := \
ifdef PTXCONF_LXC_TEST_TOOLS
LXC_TEST_TOOLS := \
- containertests \
- may-control \
- console \
- locktests \
- no-new-privs \
- snapshot \
- concurrent \
- shutdowntest \
- cgpath \
- get_item \
- criu-check-feature \
+ api-reboot \
apparmor \
- share-ns \
- saveconfig \
+ apparmor-generated \
+ apparmor-mount \
+ arch-parse \
+ attach \
+ automount \
+ autostart \
+ basic \
+ capabilities \
+ cgpath \
+ checkpoint-restore \
+ cloneconfig \
clonetest \
- createtest \
+ concurrent \
+ config-jump-table \
+ console \
+ console-log \
+ containertests \
createconfig \
- shortlived \
- rootfs \
+ createtest \
+ criu-check-feature \
+ cve-2019-5736 \
+ destroytest \
+ device-add-remove \
+ exit-code \
+ get_item \
getkeys \
- console-log \
- attach \
+ list \
+ locktests \
+ lxc-attach \
+ lxcpath \
+ may-control \
+ mount-injection \
+ no-new-privs \
+ parse-config-file \
+ proc-pid \
+ procsys \
+ raw-clone \
reboot \
- automount \
- api-reboot \
- destroytest \
+ rootfs \
+ rootfs-options \
+ saveconfig \
+ share-ns \
+ shortlived \
+ shutdowntest \
+ snapdeps \
+ snapshot \
startone \
- raw-clone \
- parse-config-file \
- config-jump-table \
- autostart \
state-server \
- list \
- device-add-remove \
- cloneconfig \
- utils \
- lxcpath
+ symlink \
+ sysctls \
+ sys-mixed \
+ unpriv \
+ usernic \
+ usernsexec \
+ utils
endif
LXC_LIBEXEC_APPS := \
containers \
- net \
- apparmor-load \
- user-nic \
monitord \
+ net \
+ user-nic
# ----------------------------------------------------------------------------
# Target-Install
@@ -156,8 +181,10 @@ $(STATEDIR)/lxc.targetinstall:
@$(call install_lib, lxc, 0, 0, 0644, liblxc)
- @$(call install_copy, lxc, 0, 0, 0644, /var/lib/lxc)
- @$(call install_copy, lxc, 0, 0, 0644, /usr/lib/lxc/rootfs)
+ @$(call install_copy, lxc, 0, 0, 0755, -, /usr/sbin/init.lxc)
+
+ @$(call install_copy, lxc, 0, 0, 0755, /var/lib/lxc)
+ @$(call install_copy, lxc, 0, 0, 0755, /usr/lib/lxc/rootfs)
@$(call install_tree, lxc, 0, 0, -, /usr/share/lxc/config)
--
2.43.0
reply other threads:[~2026-11-17 14:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117143034.15388-1-fernando.luiz@pantacor.com \
--to=ptxdist@pengutronix.de \
--cc=fernando.luiz@pantacor.com \
--cc=mgr@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox