Merge pull request #1148 from kinvolk/containerd-1.5.5-main

Upgrade Containerd in main from 1.5.4 to 1.5.5
flatcar-archive · Aug 13, 2021 · 76e4b18 · 76e4b18
2 parents 4d92d61 + e8e0ff6
commit 76e4b18
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
@@ -1,2 +1,2 @@
 DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6
-DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
+DIST containerd-1.5.5.tar.gz 7711631 BLAKE2B 3777db6e7348500b27e8cff799d977d556d1956c097831c3a532791c629997c1f72b2f55db142b5659a253750422ede23a4179633b54226be1b95d96ac26367b SHA512 8ee5aa1d35e76238fd8707bff6b7eedb7931e6489d49b6907a8e190b076fe6fd95ae5e85ecea1605adb7fcd4f3ae0e926696f1d2f3c0d12b61e6df906929b9eb
diff --git a/...ion/containerd/containerd-1.5.4-r1.ebuild → ...lation/containerd/containerd-1.5.5.ebuild b/...ion/containerd/containerd-1.5.4-r1.ebuild → ...lation/containerd/containerd-1.5.5.ebuild
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc.}"
 	EGIT_COMMIT="v${MY_PV}"
-	CONTAINERD_COMMIT="69a4a55aa42353c71aae40e5bb27a412d8e3149b"
+	CONTAINERD_COMMIT="d9768bd283183fc51cc587249530adc3fa43ebbb"
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot

diff --git a/app-torcx/docker/docker-20.10.ebuild b/app-torcx/docker/docker-20.10.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64"
 RDEPEND="
 	~app-emulation/docker-20.10.7
 	~app-emulation/docker-cli-20.10.7
-	~app-emulation/containerd-1.5.4
+	~app-emulation/containerd-1.5.5
 	~app-emulation/docker-proxy-0.8.0_p20210525
 	~app-emulation/docker-runc-1.0.1
 	=dev-libs/libltdl-2.4.6