From 8a0da2857b78cb228d7cc89b05ed7d960bcbd023 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Fri, 14 May 2021 08:27:43 +0000 Subject: [PATCH] app-emulation: Upgrade Containerd 1.4.4 to 1.5.1 --- .../coreos-overlay/app-emulation/containerd/Manifest | 2 +- .../{containerd-1.4.4.ebuild => containerd-1.5.1.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-19.03.ebuild | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.4.4.ebuild => containerd-1.5.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest index 37bd12558b..fd36a22143 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest @@ -1,2 +1,2 @@ DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6 -DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070 +DIST containerd-1.5.1.tar.gz 7667133 BLAKE2B 03884395f66e7ff52b23719b5c63c9b57070e4b47084be37d0e00aa08d4bb3f8aff13ffa2073dbba82253b0a730954ed32fe12fc00df17d315020203b82e29ae SHA512 8ba67a0e00eb6d63f1ecc8cf9d20f0beae86a816a837c99f24cafbb8ebabe32ce91c8d96c4240da34edbade7cd2020327a1d33a1d8e57fb216f764d44910b999 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.4.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 2e78c7589d..b8d6eb053b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/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="afe869032ad2d672098b7c4feec3caba6ea83930" + CONTAINERD_COMMIT="8adc8a983ee0775b61e5613d33ed8f6f4c5d8d81" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit vcs-snapshot diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild index 57bd29f0ec..e644d62781 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild @@ -12,7 +12,7 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" ~app-emulation/docker-19.03.15 - ~app-emulation/containerd-1.4.4 + ~app-emulation/containerd-1.5.1 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc93 =dev-libs/libltdl-2.4.6