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 DB1ED15808B for ; Fri, 25 Mar 2022 03:53:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15ED1E0863; Fri, 25 Mar 2022 03:53:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 F17B3E0863 for ; Fri, 25 Mar 2022 03:53:46 +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 CB9D8342A50 for ; Fri, 25 Mar 2022 03:53:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4CAEC250 for ; Fri, 25 Mar 2022 03:53:44 +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: <1648180416.fe26469c2047f321138e5dc1f475b7fa786d37ae.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: fe26469c2047f321138e5dc1f475b7fa786d37ae X-VCS-Branch: master Date: Fri, 25 Mar 2022 03:53:44 +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: c8f20eba-69ac-41b1-b814-7b0a1641fb70 X-Archives-Hash: 78684d98cc5d3ac5c4d0103d955703bd commit: fe26469c2047f321138e5dc1f475b7fa786d37ae Author: Zac Medico gentoo org> AuthorDate: Fri Mar 25 03:52:51 2022 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Mar 25 03:53:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe26469c 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 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, 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. - - 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 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