diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2022-03-24 20:52:51 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2022-03-24 20:53:36 -0700 |
| commit | fe26469c2047f321138e5dc1f475b7fa786d37ae (patch) | |
| tree | 6d8c0c14ab85d5524f9c5fb77963a5f91ebdc6d2 /app-containers/podman | |
| parent | app-text/calibre: use qt5_get_bindir (diff) | |
| download | gentoo-fe26469c2047f321138e5dc1f475b7fa786d37ae.tar.gz gentoo-fe26469c2047f321138e5dc1f475b7fa786d37ae.tar.bz2 gentoo-fe26469c2047f321138e5dc1f475b7fa786d37ae.zip | |
Revert "app-containers/podman: add cgroup-hybrid USE flag"
This reverts commit 869ab111563d24bc8186b3dd17328cd8554b3442
since crun has missing arm64 and riscv keywords.
Bug: https://bugs.gentoo.org/763267
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'app-containers/podman')
| -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, 4 insertions, 9 deletions
diff --git a/app-containers/podman/metadata.xml b/app-containers/podman/metadata.xml index 11d7dc7603dc..844d5c0dcd45 100644 --- a/app-containers/podman/metadata.xml +++ b/app-containers/podman/metadata.xml @@ -22,9 +22,6 @@ 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 d9c90056d70c..f6e9ac8b1006 100644 --- a/app-containers/podman/podman-3.4.4.ebuild +++ b/app-containers/podman/podman-3.4.4.ebuild @@ -15,14 +15,13 @@ 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 +cgroup-hybrid +fuse +rootless selinux" +IUSE="apparmor btrfs +fuse +rootless selinux" RESTRICT+=" test" COMMON_DEPEND=" app-crypt/gpgme:= >=app-containers/conmon-2.0.0 - cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) - !cgroup-hybrid? ( app-containers/crun ) + || ( >=app-containers/runc-1.0.0_rc6 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 62f957b6252a..e565620c034c 100644 --- a/app-containers/podman/podman-4.0.2.ebuild +++ b/app-containers/podman/podman-4.0.2.ebuild @@ -15,14 +15,13 @@ 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 cgroup-hybrid +fuse +init +rootless selinux" +IUSE="apparmor btrfs +fuse +init +rootless selinux" RESTRICT+=" test" COMMON_DEPEND=" app-crypt/gpgme:= >=app-containers/conmon-2.0.0 - cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) - !cgroup-hybrid? ( app-containers/crun ) + || ( >=app-containers/runc-1.0.0_rc6 app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=net-misc/cni-plugins-0.8.6 |