| 1 |
commit: d2202248997bf8b8a025306b28a5a98969b016f7 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 2 19:24:18 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 2 19:24:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2202248 |
| 7 |
|
| 8 |
sys-apps/systemd: add cgroup-hybrid USE flag |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/691310 |
| 11 |
Package-Manager: Portage-2.3.70_p1, Repoman-2.3.16_p21 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/systemd/metadata.xml | 1 + |
| 15 |
sys-apps/systemd/{systemd-243_rc1.ebuild => systemd-243_rc1-r1.ebuild} | 3 ++- |
| 16 |
sys-apps/systemd/systemd-9999.ebuild | 3 ++- |
| 17 |
3 files changed, 5 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml |
| 20 |
index 05423b63bbd..76658cc29c5 100644 |
| 21 |
--- a/sys-apps/systemd/metadata.xml |
| 22 |
+++ b/sys-apps/systemd/metadata.xml |
| 23 |
@@ -11,6 +11,7 @@ |
| 24 |
<use> |
| 25 |
<flag name="apparmor">Enable AppArmor support</flag> |
| 26 |
<flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag> |
| 27 |
+ <flag name="cgroup-hybrid">Default to hybrid cgroup hierarchy instead of unified.</flag> |
| 28 |
<flag name="curl">Enable support for uploading journals</flag> |
| 29 |
<flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag> |
| 30 |
<flag name="dns-over-tls">Enable DNS-over-TLS support</flag> |
| 31 |
|
| 32 |
diff --git a/sys-apps/systemd/systemd-243_rc1.ebuild b/sys-apps/systemd/systemd-243_rc1-r1.ebuild |
| 33 |
similarity index 97% |
| 34 |
rename from sys-apps/systemd/systemd-243_rc1.ebuild |
| 35 |
rename to sys-apps/systemd/systemd-243_rc1-r1.ebuild |
| 36 |
index 3f4f5a43b84..a3e140a028c 100644 |
| 37 |
--- a/sys-apps/systemd/systemd-243_rc1.ebuild |
| 38 |
+++ b/sys-apps/systemd/systemd-243_rc1-r1.ebuild |
| 39 |
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 40 |
|
| 41 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
| 42 |
SLOT="0/2" |
| 43 |
-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" |
| 44 |
+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" |
| 45 |
|
| 46 |
REQUIRED_USE="importd? ( curl gcrypt lzma )" |
| 47 |
RESTRICT="!test? ( test )" |
| 48 |
@@ -245,6 +245,7 @@ multilib_src_configure() { |
| 49 |
# no deps |
| 50 |
-Defi=$(meson_multilib) |
| 51 |
-Dima=true |
| 52 |
+ -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) |
| 53 |
# Optional components/dependencies |
| 54 |
-Dacl=$(meson_multilib_native_use acl) |
| 55 |
-Dapparmor=$(meson_multilib_native_use apparmor) |
| 56 |
|
| 57 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 58 |
index a2bb8171bab..ac715e3359e 100644 |
| 59 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 60 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 61 |
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 62 |
|
| 63 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
| 64 |
SLOT="0/2" |
| 65 |
-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" |
| 66 |
+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" |
| 67 |
|
| 68 |
REQUIRED_USE="importd? ( curl gcrypt lzma )" |
| 69 |
RESTRICT="!test? ( test )" |
| 70 |
@@ -244,6 +244,7 @@ multilib_src_configure() { |
| 71 |
# no deps |
| 72 |
-Defi=$(meson_multilib) |
| 73 |
-Dima=true |
| 74 |
+ -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) |
| 75 |
# Optional components/dependencies |
| 76 |
-Dacl=$(meson_multilib_native_use acl) |
| 77 |
-Dapparmor=$(meson_multilib_native_use apparmor) |
Archives