From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57BDB15808B for ; Sat, 26 Mar 2022 01:41:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86E6AE07ED; Sat, 26 Mar 2022 01:41:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66F4CE07ED for ; Sat, 26 Mar 2022 01:41:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5699434353F for ; Sat, 26 Mar 2022 01:41:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C80C5250 for ; Sat, 26 Mar 2022 01:41:54 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1648258910.09749f23e7eb708f0f26c57a47cbb899595ffe99.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/podman/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/podman/metadata.xml app-containers/podman/podman-3.4.4.ebuild app-containers/podman/podman-4.0.2.ebuild X-VCS-Directories: app-containers/podman/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 09749f23e7eb708f0f26c57a47cbb899595ffe99 X-VCS-Branch: master Date: Sat, 26 Mar 2022 01:41:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 29076625-4afd-483f-88b6-6b81a0b9ef6c X-Archives-Hash: 18540e04c9043baf63e02d8282564cdf commit: 09749f23e7eb708f0f26c57a47cbb899595ffe99 Author: Zac Medico gentoo org> AuthorDate: Sat Mar 26 01:39:06 2022 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 26 01:41:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09749f23 app-containers/podman: add cgroup-hybrid USE flag Closes: https://bugs.gentoo.org/763267 Signed-off-by: Zac Medico gentoo.org> app-containers/podman/metadata.xml | 3 +++ app-containers/podman/podman-3.4.4.ebuild | 5 +++-- 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. + + Default to hybrid (legacy) cgroup hierarchy instead of unified (modern). + 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