containerd: consolidate to "containerd"

We no longer need the split between container-docker and
containerd-opencontainers and dependent layers have been
given over a year to adapt.

We do keep the provides and rprovides around for a bit
longer, but those will also be removed in the future.

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

4 files changed, 6 insertions, 4 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 7c8e3701..b7cbb092 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -40,7 +40,7 @@ LAYERRECOMMENDS_virtualization-layer = " \
 require conf/distro/include/virt_security_flags.inc
 
 PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
-PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
+PREFERRED_PROVIDER_virtual/containerd ?= "containerd"
 PREFERRED_PROVIDER_virtual/docker ?= "docker-moby"
 
 # Sanity check for meta-virtualization layer.
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
index 63498a86..63498a86 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
+++ b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch b/recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
index 62580c6c..62580c6c 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch
+++ b/recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd_git.bb
index 10d1ce8b..e685a8cb 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -20,8 +20,11 @@ CVE_VERSION = "v2.0.0-beta.0"
 
 # EXTRA_OEMAKE += "GODEBUG=1"
 
-PROVIDES += "virtual/containerd"
-RPROVIDES:${PN} = "virtual-containerd"
+# containerd-opencontainers is to provide compatibility with external
+# packagegroups / recipes that depend on the existing split of containerd
+# between docker and opencontainers. We can drop it in the future.
+PROVIDES += "virtual/containerd containerd-opencontainers"
+RPROVIDES:${PN} = "virtual-containerd containerd-opencontainers"
 
 S = "${WORKDIR}/git/src/github.com/containerd/containerd"
 
@@ -97,4 +100,3 @@ COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
 
 RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
 
-CVE_PRODUCT = "containerd"