From a7413c5d7568ce91b809ed11f84305b1afb468bb Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 14 Feb 2023 17:09:45 +0800 Subject: containerd: update to 1.6.12 Bumping containerd to version v1.6.12-2-gccfc27e30, which comprises the following commits: 3595dd04b fix: check for tmpfs when evaluating if userxattr should be used 1899ebcd8 Prepare release notes for v1.6.12 ec5acd4c1 CRI stream server: Fix goroutine leak in Exec 9743dbae8 [release/1.6] update to go1.18.9 3d24d97ba Prepare release notes for v1.6.11 bb96b21e5 fix: support simultaneous create diff for same parent snapshot 15b541238 Fix order of operations when setting lease labels 9fdf713e5 Added nullptr checks to pkg/cri/server and sbserver 56593cca5 cri: add pod uid annotation 8ec051a6b [release/1.6] go.mod: use golang_protobuf_extensions v1.0.4 e639ecd7c Prepare release notes for v1.6.10 5af8d89ce overlayutils: Add fastpath for userxattr check Signed-off-by: Bruce Ashfield Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- recipes-containers/containerd/containerd-opencontainers_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index e95ca175..5fe3e4fa 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and support as well as checkpoint and restore for cloning and live migration of containers." -SRCREV = "6c41694da9eb09c2f1f49a5a5fbec4e970cfb460" +SRCREV = "ccfc27e30d9f599efe6a7471ea1932dedf2beec8" SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https;destsuffix=git/src/github.com/containerd/containerd \ file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \ @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89" -CONTAINERD_VERSION = "v1.6.9" -CVE_VERSION = "1.6.9" +CONTAINERD_VERSION = "v1.6.12" +CVE_VERSION = "1.6.12" # EXTRA_OEMAKE += "GODEBUG=1" -- cgit v1.2.3-54-g00ecf