From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CCAE158086 for ; Wed, 8 Dec 2021 21:15:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 689752BC007; Wed, 8 Dec 2021 21:15:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22B1E2BC007 for ; Wed, 8 Dec 2021 21:15:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B0DD3432DC for ; Wed, 8 Dec 2021 21:15:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C73FF14D for ; Wed, 8 Dec 2021 21:14:58 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1638998092.46d2a0c12d7304c56bcb4ece27fa831e8bcaadf5.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch app-emulation/libvirt/libvirt-7.10.0-r1.ebuild app-emulation/libvirt/libvirt-7.10.0.ebuild app-emulation/libvirt/libvirt-7.9.0-r1.ebuild app-emulation/libvirt/libvirt-7.9.0.ebuild X-VCS-Directories: app-emulation/libvirt/ app-emulation/libvirt/files/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 46d2a0c12d7304c56bcb4ece27fa831e8bcaadf5 X-VCS-Branch: master Date: Wed, 8 Dec 2021 21:14:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 73424388-8c9e-41c8-89f2-2867e15e4c2a X-Archives-Hash: bcebe9c4723161cd533a1027f14b0922 commit: 46d2a0c12d7304c56bcb4ece27fa831e8bcaadf5 Author: Matthias Maier gentoo org> AuthorDate: Wed Dec 8 21:14:21 2021 +0000 Commit: Matthias Maier gentoo 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 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" +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() {