sys-apps/systemd: add cgroup-hybrid USE flag

Bug: https://bugs.gentoo.org/691310
Package-Manager: Portage-2.3.70_p1, Repoman-2.3.16_p21
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 05423b63bbdca6f9dd7786c1e327773d033df742..76658cc29c527dbeb4aad802f4651b417a6766aa 100644 (file)
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -11,6 +11,7 @@
        <use>
                <flag name="apparmor">Enable AppArmor support</flag>
                <flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
+               <flag name="cgroup-hybrid">Default to hybrid cgroup hierarchy instead of unified.</flag>
                <flag name="curl">Enable support for uploading journals</flag>
                <flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
                <flag name="dns-over-tls">Enable DNS-over-TLS support</flag>

diff --git a/sys-apps/systemd/systemd-243_rc1.ebuild b/sys-apps/systemd/systemd-243_rc1-r1.ebuild
similarity index 97%
rename from sys-apps/systemd/systemd-243_rc1.ebuild
rename to sys-apps/systemd/systemd-243_rc1-r1.ebuild
index 3f4f5a43b843b337d77cf75c8d842a44bcf780b5..a3e140a028c93f2d74fca382c625c2ed8e09b5a7 100644 (file)
--- a/sys-apps/systemd/systemd-243_rc1.ebuild
+++ b/sys-apps/systemd/systemd-243_rc1-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -245,6 +245,7 @@ multilib_src_configure() {
                # no deps
                -Defi=$(meson_multilib)
                -Dima=true
+               -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
                # Optional components/dependencies
                -Dacl=$(meson_multilib_native_use acl)
                -Dapparmor=$(meson_multilib_native_use apparmor)

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a2bb8171bab60753a2c314c152540c07999be7b2..ac715e3359e9bb7562845e7064b40ff828fadb19 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -244,6 +244,7 @@ multilib_src_configure() {
                # no deps
                -Defi=$(meson_multilib)
                -Dima=true
+               -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
                # Optional components/dependencies
                -Dacl=$(meson_multilib_native_use acl)
                -Dapparmor=$(meson_multilib_native_use apparmor)