| 1 |
commit: 09749f23e7eb708f0f26c57a47cbb899595ffe99 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 26 01:39:06 2022 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 01:41:50 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09749f23 |
| 7 |
|
| 8 |
app-containers/podman: add cgroup-hybrid USE flag |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/763267 |
| 11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 12 |
|
| 13 |
app-containers/podman/metadata.xml | 3 +++ |
| 14 |
app-containers/podman/podman-3.4.4.ebuild | 5 +++-- |
| 15 |
app-containers/podman/podman-4.0.2.ebuild | 5 +++-- |
| 16 |
3 files changed, 9 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-containers/podman/metadata.xml b/app-containers/podman/metadata.xml |
| 19 |
index 844d5c0dcd45..11d7dc7603dc 100644 |
| 20 |
--- a/app-containers/podman/metadata.xml |
| 21 |
+++ b/app-containers/podman/metadata.xml |
| 22 |
@@ -22,6 +22,9 @@ |
| 23 |
Enables dependencies for the "btrfs" graph driver, including |
| 24 |
necessary kernel flags. |
| 25 |
</flag> |
| 26 |
+ <flag name="cgroup-hybrid"> |
| 27 |
+ Default to hybrid (legacy) cgroup hierarchy instead of unified (modern). |
| 28 |
+ </flag> |
| 29 |
<flag name="fuse"> |
| 30 |
Enables fuse dependencies (fuse-overlayfs is especially useful |
| 31 |
for rootless mode). |
| 32 |
|
| 33 |
diff --git a/app-containers/podman/podman-3.4.4.ebuild b/app-containers/podman/podman-3.4.4.ebuild |
| 34 |
index f6e9ac8b1006..d9c90056d70c 100644 |
| 35 |
--- a/app-containers/podman/podman-3.4.4.ebuild |
| 36 |
+++ b/app-containers/podman/podman-3.4.4.ebuild |
| 37 |
@@ -15,13 +15,14 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
| 38 |
SLOT="0" |
| 39 |
|
| 40 |
KEYWORDS="amd64 arm64 ~ppc64 ~riscv" |
| 41 |
-IUSE="apparmor btrfs +fuse +rootless selinux" |
| 42 |
+IUSE="apparmor btrfs +cgroup-hybrid +fuse +rootless selinux" |
| 43 |
RESTRICT+=" test" |
| 44 |
|
| 45 |
COMMON_DEPEND=" |
| 46 |
app-crypt/gpgme:= |
| 47 |
>=app-containers/conmon-2.0.0 |
| 48 |
- || ( >=app-containers/runc-1.0.0_rc6 app-containers/crun ) |
| 49 |
+ cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) |
| 50 |
+ !cgroup-hybrid? ( app-containers/crun ) |
| 51 |
dev-libs/libassuan:= |
| 52 |
dev-libs/libgpg-error:= |
| 53 |
>=net-misc/cni-plugins-0.8.6 |
| 54 |
|
| 55 |
diff --git a/app-containers/podman/podman-4.0.2.ebuild b/app-containers/podman/podman-4.0.2.ebuild |
| 56 |
index d5e19cc828de..62f957b6252a 100644 |
| 57 |
--- a/app-containers/podman/podman-4.0.2.ebuild |
| 58 |
+++ b/app-containers/podman/podman-4.0.2.ebuild |
| 59 |
@@ -15,13 +15,14 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
| 60 |
SLOT="0" |
| 61 |
|
| 62 |
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" |
| 63 |
-IUSE="apparmor btrfs +fuse +init +rootless selinux" |
| 64 |
+IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux" |
| 65 |
RESTRICT+=" test" |
| 66 |
|
| 67 |
COMMON_DEPEND=" |
| 68 |
app-crypt/gpgme:= |
| 69 |
>=app-containers/conmon-2.0.0 |
| 70 |
- || ( app-containers/crun >=app-containers/runc-1.0.0_rc6 ) |
| 71 |
+ cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) |
| 72 |
+ !cgroup-hybrid? ( app-containers/crun ) |
| 73 |
dev-libs/libassuan:= |
| 74 |
dev-libs/libgpg-error:= |
| 75 |
>=net-misc/cni-plugins-0.8.6 |
Archives