Merge pull request #527 from flatcar-linux/containerd-1.3.7-main

Upgrade Containerd in main from 1.3.6 to 1.3.7
This commit is contained in:
Dongsu Park 2020-08-17 17:23:20 +02:00 committed by GitHub
commit b6a4219641
4 changed files with 3 additions and 3 deletions

View File

@ -1,3 +1,3 @@
DIST containerd-0.2.5.tar.gz 1003500 BLAKE2B ef08782b068e1d81df34881bdd156e7aa387d2710aee9b9c3b05a3d7cb018b7f78aab0aec77640823d8976636265e18ffc69abc25a4c326180b2c18c00059a4c SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f
DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6
DIST containerd-1.3.6.tar.gz 5703443 BLAKE2B f1efaad7c4942232ddb788c8241621ca1805c55b6bf4a3a4deb290c002a03cd707856623456597c60367ebb4471302d7abe270b855513ab41cb579a664e54f62 SHA512 2d40f925a724d87a8288060037622ba24be81df2734ba08418aa33534dac9265455e1c64244880b4de82074887cd5e19442da5abb6f1f32d1a5ad42c8f082d81
DIST containerd-1.3.7.tar.gz 5705842 BLAKE2B 8ca9d6d5d85cd5ede14afc09ea4909988f442df9ba92c21cadc77fbd7ff748666ff07f05dd400671e4442149d885dd0586679c2ab6423992ddb447e3a8d0d94f SHA512 dab23d75b3c7cb5aa766f7424d0b1d2a3e316b926ad58426d062fb6d24a998df96ceb1d92bacceee93ff908ee22401e4bb7730cf9674c81766927858c106ba76

View File

@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
else
MY_PV="${PV/_rc/-rc.}"
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="10dae48e3f1d19abf368873c87047e6d1581b204"
CONTAINERD_COMMIT="40779f9760e207feb7ff24cf21236bf5e63b2b17"
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.12
~app-emulation/containerd-1.3.6
~app-emulation/containerd-1.3.7
~app-emulation/docker-proxy-0.8.0_p20180709
~app-emulation/docker-runc-1.0.0_rc90
=dev-libs/libltdl-2.4.6