containerd: update to v1.5.x series

Bumping containerd to the 1.5.x development series.

We refresh patches and add new build dependencies, but otherwise
the overall structure is the same.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 20 insertions, 25 deletions

diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index efa3626f..c0145b7b 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -5,8 +5,8 @@ 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 = "33d90b72d1e44987118ac111d4f7a108d412099b"
-SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \
+SRCREV = "6ef0d383e360e1c13be75656df83612bda0775fe"
+SRC_URI = "git://github.com/containerd/containerd;branch=master \
            file://0001-build-use-oe-provided-GO-and-flags.patch \
            file://0001-Add-build-option-GODEBUG-1.patch \
           "
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "v1.4.3"
+CONTAINERD_VERSION = "v1.5.0-rc"
 
 EXTRA_OEMAKE += "GODEBUG=1"
 
@@ -53,7 +53,8 @@ do_compile() {
     for c in content timeout ttrpcutil oom stdio process errdefs fs images mount snapshots linux api runtimes defaults progress \
                      protobuf reference diff platforms runtime remotes version archive dialer gc metadata \
                      metrics filters identifiers labels leases plugin server services \
-                     cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp; do
+                     cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \
+                     cap cri userns atomic ioutil os registrar seutil runtimeoptions netns; do
         if [ -d ${S}/src/import/${c} ]; then
             ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c}
         fi
diff --git a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
index a58feed1..544881ef 100644
--- a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
+++ b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
@@ -14,9 +14,18 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
 
 Index: git/src/import/Makefile
 ===================================================================
---- git.orig/src/import/Makefile        2020-10-12 07:36:18.775820388 -0700
-+++ git/src/import/Makefile     2020-10-12 08:00:05.134151221 -0700
-@@ -163,19 +163,19 @@
+--- git.orig/src/import/Makefile
++++ git/src/import/Makefile
+@@ -121,7 +121,7 @@
+ TESTFLAGS_PARALLEL ?= 8
+ 
+ # Use this to replace `go test` with, for instance, `gotestsum`
+-GOTEST ?= go test
++GOTEST ?= $(GO) test
+ 
+ OUTPUTDIR = $(join $(ROOTDIR), _output)
+ CRIDIR=$(OUTPUTDIR)/cri
+@@ -169,7 +169,7 @@
  
  build: ## build the go packages
         @echo "$(WHALE) $@"
@@ -25,31 +34,16 @@ Index: git/src/import/Makefile
  
  test: ## run tests, except integration tests and tests that require root
         @echo "$(WHALE) $@"
--       @go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES})
-+       @$(GO) test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES})
- 
- root-test: ## run tests, except integration tests
-        @echo "$(WHALE) $@"
--       @go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root
-+       @$(GO) test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root
- 
- integration: ## run integration tests
-        @echo "$(WHALE) $@"
--       @go test ${TESTFLAGS} -test.root -parallel ${TESTFLAGS_PARALLEL}
-+       @$(GO) test ${TESTFLAGS} -test.root -parallel ${TESTFLAGS_PARALLEL}
- 
- benchmark: ## run benchmarks tests
-        @echo "$(WHALE) $@"
-@@ -185,7 +185,7 @@
+@@ -201,7 +201,7 @@
  
- define BUILD_BINARY =
+ define BUILD_BINARY
  @echo "$(WHALE) $@"
 -@go build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} ${GO_TAGS}  ./$<
 +@$(GO) build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} ${GO_TAGS}  ./$<
  endef
  
  # Build a binary from a cmd.
-@@ -194,15 +194,15 @@
+@@ -210,15 +210,15 @@
  
  bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
         @echo "$(WHALE) bin/containerd-shim"