summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2022-03-24 20:11:20 -0700
committerZac Medico <zmedico@gentoo.org>2022-03-24 20:13:00 -0700
commitcfbedc84507006ba9cff71bd9cede4ede8ccf8e2 (patch)
tree0331050b7a6aca1552e83162e7c455d7bd9f3a10
parentapp-containers/snapd: drop 2.54.3, 2.54.4 (diff)
downloadgentoo-cfbedc84507006ba9cff71bd9cede4ede8ccf8e2.tar.gz
gentoo-cfbedc84507006ba9cff71bd9cede4ede8ccf8e2.tar.bz2
gentoo-cfbedc84507006ba9cff71bd9cede4ede8ccf8e2.zip
app-containers/snapd: remove cgroup-hybrid USE flag
Closes: https://bugs.gentoo.org/835818 Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--app-containers/snapd/metadata.xml3
-rw-r--r--app-containers/snapd/snapd-2.55.2.ebuild6
2 files changed, 3 insertions, 6 deletions
diff --git a/app-containers/snapd/metadata.xml b/app-containers/snapd/metadata.xml
index 82446241f723..0109791c93ff 100644
--- a/app-containers/snapd/metadata.xml
+++ b/app-containers/snapd/metadata.xml
@@ -12,9 +12,6 @@
<flag name="apparmor">
Enable AppArmor support.
</flag>
- <flag name="cgroup-hybrid">
- Default to hybrid (legacy) cgroup hierarchy instead of unified (modern).
- </flag>
<flag name="forced-devmode">
Automatically disable application confinement if feature detection fails.
</flag>
diff --git a/app-containers/snapd/snapd-2.55.2.ebuild b/app-containers/snapd/snapd-2.55.2.ebuild
index bf6b2a0a243e..4e8c75f7a53b 100644
--- a/app-containers/snapd/snapd-2.55.2.ebuild
+++ b/app-containers/snapd/snapd-2.55.2.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~amd64"
LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
CONFIG_CHECK="~CGROUPS
~CGROUP_DEVICE
@@ -40,7 +40,7 @@ RDEPEND="
)
dev-libs/glib
virtual/libudev
- systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+ systemd? ( sys-apps/systemd )
sys-libs/libcap:=
sys-fs/squashfs-tools[lzma]"