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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1EFC9138334 for ; Tue, 3 Dec 2019 18:49:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AABBE0805; Tue, 3 Dec 2019 18:49:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F2F2E0805 for ; Tue, 3 Dec 2019 18:49:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D246734D75B for ; Tue, 3 Dec 2019 18:49:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E049F85C for ; Tue, 3 Dec 2019 18:49:14 +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: <1575398932.2ffd9ac32d6019642257ec0b4f5a34fe7a25f388.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-5.8.0.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 2ffd9ac32d6019642257ec0b4f5a34fe7a25f388 X-VCS-Branch: master Date: Tue, 3 Dec 2019 18:49:14 +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: 1fe23361-209e-4f1f-b132-490553a78d7e X-Archives-Hash: 574c0199a770b888ca3ffc80aa62f7b2 commit: 2ffd9ac32d6019642257ec0b4f5a34fe7a25f388 Author: Matthias Maier gentoo org> AuthorDate: Tue Dec 3 18:48:52 2019 +0000 Commit: Matthias Maier gentoo org> CommitDate: Tue Dec 3 18:48:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffd9ac3 app-emulation/libvirt: Only require USE=cgroup-hybrid for USE=lxc Reportedly version 5.8.0 should be fine with a cgroup v2 only hierarchy (verified that on my own system for qemu). Unfortunately, we still need the hybrid layout as a mitigation for a bug in the libvirt-lxc driver. So restrict the dependency on sys-apps/systemd[cgroup-hybrid] to the case of USE=lxc only. This should accomodate everyone who does not need libvirt-lxc support and wants to have a v2 only hierarchy. Upstream Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1770763 Bug: https://bugs.gentoo.org/699758 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Matthias Maier gentoo.org> app-emulation/libvirt/libvirt-5.8.0.ebuild | 2 +- app-emulation/libvirt/libvirt-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild index 17eb6ffb24a..d878aa6e027 100644 --- a/app-emulation/libvirt/libvirt-5.8.0.ebuild +++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild @@ -60,7 +60,6 @@ RDEPEND=" net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode - !sys-apps/systemd[-cgroup-hybrid(+)] >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= @@ -77,6 +76,7 @@ RDEPEND=" iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 03d2e558566..4191f89dc94 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -61,7 +61,6 @@ RDEPEND=" net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode - !sys-apps/systemd[-cgroup-hybrid(+)] >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= @@ -78,6 +77,7 @@ RDEPEND=" iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2