diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2022-03-25 18:39:06 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2022-03-25 18:41:50 -0700 |
| commit | 09749f23e7eb708f0f26c57a47cbb899595ffe99 (patch) | |
| tree | 069f050ecdeaa8ddce4e1b3bd886f88d7db808fa /app-containers | |
| parent | app-containers/docker-compose: fix RedundantDodir; phase order (diff) | |
| download | gentoo-09749f23e7eb708f0f26c57a47cbb899595ffe99.tar.gz gentoo-09749f23e7eb708f0f26c57a47cbb899595ffe99.tar.bz2 gentoo-09749f23e7eb708f0f26c57a47cbb899595ffe99.zip | |
app-containers/podman: add cgroup-hybrid USE flag
Closes: https://bugs.gentoo.org/763267
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'app-containers')
| -rw-r--r-- | app-containers/podman/metadata.xml | 3 | ||||
| -rw-r--r-- | app-containers/podman/podman-3.4.4.ebuild | 5 | ||||
| -rw-r--r-- | app-containers/podman/podman-4.0.2.ebuild | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app-containers/podman/metadata.xml b/app-containers/podman/metadata.xml index 844d5c0dcd45..11d7dc7603dc 100644 --- a/app-containers/podman/metadata.xml +++ b/app-containers/podman/metadata.xml @@ -22,6 +22,9 @@ Enables dependencies for the "btrfs" graph driver, including necessary kernel flags. </flag> + <flag name="cgroup-hybrid"> + Default to hybrid (legacy) cgroup hierarchy instead of unified (modern). + </flag> <flag name="fuse"> Enables fuse dependencies (fuse-overlayfs is especially useful for rootless mode). diff --git a/app-containers/podman/podman-3.4.4.ebuild b/app-containers/podman/podman-3.4.4.ebuild index f6e9ac8b1006..d9c90056d70c 100644 --- a/app-containers/podman/podman-3.4.4.ebuild +++ b/app-containers/podman/podman-3.4.4.ebuild @@ -15,13 +15,14 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" SLOT="0" KEYWORDS="amd64 arm64 ~ppc64 ~riscv" -IUSE="apparmor btrfs +fuse +rootless selinux" +IUSE="apparmor btrfs +cgroup-hybrid +fuse +rootless selinux" RESTRICT+=" test" COMMON_DEPEND=" app-crypt/gpgme:= >=app-containers/conmon-2.0.0 - || ( >=app-containers/runc-1.0.0_rc6 app-containers/crun ) + cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) + !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=net-misc/cni-plugins-0.8.6 diff --git a/app-containers/podman/podman-4.0.2.ebuild b/app-containers/podman/podman-4.0.2.ebuild index d5e19cc828de..62f957b6252a 100644 --- a/app-containers/podman/podman-4.0.2.ebuild +++ b/app-containers/podman/podman-4.0.2.ebuild @@ -15,13 +15,14 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" -IUSE="apparmor btrfs +fuse +init +rootless selinux" +IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux" RESTRICT+=" test" COMMON_DEPEND=" app-crypt/gpgme:= >=app-containers/conmon-2.0.0 - || ( app-containers/crun >=app-containers/runc-1.0.0_rc6 ) + cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) + !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=net-misc/cni-plugins-0.8.6 |