From f902ada8d7a45efff9ba09fc5965bf71a0b7e581 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 31 Mar 2025 07:05:15 +0000 Subject: [PATCH] app-containers/containers-common: Sync with Gentoo It's from Gentoo commit 8c140b60b9afa590724755bc1619c135cf83984f. --- .../app-containers/containers-common/Manifest | 1 + .../containers-common-0.62.2.ebuild | 83 +++++++++++++++++++ .../containers-common-9999.ebuild | 12 ++- 3 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.62.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/Manifest index 4d45605d60..f2e2c4b5cd 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/Manifest @@ -1 +1,2 @@ DIST containers-common-0.60.4.tar.gz 13106900 BLAKE2B 1afb428044bc8eebd002b884f2a2072971cd83fca561fd509b83088ccdf82b3a62d63ff32ec5ef856c3d0ee0ffac316201fa8f1d7956153ce30e2244cc860f02 SHA512 5d61415d4959486223a36ff98304363a558e6da9ccbdca94f976649a37d404ac00c8454019f60a79360029c91c9565d22868b109dbb84c19f13377e0e23dcc4d +DIST containers-common-0.62.2.tar.gz 13367528 BLAKE2B 05a16b12cdf89263836df4b4d09ff7b12aba758a08c4f85a0c124dfb378a28fcb33dc6fa41adc81b33e4c3b0949344cc18af5537d3b741bdd07498e7b13e52be SHA512 5e4b6bc6df79e75e5360130ef7b837e216c05955e03968b8df44997c4d88fc095e5ab2ed5db716edaccfb912063d29ba54460231ae5907413da3b6f9771d095e diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.62.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.62.2.ebuild new file mode 100644 index 0000000000..d4f8c24462 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-0.62.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 + +DESCRIPTION="Common config files and docs for Containers stack" +HOMEPAGE="https://github.com/containers/common" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/common.git" +else + SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P#containers-}" + KEYWORDS="~amd64 ~arm64 ~loong ~riscv" +fi + +LICENSE="Apache-2.0" +SLOT="0" +RESTRICT="test" +RDEPEND=" + >=app-containers/aardvark-dns-1.12.0 + >=app-containers/crun-1.17 + >=app-containers/containers-image-5.32.0 + >=app-containers/containers-storage-1.55.0 + app-containers/containers-shortnames + >=app-containers/netavark-1.12.0 + net-firewall/nftables + net-firewall/iptables[nftables] + >=net-misc/passt-2024.09.06 + >=sys-fs/fuse-overlayfs-1.14 +" + +BDEPEND=" + >=dev-go/go-md2man-2.0.3 +" + +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 \n +usermod --add-subgids 1065536-1131071 \n +" + +src_prepare() { + default + + [[ -f docs/Makefile && -f Makefile ]] || die + sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die +} + +src_compile() { + emake docs + touch {images,layers}.lock || die +} + +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,oci/hooks.d,networks,systemd} /var/lib/containers/sigstore \ + /usr/lib/containers/storage + diropts -m0700 + dodir /usr/lib/containers/storage/overlay-{images,layers} + for i in images layers; do + insinto /usr/lib/containers/storage/overlay-"${i}" + doins "${i}".lock + done +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-9999.ebuild index 985ebb5c0c..d4f8c24462 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-common/containers-common-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -58,6 +58,7 @@ src_prepare() { src_compile() { emake docs + touch {images,layers}.lock || die } src_install() { @@ -67,7 +68,14 @@ src_install() { 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 + keepdir /etc/containers/{certs.d,oci/hooks.d,networks,systemd} /var/lib/containers/sigstore \ + /usr/lib/containers/storage + diropts -m0700 + dodir /usr/lib/containers/storage/overlay-{images,layers} + for i in images layers; do + insinto /usr/lib/containers/storage/overlay-"${i}" + doins "${i}".lock + done } pkg_postinst() {