-
Notifications
You must be signed in to change notification settings - Fork 112
Bump overlaybd to 1.0.18 and accelerated-container-image to 1.4.4 #4219
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +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)) |
4 changes: 2 additions & 2 deletions
4
...tainer/src/third_party/coreos-overlay/app-containers/accelerated-container-image/Manifest
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
50 changes: 0 additions & 50 deletions
50
...erlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.3.ebuild
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
...erlay/app-containers/accelerated-container-image/accelerated-container-image-1.4.4.ebuild
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| accelerated-container-image-9999.ebuild |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
...pp-containers/accelerated-container-image/files/accelerated-container-image-go-1.25.patch
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/Manifest
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
...ntainer/src/third_party/coreos-overlay/sys-fs/overlaybd/files/0002-photon-no-resize.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| https://github.com/containerd/overlaybd/pull/444 | ||
|
|
||
| From bc3b72c451bf5b54b9ab926bf2f3a33e5b91cead Mon Sep 17 00:00:00 2001 | ||
| From: James Le Cuirot <jlecuirot@microsoft.com> | ||
| 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 <jlecuirot@microsoft.com> | ||
| --- 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 | ||
|
|
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.