diff options
-rw-r--r-- | recipes-containers/containerd/containerd-opencontainers_git.bb | 2 | ||||
-rw-r--r-- | recipes-containers/cri-o/cri-o_git.bb | 2 | ||||
-rw-r--r-- | recipes-containers/docker/docker.inc | 2 | ||||
-rw-r--r-- | recipes-containers/k3s/k3s_git.bb | 2 | ||||
-rw-r--r-- | 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" | |||
20 | EXTRA_OEMAKE += "GODEBUG=1" | 20 | EXTRA_OEMAKE += "GODEBUG=1" |
21 | 21 | ||
22 | PROVIDES += "virtual/containerd" | 22 | PROVIDES += "virtual/containerd" |
23 | RPROVIDES:${PN} = "virtual/containerd" | 23 | RPROVIDES:${PN} = "virtual-containerd" |
24 | 24 | ||
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | 26 | ||
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 | |||
50 | 50 | ||
51 | PACKAGES =+ "${PN}-config" | 51 | PACKAGES =+ "${PN}-config" |
52 | 52 | ||
53 | RDEPENDS:${PN} += " virtual/containerd virtual-runc" | 53 | RDEPENDS:${PN} += " virtual-containerd virtual-runc" |
54 | RDEPENDS:${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools" | 54 | RDEPENDS:${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools" |
55 | 55 | ||
56 | inherit systemd | 56 | 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 \ | |||
27 | bridge-utils \ | 27 | bridge-utils \ |
28 | ca-certificates \ | 28 | ca-certificates \ |
29 | " | 29 | " |
30 | RDEPENDS:${PN} += "virtual/containerd virtual-runc" | 30 | RDEPENDS:${PN} += "virtual-containerd virtual-runc" |
31 | 31 | ||
32 | RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade" | 32 | RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade" |
33 | 33 | ||
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" | |||
79 | FILES:${PN}-agent = "${BIN_PREFIX}/bin/k3s-agent" | 79 | FILES:${PN}-agent = "${BIN_PREFIX}/bin/k3s-agent" |
80 | FILES:${PN} += "${BIN_PREFIX}/bin/*" | 80 | FILES:${PN} += "${BIN_PREFIX}/bin/*" |
81 | 81 | ||
82 | RDEPENDS:${PN} = "k3s-cni conntrack-tools coreutils findutils iptables iproute2 ipset virtual/containerd" | 82 | RDEPENDS:${PN} = "k3s-cni conntrack-tools coreutils findutils iptables iproute2 ipset virtual-containerd" |
83 | RDEPENDS:${PN}-server = "${PN}" | 83 | RDEPENDS:${PN}-server = "${PN}" |
84 | RDEPENDS:${PN}-agent = "${PN}" | 84 | RDEPENDS:${PN}-agent = "${PN}" |
85 | 85 | ||
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 = " \ | |||
42 | " | 42 | " |
43 | 43 | ||
44 | RDEPENDS:packagegroup-containerd = " \ | 44 | RDEPENDS:packagegroup-containerd = " \ |
45 | virtual/containerd \ | 45 | virtual-containerd \ |
46 | " | 46 | " |
47 | 47 | ||