From 7b46286b34b35f8c1aba7adcccd1d84bc901caf5 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 6 Sep 2021 10:28:21 -0400
Subject: [PATCH] virtual/containerd: don't rprovide virtual/

Similar to the oe-core commit:

   commit 93ac180d8c389f16964bce8bd5538d9389e970e6
   Author: Michael Opdenacker <michael.opdenacker@bootlin.com>
   Date:   Wed Sep 1 11:20:20 2021 +0200

       meta: stop using "virtual/" in RPROVIDES and RDEPENDS

       Fixes [YOCTO #14538]

       Recipes shouldn't use the "virtual/" string in RPROVIDES and RDEPENDS.

       That's confusing because "virtual/" has no special meaning in
       RPROVIDES and RDEPENDS (unlike in PROVIDES and DEPENDS).

       Instead, using "virtual-" instead of "virtual/"
       as already done in the glibc recipe.

We stop rproviding virtual/containerd to keep the namespace clean.
There aren't many users of this virtual provides, but we keep
it around (for now) to maintain compatibility.

At the same time we convert the RPROVIDES to virtual-containerd, to keep
it available and consistent with oe-core use virtual-libc, etc.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-containers/containerd/containerd-opencontainers_git.bb | 2 +-
 recipes-containers/cri-o/cri-o_git.bb                          | 2 +-
 recipes-containers/docker/docker.inc                           | 2 +-
 recipes-containers/k3s/k3s_git.bb                              | 2 +-
 recipes-core/packagegroups/packagegroup-container.bb           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 2169f121..b9af08c4 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -20,7 +20,7 @@ CONTAINERD_VERSION = "v1.5.5"
 EXTRA_OEMAKE += "GODEBUG=1"
 
 PROVIDES += "virtual/containerd"
-RPROVIDES:${PN} = "virtual/containerd"
+RPROVIDES:${PN} = "virtual-containerd"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb
index 306f23e8..5cecc26e 100644
--- a/recipes-containers/cri-o/cri-o_git.bb
+++ b/recipes-containers/cri-o/cri-o_git.bb
@@ -50,7 +50,7 @@ PNBLACKLIST[cri-o] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'security', bb
 
 PACKAGES =+ "${PN}-config"
 
-RDEPENDS:${PN} += " virtual/containerd virtual-runc"
+RDEPENDS:${PN} += " virtual-containerd virtual-runc"
 RDEPENDS:${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools"
 
 inherit systemd
diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index 3c3a0ca7..40a3642c 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -27,7 +27,7 @@ RDEPENDS:${PN} = "util-linux util-linux-unshare iptables \
                   bridge-utils \
                   ca-certificates \
                  "
-RDEPENDS:${PN} += "virtual/containerd virtual-runc"
+RDEPENDS:${PN} += "virtual-containerd virtual-runc"
 
 RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
 
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb
index 91b73f0b..18d80754 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -79,7 +79,7 @@ SYSTEMD_AUTO_ENABLE:${PN}-agent = "disable"
 FILES:${PN}-agent = "${BIN_PREFIX}/bin/k3s-agent"
 FILES:${PN} += "${BIN_PREFIX}/bin/*"
 
-RDEPENDS:${PN} = "k3s-cni conntrack-tools coreutils findutils iptables iproute2 ipset virtual/containerd"
+RDEPENDS:${PN} = "k3s-cni conntrack-tools coreutils findutils iptables iproute2 ipset virtual-containerd"
 RDEPENDS:${PN}-server = "${PN}"
 RDEPENDS:${PN}-agent = "${PN}"
 
diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
index 5d87e8ec..8d418e95 100644
--- a/recipes-core/packagegroups/packagegroup-container.bb
+++ b/recipes-core/packagegroups/packagegroup-container.bb
@@ -42,6 +42,6 @@ RDEPENDS:packagegroup-oci = " \
 "
 
 RDEPENDS:packagegroup-containerd = " \
-    virtual/containerd \
+    virtual-containerd \
 "