MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

virtual/runc: don't rprovide virtual/

Browse Source 
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/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 <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2021-09-06 10:28:21 -04:00
parent 798aeaee78
commit 263e4d3d4e
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-containers/containerd/containerd-opencontainers_git.bb
View File

@ -122,6 +122,6 @@ INSANE_SKIP:${PN} += "ldflags already-stripped"
COMPATIBLE_HOST = "^(?!(qemu)?mips).*" COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
RDEPENDS:${BPN} += " virtual/runc" RDEPENDS:${BPN} += " virtual-runc"
CVE_PRODUCT = "containerd" CVE_PRODUCT = "containerd"

2
recipes-containers/cri-o/cri-o_git.bb
View File

@ -50,7 +50,7 @@ PNBLACKLIST[cri-o] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'security', bb
PACKAGES =+ "${PN}-config" 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" RDEPENDS:${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools"
inherit systemd inherit systemd

2
recipes-containers/docker/docker.inc
View File

@ -27,7 +27,7 @@ RDEPENDS:${PN} = "util-linux util-linux-unshare iptables \
bridge-utils \ bridge-utils \
ca-certificates \ 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" RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"

2
recipes-containers/podman/podman_git.bb
View File

@ -109,6 +109,6 @@ FILES:${PN} += " \
SYSTEMD_SERVICE:${PN} = "podman.service podman.socket" 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" RRECOMMENDS:${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment"
RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}" RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"

2
recipes-containers/runc/runc.inc
View File

@ -26,7 +26,7 @@ PACKAGECONFIG ??= "static \
PROVIDES += "virtual/runc" PROVIDES += "virtual/runc"
RPROVIDES:${PN} = "virtual/runc" RPROVIDES:${PN} = "virtual-runc"
GO_IMPORT = "import" GO_IMPORT = "import"

2
recipes-core/packagegroups/packagegroup-container.bb
View File

@ -35,7 +35,7 @@ RDEPENDS:packagegroup-podman = " \
" "
RDEPENDS:packagegroup-oci = " \ RDEPENDS:packagegroup-oci = " \
virtual/runc \ virtual-runc \
oci-systemd-hook \ oci-systemd-hook \
oci-runtime-tools \ oci-runtime-tools \
oci-image-tools \ oci-image-tools \