From acc72feb6a017849ed9378ec03a9f4cd1c4a4012 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 7 Jan 2026 14:37:59 +0000 Subject: [PATCH] app-containers/accelerated-container-image: Use offline vendor tarball I have submitted a PR upstream so that they can automatically create a vendor tarball with each release. In the meantime, I have hosted one in my Gentoo dev space. Signed-off-by: James Le Cuirot --- .../accelerated-container-image/Manifest | 2 ++ .../accelerated-container-image-9999.ebuild | 22 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/Manifest diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/Manifest b/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/Manifest new file mode 100644 index 0000000000..8e0073ba89 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/Manifest @@ -0,0 +1,2 @@ +DIST accelerated-container-image-1.3.0-vendor.tar.xz 3202404 BLAKE2B bb7a8e54bb5c959be80b6db88f59885c1e5b4cd88c1faceb647381879cdfab0383bc747d12521d52dc8e977574c14069bee41b98ce302b9c39d1c8ff02799476 SHA512 39514193018fc55629c660b22d1935cbbd31f56492276aa34cefe2679baba6e705183f6322981bdd1ace28d003c2912b47c9a85a703383afffa399d69d81caf3 +DIST accelerated-container-image-1.3.0.tar.gz 607982 BLAKE2B 544e17c76f4f8787713cfedd6416df2008c7282b66d1ab3987f952a5c8341edaaa7c58c56c8c37c3e331e491bb679356802b523aa58b2df03a4344f19e6ef645 SHA512 0b24970baf3d2ca38bb3860498320a05d134fb6e36c5d59c115e8331bb483e0fc14c261950e08de9aad9fe056028b850cba78a964ba06b6c7f601b3a937f3b07 diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-9999.ebuild index ad12a62f36..f49fca02e3 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-9999.ebuild @@ -3,31 +3,27 @@ EAPI=8 -inherit git-r3 go-module systemd tmpfiles +inherit go-module systemd tmpfiles DESCRIPTION="Remote container image format (overlaybd) and snapshotter based on block-device" HOMEPAGE="https://github.com/containerd/accelerated-container-image" -EGIT_REPO_URI="https://github.com/containerd/accelerated-container-image.git" if [[ ${PV} == 9999* ]]; then - KEYWORDS="~amd64 ~arm64" + EGIT_REPO_URI="https://github.com/containerd/accelerated-container-image.git" + inherit git-r3 else - EGIT_COMMIT="v${PV}" + SRC_URI="https://github.com/containerd/accelerated-container-image/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~chewi/distfiles/${P}-vendor.tar.xz" KEYWORDS="amd64 arm64" fi LICENSE="Apache-2.0" SLOT="0" -# FIXME HACK ALERT: the build pulls go modules during src_compile. -# This fails if network sandbox is enabled. -RESTRICT="${RESTRICT} network-sandbox" - - RDEPEND="sys-fs/overlaybd" src_unpack() { - git-r3_src_unpack + [[ ${PV} == 9999* ]] && git-r3_src_unpack go-module_src_unpack } @@ -40,9 +36,9 @@ src_install() { sed -i 's,/opt/overlaybd,/usr/local/overlaybd,' \ "${ED}/usr/local/overlaybd/snapshotter/overlaybd-snapshotter.service" || die - # tmpfiles will take care of symlinking /usr/local/overlaybd/snapshotter - # to /opt/overlaybd/snapshotter, where upstream expects the binaries. - # (we need them in /usr to be used in a sysext) + # tmpfiles will take care of symlinking /usr/local/overlaybd/snapshotter + # to /opt/overlaybd/snapshotter, where upstream expects the binaries. + # (we need them in /usr to be used in a sysext) dotmpfiles "${FILESDIR}/10-overlaybd-snapshotter.conf" systemd_dounit "${ED}/usr/local/overlaybd/snapshotter/overlaybd-snapshotter.service"