From 96588ce42a139798b6450a93c591ac20f60b4a7c Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 14 Aug 2026 17:00:43 +0100 Subject: [PATCH 1/2] app-containers/accelerated-container-image: Bump to 1.4.4, drop old 1.4.3 Signed-off-by: James Le Cuirot --- .../updates/2026-08-14-overlaybd-1.0.18.md | 1 + .../accelerated-container-image/Manifest | 4 +- .../accelerated-container-image-1.4.3.ebuild | 50 ------------------- .../accelerated-container-image-1.4.4.ebuild | 1 + .../accelerated-container-image-9999.ebuild | 5 +- .../accelerated-container-image-go-1.25.patch | 12 ----- 6 files changed, 5 insertions(+), 68 deletions(-) create mode 100644 changelog/updates/2026-08-14-overlaybd-1.0.18.md delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.3.ebuild create mode 120000 sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.4.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/files/accelerated-container-image-go-1.25.patch diff --git a/changelog/updates/2026-08-14-overlaybd-1.0.18.md b/changelog/updates/2026-08-14-overlaybd-1.0.18.md new file mode 100644 index 00000000000..fa4b680c129 --- /dev/null +++ b/changelog/updates/2026-08-14-overlaybd-1.0.18.md @@ -0,0 +1 @@ +- sysext-overlaybd: accelerated-container-image ([1.4.4](https://github.com/containerd/accelerated-container-image/releases/tag/v1.4.4)) 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 index 27396bbb804..9dc79ef45b7 100644 --- 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 @@ -1,2 +1,2 @@ -DIST accelerated-container-image-1.4.3-vendor.tar.xz 3511604 BLAKE2B a090b10825f314d6a43ba89ea52150e721851e4dce04ad358d09cbd1c35bcff9f7d0ed28c2b3573505857b62213bf36bee0b29d3fbd3e8f5d01019373c4162f0 SHA512 54cbe216314fc9cad6c0d3894d8e77ad4e20aaf220bfd5fce63815f5c9462c9244f2858fc32086b85c46284291a343d3d9d5b488972eaadb70f8bd2a2444ab1a -DIST accelerated-container-image-1.4.3.tar.gz 619647 BLAKE2B e88d758039fcce0c53f43948bd4fabd022f4494a392ead77f030398d64dbe01beca20f16ddbf3f4474861960333959b2f9e31d7eb5a8b5854547c06e9ff3da24 SHA512 b96d0c774ae0c86bef3283ff0946acd5e2a58360861b48c66c35cc8fc229c6c5eb99bb5f44cd705eac236fb75c03ad0c6185cd7e043f42448108f0bc59200dc1 +DIST accelerated-container-image-1.4.4-vendor.tar.xz 3472328 BLAKE2B a143734541bbea5281791fc0717c0c9aca149b279ce82a28902eb5dc9b8d7075e5237d0160b2c4004d3f1703746bc46df0c9420f3ab9c57652a375ab889d23e7 SHA512 b9fc2616f0f09202a6be24d5c67e731031ff8304d216e4a4fc9eacf7eaf357a5b93bb865e266f2142aa00b80f7917160b479e83ca15e09ff39676c791fbec362 +DIST accelerated-container-image-1.4.4.tar.gz 620019 BLAKE2B 61c158df5b8b1274f941d2f3746bd7f0695a68a890bd77c29d7627a5b9630a25ad1e3b463d5f350b932ce2feb700970e4302f8f9c59b7bf00472b10bb88a2353 SHA512 4ca7d3426248ee399eab1404bed80bffb37dc9cfd2b49e92ed8152f964744682fb98547e1d555a4cf6f59bf75811c52cbe5bab0e1276c16fe4d8cdbeef11e971 diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.3.ebuild deleted file mode 100644 index b8043c6c1d6..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2025 The Flatcar Container Linux Maintainers -# Distributed under the terms of the Apache License 2.0 - -EAPI=8 - -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" - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/containerd/accelerated-container-image.git" - inherit git-r3 -else - SRC_URI="https://github.com/containerd/accelerated-container-image/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/containerd/accelerated-container-image/releases/download/v${PV}/${P}-vendor.tar.xz" - KEYWORDS="amd64 arm64" -fi - -LICENSE="Apache-2.0" -SLOT="0" - -RDEPEND="sys-fs/overlaybd" - -PATCHES=( - "${FILESDIR}"/${PN}-go-1.25.patch -) - -src_unpack() { - [[ ${PV} == 9999* ]] && git-r3_src_unpack - go-module_src_unpack -} - -src_install() { - emake install \ - DESTDIR="${ED}" \ - SN_DESTDIR="${ED}/usr/local/overlaybd/snapshotter" \ - SN_CFGDIR="${ED}/usr/local/overlaybd/snapshotter/etc" - - 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) - dotmpfiles "${FILESDIR}/10-overlaybd-snapshotter.conf" - - systemd_dounit "${ED}/usr/local/overlaybd/snapshotter/overlaybd-snapshotter.service" - systemd_enable_service "multi-user.target" "overlaybd-snapshotter.service" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.4.ebuild new file mode 120000 index 00000000000..42c3dd5fcc7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.4.ebuild @@ -0,0 +1 @@ +accelerated-container-image-9999.ebuild \ No newline at end of file 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 b8043c6c1d6..21e57cc1dbb 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 @@ -20,12 +20,9 @@ fi LICENSE="Apache-2.0" SLOT="0" +BDEPEND=">=dev-lang/go-1.26.3" RDEPEND="sys-fs/overlaybd" -PATCHES=( - "${FILESDIR}"/${PN}-go-1.25.patch -) - src_unpack() { [[ ${PV} == 9999* ]] && git-r3_src_unpack go-module_src_unpack diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/files/accelerated-container-image-go-1.25.patch b/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/files/accelerated-container-image-go-1.25.patch deleted file mode 100644 index 84d9d11be06..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/accelerated-container-image/files/accelerated-container-image-go-1.25.patch +++ /dev/null @@ -1,12 +0,0 @@ -Flatcar is not quite ready for 1.26 yet. - ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/containerd/accelerated-container-image - --go 1.26.0 -+go 1.25.0 - - require ( - github.com/containerd/containerd/api v1.8.0 From e40f5032a176d0337d28d6cd37fb83d91417293a Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 14 Aug 2026 17:24:52 +0100 Subject: [PATCH 2/2] sys-fs/overlaybd: Bump to 1.0.18, drop old 1.0.17 This version introduces some kind of resizing features, but that requires the bundled e2fs, and I don't think we need it. Signed-off-by: James Le Cuirot --- .../updates/2026-08-14-overlaybd-1.0.18.md | 1 + .../coreos-overlay/sys-fs/overlaybd/Manifest | 4 +-- ...n-after-fetching-to-fix-cross-issues.patch | 2 +- .../files/0002-photon-no-resize.patch | 30 +++++++++++++++++++ ...-1.0.17.ebuild => overlaybd-1.0.18.ebuild} | 0 .../sys-fs/overlaybd/overlaybd-9999.ebuild | 3 +- 6 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0002-photon-no-resize.patch rename sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/{overlaybd-1.0.17.ebuild => overlaybd-1.0.18.ebuild} (100%) diff --git a/changelog/updates/2026-08-14-overlaybd-1.0.18.md b/changelog/updates/2026-08-14-overlaybd-1.0.18.md index fa4b680c129..defc055770e 100644 --- a/changelog/updates/2026-08-14-overlaybd-1.0.18.md +++ b/changelog/updates/2026-08-14-overlaybd-1.0.18.md @@ -1 +1,2 @@ - sysext-overlaybd: accelerated-container-image ([1.4.4](https://github.com/containerd/accelerated-container-image/releases/tag/v1.4.4)) +- sysext-overlaybd: overlaybd ([1.0.18](https://github.com/containerd/overlaybd/releases/tag/v1.0.18)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/Manifest index bf15633abff..e0bdb52ee6d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/Manifest @@ -1,5 +1,5 @@ -DIST PhotonLibOS-v0.6.17.tar.gz 1056709 BLAKE2B 47a9f2e484ba09fdd5c879a0a78a659a18404e8ac4b699cfc67f5022f893e2b8467fc4232917d65df147f694c57b0b4b0e8030e63d13b57110361fa61313a381 SHA512 8d03a18d53dbe197268c550dc55c01bbec0a1bd678a337a2e1f1ed62ed2e2aa6114dab211b82eec2ef719d2bd4e3d569b8d37e78fe27d725be2dcc56ad398b70 +DIST PhotonLibOS-0178d14499d8639759a81e32ad58da5226df5e9b.tar.gz 1058675 BLAKE2B 8f8afa3cb4a1fd6e89cf34ae6bdb1278505f57e612bd7f48ad02e3e6908b3c511c3c5e7d43374392c178dc46a999fc14d667f5889e40838570ee2638240573b6 SHA512 1e036fd266c1ee683e48b2cb3da8baeb6a2e869201c576a36ce0e9cb7f1c178abcf19086b098bab07eeffc3ddaa1f47aaa386bf0cb00c4bfbbe29b27082f37e3 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.17.tar.gz 726534 BLAKE2B ba7ada8b6cdcfdc0be96309ae6638a781798f0298cbd4f89b847cd6e59539e7271309b6730e8877b98a950456466c18d902e82a6bcf07f0b14b54166b2fbaf02 SHA512 2a5001e06f2e83c37db4d37c3b91097cb7b3c7685a690904514fe620de53d32847fd4295f341435c9f3f03e530f89f85954ca90603790247a564402a8ab43d62 +DIST overlaybd-1.0.18.tar.gz 746639 BLAKE2B 41b5e3d6abdea6d213d54f7205bf1b5d1c5e46c781ca85c68d3a3ca19b62236bb8a44c3cda29f811ff1f1063c8b2b90567c4cb0208bb7a89566f5bc9d000abef SHA512 12ed54c8423081b426087f30c8622fe4a2bb7879b17666bfd7b6776723f8c3359102639ccf50b337909a4c19d3483148863cb51dd963f02fa0e088e909fed499 DIST photon-libtcmu-813fd65361bb2f348726b9c41478a44211847614.tar.gz 39008 BLAKE2B ff422842e4433e41f2e4dad6fc73134321f79557c64f4a42576830f95ca191f7d80d7aea5454dea893eb65c1141d90d7a31ed823282b1c0629720533a016f873 SHA512 f92ed165610f6434b5089e7b93754debd70745bd387fe33e88b444bc3c73696c8124513753668269d9ec6dc07a1d6ae4d2cc235778f1461664175ca3517fd013 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0001-Patch-Photon-after-fetching-to-fix-cross-issues.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0001-Patch-Photon-after-fetching-to-fix-cross-issues.patch index 2b709a935a8..62e6b9a2986 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0001-Patch-Photon-after-fetching-to-fix-cross-issues.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0001-Patch-Photon-after-fetching-to-fix-cross-issues.patch @@ -15,7 +15,7 @@ index c905bd9..5507f66 100644 @@ -6,6 +6,7 @@ FetchContent_Declare( photon GIT_REPOSITORY https://github.com/alibaba/PhotonLibOS.git - GIT_TAG v0.6.17 + GIT_TAG 0178d14499d8639759a81e32ad58da5226df5e9b + PATCH_COMMAND patch -p1 -i @FILESDIR@/photon-cross.patch ) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0002-photon-no-resize.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0002-photon-no-resize.patch new file mode 100644 index 00000000000..5aa0ea41d0c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0002-photon-no-resize.patch @@ -0,0 +1,30 @@ +https://github.com/containerd/overlaybd/pull/444 + +From bc3b72c451bf5b54b9ab926bf2f3a33e5b91cead Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Fri, 14 Aug 2026 17:14:20 +0100 +Subject: [PATCH] Disable resize support in Photon when building with an + external e2fs + +Otherwise the build will fail. + +Signed-off-by: James Le Cuirot +--- a/CMake/Findphoton.cmake ++++ b/CMake/Findphoton.cmake +@@ -1,8 +1,11 @@ + include(FetchContent) + set(FETCHCONTENT_QUIET false) + set(PHOTON_ENABLE_EXTFS ON) +-set(PHOTON_ENABLE_RESIZE ON) +-add_definitions(-DPHOTON_ENABLE_RESIZE) ++ ++if(NOT ORIGIN_EXT2FS) ++ set(PHOTON_ENABLE_RESIZE ON) ++ add_definitions(-DPHOTON_ENABLE_RESIZE) ++endif() + + FetchContent_Declare( + photon +-- +2.55.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-1.0.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-1.0.18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-1.0.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-1.0.18.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild index 6ece1759de1..a2417124790 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then RESTRICT="network-sandbox" else EROFS_UTILS_COMMIT="eec6f7a2755dfccc8f655aa37cf6f26db9164e60" - PHOTON_COMMIT="v0.6.17" + PHOTON_COMMIT="0178d14499d8639759a81e32ad58da5226df5e9b" TCMU_COMMIT="813fd65361bb2f348726b9c41478a44211847614" OCF_COMMIT="c2dd2259e47c2e5e72dc77f99d0150a5d05496d7" SRC_URI="https://github.com/containerd/overlaybd/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz @@ -60,6 +60,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/0001-Patch-Photon-after-fetching-to-fix-cross-issues.patch + "${FILESDIR}"/0002-photon-no-resize.patch ) src_prepare() {