From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 17 Nov 2026 15:31:05 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xTKDA-000ReX-2A for lore@lore.pengutronix.de; Tue, 17 Nov 2026 15:31:05 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xTKDA-0004Bv-Cv; Tue, 17 Nov 2026 15:31:04 +0100 Received: from mx1.white.stw.pengutronix.de ([185.203.200.13]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xTKCs-00042A-PJ for ptxdist@pengutronix.de; Tue, 17 Nov 2026 15:30:49 +0100 Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPS id 4D46C200668 for ; Tue, 17 Nov 2026 15:30:42 +0100 (CET) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=pengutronix.de; s=20260414; t=1794925842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=OrqvIVWVZ8uIpcaLL6dRP7vhsEeWDBDUQbPSNexalQA=; b=LV/lYm/xhZppM9FEgflGxKIRy/hFuaL/9iImHr31z3SscnPqZkpZhmEmTop1/29PldJORy SmVMijE21OKKQ7dquA/WLhmtzz8oVESeBnElU+0xStTCOrX7xCn+Ph3e1JdP/2YYxnBzvJ dDPlBmSHPOxMe1N2loVnVgnUkDGI13aF+S7WbCcSGl/2Q3fkUnHf+1dAJQqCv63mF6tK0S i+HTqHFRxIxE7bNWkTf9UxeyL6E3UYKefMR7TtX+FQY0odTzvlR779KdnTu+7OQvT3KfqL ORp51OT6DFu2s7kupwjcqth1qELB2tiVxgI87k4D77V/4u5AeMK82dUWtzluEQ== ARC-Seal: i=1; s=20260414; d=pengutronix.de; t=1794925842; a=rsa-sha256; cv=none; b=STt4eOoYwBRi0hAhC0S8OvMHUfjKKsFhgh48EHv4IfGLKnryt01i+7VE6kC/IbtTFaSKi3 /f7Vd3i9yFevejDofSaeWt4/2VUBkOe22zgoxViVHpSw0y3OAi58NBEVjjNVwsW+GsllnD AwGLa0SOnKRTzB+qgJ+Io64ZO5MTCseEvYBZbBb07btfCthj0Wx1PSnkXrufmPzDBbmfSo KdQtlXccpLyExzdm47hop9k358K4rkljTmgwo1iriWNunlJCFeSmMhpfm4OD1pyrTzLZux KKsU5aW0YuxOcj0WCmJuOWsRELTOz7kK+UUfxJW+U5cqSFlQMfbzO/NGsYOGHw== ARC-Authentication-Results: i=1; mx1.white.stw.pengutronix.de; dkim=pass header.d=pantacor.com header.s=google header.b=i8uAfYpM; spf=pass (mx1.white.stw.pengutronix.de: domain of fernando.luiz@pantacor.com designates 2607:f8b0:4864:20::832 as permitted sender) smtp.mailfrom=fernando.luiz@pantacor.com; dmarc=pass (policy=reject) header.from=pantacor.com Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-55c1e574791so6670491cf.0 for ; Tue, 17 Nov 2026 06:30:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794925841; x=1795530641; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=OrqvIVWVZ8uIpcaLL6dRP7vhsEeWDBDUQbPSNexalQA=; b=Wum/vQODyEVgBx1ltCkFc49cHRjxC1gLCdVwDnp9XOUYN3Cs/4EbjXtHaN0Wy5vyZW ddB/qJaNTE910wjqwUe6Oe2wvVl3M8vAMps8i9j5zEsEYsH6J2hMtGrDP1udD4HPidSj Na8EHYnZDD2TQPUDz15uWbXMKAQ55lhXyJJSlIGOhX3lwFUmc2pRXeFnvreDWLRx0UCx SM4/jKpppA6BtqZM+pgV0TLVB9bYc/5VRb4kQAm9o23F4lvLGCLUvQGIksTHH6WAl1Vu wvEjAmVIMoaMOeYZVgzQ23qcHFQCGaJ0k4F9ttqxWic1h8MWeQtKBGy/x0A5wAnNGjkf NFSQ== X-Gm-Message-State: APuU4Z8yx3TYK5R0CF5vkrCuv7cH6s5MHvgvLs29bpOIbTIGj0eZJBF1 XjfSjmWXfEM39zN52b4PSL7HRK2nj/jf8QT2Ck+RxqJLOJAlmOjRFijjZuxpMF660ZP7sYZC3cv eWtsDZcLmPQ== X-Gm-Gg: AYBFou1PG7En7H1oTP6K0DAG9VP0yQvxdB2p5GWqDPRPFmHbhb/0mKS7tZUOO5qx7z3 p9b4AuMZl8ydKfF6rZriUpDVvAe0poTDCTpTw1cXmJBnU9yBr8ZVFe1epKc4rslrxFRnqXqgwKR YX3fsNxlRWUGtVfiB5Sk/FP5bVDkbWLUB+ApFP4ASAFWeoDfB9od8VyL+xGMm4X5dByWga7mNwq eGtJ2WNEXHypBwD4qKKjUnHa3Aa5S5MVh5Rn7AIklxq94N0p4Qo6T7qomAlXkeyG8ioPXH+bsmJ FOJMNf7mG6zwp2E2jkQwQyQ6W5a8U1gmf0Vap5xRyOmiZ21OPavufSiOJk7uZMsRQzmUAG39zpb j3yzBcf2kuYYmpXP2jOnfPXLRB9hxO55oqQxuAi1VwOiQdNkg3/sVu5uJyMm8QGr0/Q0JjSro3D r7HJCCb2Asn6ZJ4dqbNR+GekA5D7li+mh+wZQxLocRjSZmCFycOUCJ+dyO8W88wBNh4zLclx9RW m+de48fdWCDAFtVVjoSyfTu11Ht/34R+xL1TkLG7+J/aEAdaLhA8EvH13LlMOFULJGQD3biVDFv Rua7gJEVzGiKtYkyoutONMzV1lLJLFfAJ3ZEF6c44uVXmTqKda1jRv9lgqTZMWKH7DkOZsUN014 lN3vCSQHRGc7K/h+Dspk= X-Received: by 2002:a05:622a:5613:b0:55c:ce7f:400d with SMTP id d75a77b69052e-55cce7f57e0mr176523111cf.3.1794925840473; Tue, 17 Nov 2026 06:30:40 -0800 (PST) Received: from metalgear-rex.. (45-167-184-151.fibraprime.net. [45.167.184.151]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-55ad0a231dcsm105079091cf.13.2026.11.17.06.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 06:30:39 -0800 (PST) To: ptxdist@pengutronix.de Date: Tue, 17 Nov 2026 11:30:34 -0300 Message-ID: <20261117143034.15388-1-fernando.luiz@pantacor.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-0.50 / 15.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; RECEIVED_SPAMHAUS_XBL(1.00)[45.167.184.151:received]; R_MISSING_CHARSET(0.50)[]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; ARC_SIGNED(0.00)[pengutronix.de:s=20260414:i=1]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::832:from]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_ALLOW(0.00)[pantacor.com:s=google]; TO_DN_SOME(0.00)[]; DMARC_POLICY_ALLOW(0.00)[pantacor.com,reject]; DKIM_TRACE(0.00)[pantacor.com:+]; NEURAL_SPAM(0.00)[0.264]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[ptxdist@pengutronix.de]; R_SPF_ALLOW(0.00)[+ip6:2607:f8b0:4864::/56]; RECEIVED_SPAMHAUS_PBL(0.00)[45.167.184.151:received]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 4D46C200668 X-Rspamd-Server: mx1 X-Stat-Signature: pbbh7quodcduqsmx6p54wgcnb8p5pc3i X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] lxc: version bump 3.0.1 -> 6.0.6 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Fernando Luiz Cola via ptxdist Reply-To: ptxdist@pengutronix.de Cc: Fernando Luiz Cola , Michael Grzeschik Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- 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