Merge pull request #3620 from flatcar/chewi/non-live-overlaybd

Build overlaybd and accelerated-container-image entirely offline

Author: chewi

.github/workflows/portage-stable-packages-list

@@ -291,6 +291,7 @@ dev-libs/openssl
 dev-libs/popt
 dev-libs/protobuf
 dev-libs/raft
+dev-libs/rapidjson
 dev-libs/tree-sitter
 dev-libs/tree-sitter-bash
 dev-libs/userspace-rcu

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

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"

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask

@@ -28,3 +28,6 @@ app-emulation/qemu X
 # disable all tools for NVIDIA driver, keep just kmods
 x11-drivers/nvidia-drivers tools X static-libs
 x11-drivers/old-nvidia-drivers tools X static-libs
+
+# We don't maintain the tarballs needed to build these features offline.
+<sys-fs/overlaybd-9999 dsa isal

sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/Manifest

@@ -0,0 +1,5 @@
+DIST PhotonLibOS-v0.6.17.tar.gz 1056709 BLAKE2B 47a9f2e484ba09fdd5c879a0a78a659a18404e8ac4b699cfc67f5022f893e2b8467fc4232917d65df147f694c57b0b4b0e8030e63d13b57110361fa61313a381 SHA512 8d03a18d53dbe197268c550dc55c01bbec0a1bd678a337a2e1f1ed62ed2e2aa6114dab211b82eec2ef719d2bd4e3d569b8d37e78fe27d725be2dcc56ad398b70
+DIST erofs-utils-eec6f7a2755dfccc8f655aa37cf6f26db9164e60.tar.gz 186465 BLAKE2B 4731cd2fe41bad44c655f52106f02c6fe0852fc6c169542af20c0a3fe4502d7df86c8402524c7cc9bb3034c44ea6a9e8ac1ccee649d571916432cef4bfbef909 SHA512 cdd391ec7b0996542061f12bc7ebfb69663373742e52166c7c269e3fa1d18d0b2aada68a826e2e963913089a42fcdbb96c0730aa9b9e1bc44b6d0ca9a7db12f6
+DIST ocf-c2dd2259e47c2e5e72dc77f99d0150a5d05496d7.tar.gz 364310 BLAKE2B 4b908173db214d578bb8caa172cf3efe765b88e543f56d71bdc525b4565f304f7dc3d58d7b7a496b2150d1fa6107778d50e15159e0e05b7768afbd697acf080e SHA512 d8cb21e8e2372e40301714e7a0e30c2d8c0e7a9067fe90e06c5b36428dc5acf51754d0e005e876e190d50c35105f45cd24737976a602ccd501dd7bd12d75de53
+DIST overlaybd-1.0.16.tar.gz 713290 BLAKE2B 76bd981395e81ea3f0dcc4f048e6c4c2da2025304cbee22201da289431c6c018267142e8664cba8104ac55e14a778b90a8aa29b01e4313f095d25f12cd505085 SHA512 2a14b4ec0016cdf0b55f93abd8b5bea4ccf1e53527f0bae41bb912a039517ae819acde2b1f20847cbe6c1db119fcadd76b90f9832cc6551ccd3c3ee0ca13ca6f
+DIST photon-libtcmu-813fd65361bb2f348726b9c41478a44211847614.tar.gz 39008 BLAKE2B ff422842e4433e41f2e4dad6fc73134321f79557c64f4a42576830f95ca191f7d80d7aea5454dea893eb65c1141d90d7a31ed823282b1c0629720533a016f873 SHA512 f92ed165610f6434b5089e7b93754debd70745bd387fe33e88b444bc3c73696c8124513753668269d9ec6dc07a1d6ae4d2cc235778f1461664175ca3517fd013