[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/

["Matthias Maier" <tamiko@gentoo.org>]

commit:     46d2a0c12d7304c56bcb4ece27fa831e8bcaadf5
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  8 21:14:21 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Dec  8 21:14:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d2a0c1

app-emulation/libvirt: v7.(9|10).0: (temporary) fix cgroup v2 support

Revert an upstream commit that fixed an libvirt_lxc container startup
issue with cgroup v1 layout. The patch in question breaks
systemd-machined integration (at least under cgroup v2 layout).

Le't temporarily revert the commit in question until upstream has found
a proper fix.

Bug: https://bugs.gentoo.org/828542
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch | 32 ++++++++++++++++++++++
 ...virt-7.10.0.ebuild => libvirt-7.10.0-r1.ebuild} |  1 +
 ...ibvirt-7.9.0.ebuild => libvirt-7.9.0-r1.ebuild} |  1 +
 3 files changed, 34 insertions(+)

diff --git a/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch b/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch
new file mode 100644
index 000000000000..1309996f3ecf
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch
@@ -0,0 +1,32 @@
+From c80a05cd7d5f17ee16a2bc2546981863451fcab7 Mon Sep 17 00:00:00 2001
+From: "System user; portage" <portage@kestrel.43-1.org>
+Date: Wed, 8 Dec 2021 15:07:06 -0600
+Subject: [PATCH] Revert "lxc: controller: Fix container launch on cgroup v1"
+
+This reverts commit 1b9ce05ce241a581d4e80228c92ceb0266f21f94.
+---
+ src/lxc/lxc_controller.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
+index 444f728af4..8953e0c904 100644
+--- a/src/lxc/lxc_controller.c
++++ b/src/lxc/lxc_controller.c
+@@ -865,12 +865,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl)
+     nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1);
+ 
+     if (!(ctrl->cgroup = virLXCCgroupCreate(ctrl->def,
+-                                            getpid(),
++                                            ctrl->initpid,
+                                             ctrl->nnicindexes,
+                                             ctrl->nicindexes)))
+         goto cleanup;
+ 
+-    if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->initpid) < 0)
++    if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0)
+         goto cleanup;
+ 
+     /* Add all qemu-nbd tasks to the cgroup */
+-- 
+2.32.0
+

diff --git a/app-emulation/libvirt/libvirt-7.10.0.ebuild b/app-emulation/libvirt/libvirt-7.10.0-r1.ebuild
similarity index 99%
rename from app-emulation/libvirt/libvirt-7.10.0.ebuild
rename to app-emulation/libvirt/libvirt-7.10.0-r1.ebuild
index e20eaa25a6c2..b190082c6615 100644
--- a/app-emulation/libvirt/libvirt-7.10.0.ebuild
+++ b/app-emulation/libvirt/libvirt-7.10.0-r1.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-7.9.0-fix_cgroupv2.patch
 )
 
 pkg_setup() {

diff --git a/app-emulation/libvirt/libvirt-7.9.0.ebuild b/app-emulation/libvirt/libvirt-7.9.0-r1.ebuild
similarity index 99%
rename from app-emulation/libvirt/libvirt-7.9.0.ebuild
rename to app-emulation/libvirt/libvirt-7.9.0-r1.ebuild
index e20eaa25a6c2..b190082c6615 100644
--- a/app-emulation/libvirt/libvirt-7.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-7.9.0-r1.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-7.9.0-fix_cgroupv2.patch
 )
 
 pkg_setup() {