From: Matthias Maier Date: Tue, 3 Dec 2019 18:48:52 +0000 (-0600) Subject: app-emulation/libvirt: Only require USE=cgroup-hybrid for USE=lxc X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2ffd9ac32d6019642257ec0b4f5a34fe7a25f388;p=gentoo.git 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 --- diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild index 17eb6ffb24aa..d878aa6e027e 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 03d2e5585664..4191f89dc94a 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