Merge pull request #1112 from kinvolk/containerd-1.5.3-main

Upgrade Containerd in main from 1.5.2 to 1.5.3
This commit is contained in:
Mathieu Tortuyaux 2021-07-16 15:52:27 +02:00 committed by GitHub
commit abd1e615c0
4 changed files with 3 additions and 3 deletions

View File

@ -1,2 +1,2 @@
DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6
DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26 SHA512 e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
DIST containerd-1.5.3.tar.gz 7674357 BLAKE2B e48e133786dede13197f1763d2b6c5dd30ef71ebfde637631cc75d853c80ca71f938133e51d83fe28517dd15d3c2cda1572b629f108560cef59dd2f254b360fc SHA512 38054e6851b288023452ff8b00b7fa8d621c28e6ea1e82428b7449346d7112ee7a55c238e658cf30e1d6eb7f3dc8480a863e17bdb355234d9798226636f7e872

View File

@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
else
MY_PV="${PV/_rc/-rc.}"
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="ba879f88b5794a1407e5edf9b0df9cf63d4b2bd0"
CONTAINERD_COMMIT="064765b559584b2a184099254f93d3a31be69d02"
SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64"
inherit vcs-snapshot

View File

@ -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.5.2
~app-emulation/containerd-1.5.3
~app-emulation/docker-proxy-0.8.0_p20180709
~app-emulation/docker-runc-1.0.0
=dev-libs/libltdl-2.4.6