From 263e4d3d4e36ccdbd660ba252f5eee6309a130cf Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 6 Sep 2021 10:28:21 -0400 Subject: virtual/runc: don't rprovide virtual/ Similar to the oe-core commit: commit 93ac180d8c389f16964bce8bd5538d9389e970e6 Author: Michael Opdenacker 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/runc 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-runc, to keep it available and consistent with oe-core use virtual-libc, etc. Signed-off-by: Bruce Ashfield --- 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/podman/podman_git.bb | 2 +- recipes-containers/runc/runc.inc | 2 +- recipes-core/packagegroups/packagegroup-container.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index 03885821..2169f121 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -122,6 +122,6 @@ INSANE_SKIP:${PN} += "ldflags already-stripped" COMPATIBLE_HOST = "^(?!(qemu)?mips).*" -RDEPENDS:${BPN} += " virtual/runc" +RDEPENDS:${BPN} += " virtual-runc" CVE_PRODUCT = "containerd" diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index 34599e7f..306f23e8 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 d22aae1e..3c3a0ca7 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/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index ab9aef12..3f6896be 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb @@ -109,6 +109,6 @@ FILES:${PN} += " \ SYSTEMD_SERVICE:${PN} = "podman.service podman.socket" -RDEPENDS:${PN} += "conmon virtual/runc iptables cni skopeo" +RDEPENDS:${PN} += "conmon virtual-runc iptables cni skopeo" RRECOMMENDS:${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment" RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}" diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index 486ee176..c8e74273 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc @@ -26,7 +26,7 @@ PACKAGECONFIG ??= "static \ PROVIDES += "virtual/runc" -RPROVIDES:${PN} = "virtual/runc" +RPROVIDES:${PN} = "virtual-runc" GO_IMPORT = "import" diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb index 82d4a2e7..5d87e8ec 100644 --- a/recipes-core/packagegroups/packagegroup-container.bb +++ b/recipes-core/packagegroups/packagegroup-container.bb @@ -35,7 +35,7 @@ RDEPENDS:packagegroup-podman = " \ " RDEPENDS:packagegroup-oci = " \ - virtual/runc \ + virtual-runc \ oci-systemd-hook \ oci-runtime-tools \ oci-image-tools \ -- cgit v1.2.3-54-g00ecf