commit: 761d7abab7f427b3c361991518ee751a2ab5f860 Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks> AuthorDate: Wed Mar 20 20:34:50 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 23 08:29:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761d7aba
app-containers/containers-common: 0.58.0-r1 aligning with Podman 5 Podman 5 drops support for CNI, runc and slirp4netns Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks> Signed-off-by: Sam James <sam <AT> gentoo.org> ...9.ebuild => containers-common-0.58.0-r1.ebuild} | 29 ++++++++++++++++------ .../containers-common-9999.ebuild | 29 ++++++++++++++++------ 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/app-containers/containers-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-0.58.0-r1.ebuild similarity index 63% copy from app-containers/containers-common/containers-common-9999.ebuild copy to app-containers/containers-common/containers-common-0.58.0-r1.ebuild index c4d53773f1d9..4a0427e20df7 100644 --- a/app-containers/containers-common/containers-common-9999.ebuild +++ b/app-containers/containers-common/containers-common-0.58.0-r1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit readme.gentoo-r1 + DESCRIPTION="Common config files and docs for Containers stack" HOMEPAGE="https://github.com/containers/common"; @@ -19,16 +21,16 @@ LICENSE="Apache-2.0" SLOT="0" RESTRICT="test" RDEPEND=" - app-containers/containers-image - app-containers/containers-storage + >=app-containers/aardvark-dns-1.10.0 + >=app-containers/crun-1.14.3 + >=app-containers/containers-image-5.30.0 + >=app-containers/containers-storage-1.53.0 app-containers/containers-shortnames + >=app-containers/netavark-1.10.3 net-firewall/nftables net-firewall/iptables[nftables] - || ( app-containers/crun app-containers/runc ) - || ( - ( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) - >=app-containers/cni-plugins-0.9.1 - ) + >=net-misc/passt-2024.03.20 + >=sys-fs/fuse-overlayfs-1.13 " BDEPEND=" @@ -39,6 +41,14 @@ PATCHES=( "${FILESDIR}/examplify-mounts-conf.patch" ) +DOC_CONTENTS="\n +For rootless operations, one needs to configure subuid(5) and subgid(5)\n +See /etc/sub{uid,gid} to check whether rootless user is already configured\n +If not, quickly configure it with:\n +usermod --add-subuids 1065536-1131071 <rootless user>\n +usermod --add-subgids 1065536-1131071 <rootless user>\n +" + src_prepare() { default @@ -52,9 +62,14 @@ src_compile() { src_install() { emake DESTDIR="${ED}" install + readme.gentoo_create_doc insinto /usr/share/containers doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore } + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-containers/containers-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild index c4d53773f1d9..4a0427e20df7 100644 --- a/app-containers/containers-common/containers-common-9999.ebuild +++ b/app-containers/containers-common/containers-common-9999.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit readme.gentoo-r1 + DESCRIPTION="Common config files and docs for Containers stack" HOMEPAGE="https://github.com/containers/common"; @@ -19,16 +21,16 @@ LICENSE="Apache-2.0" SLOT="0" RESTRICT="test" RDEPEND=" - app-containers/containers-image - app-containers/containers-storage + >=app-containers/aardvark-dns-1.10.0 + >=app-containers/crun-1.14.3 + >=app-containers/containers-image-5.30.0 + >=app-containers/containers-storage-1.53.0 app-containers/containers-shortnames + >=app-containers/netavark-1.10.3 net-firewall/nftables net-firewall/iptables[nftables] - || ( app-containers/crun app-containers/runc ) - || ( - ( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) - >=app-containers/cni-plugins-0.9.1 - ) + >=net-misc/passt-2024.03.20 + >=sys-fs/fuse-overlayfs-1.13 " BDEPEND=" @@ -39,6 +41,14 @@ PATCHES=( "${FILESDIR}/examplify-mounts-conf.patch" ) +DOC_CONTENTS="\n +For rootless operations, one needs to configure subuid(5) and subgid(5)\n +See /etc/sub{uid,gid} to check whether rootless user is already configured\n +If not, quickly configure it with:\n +usermod --add-subuids 1065536-1131071 <rootless user>\n +usermod --add-subgids 1065536-1131071 <rootless user>\n +" + src_prepare() { default @@ -52,9 +62,14 @@ src_compile() { src_install() { emake DESTDIR="${ED}" install + readme.gentoo_create_doc insinto /usr/share/containers doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore } + +pkg_postinst() { + readme.gentoo_print_elog +}
