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

containerd: consolidate to "containerd"

Browse Source 
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>
This commit is contained in:
Bruce Ashfield 2024-04-26 20:52:43 +00:00
parent 89e2b594dc
commit e7a13cbbc3
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/layer.conf
View File

@ -40,7 +40,7 @@ LAYERRECOMMENDS_virtualization-layer = " \
require conf/distro/include/virt_security_flags.inc require conf/distro/include/virt_security_flags.inc
PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers" PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers" PREFERRED_PROVIDER_virtual/containerd ?= "containerd"
PREFERRED_PROVIDER_virtual/docker ?= "docker-moby" PREFERRED_PROVIDER_virtual/docker ?= "docker-moby"
# Sanity check for meta-virtualization layer. # Sanity check for meta-virtualization layer.

0
recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch → recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
View File

0
recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch → recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch
View File

0
recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch → recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
View File

8
recipes-containers/containerd/containerd-opencontainers_git.bb → recipes-containers/containerd/containerd_git.bb
View File

@ -21,8 +21,11 @@ CVE_VERSION = "v2.0.0-beta.0"
# EXTRA_OEMAKE += "GODEBUG=1" # EXTRA_OEMAKE += "GODEBUG=1"
PROVIDES += "virtual/containerd" # containerd-opencontainers is to provide compatibility with external
RPROVIDES:${PN} = "virtual-containerd" # 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/v2" S = "${WORKDIR}/git/src/github.com/containerd/containerd/v2"
@ -96,4 +99,3 @@ COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}" RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
CVE_PRODUCT = "containerd"