containerd: consolidate to "containerd"

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>

1 files changed, 0 insertions, 99 deletions

diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
deleted file mode 100644
index ed73e398..00000000
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ /dev/null
@@ -1,99 +0,0 @@
-HOMEPAGE = "https://github.com/containerd/containerd"
-SUMMARY = "containerd is a daemon to control runC"
-DESCRIPTION = "containerd is a daemon to control runC, built for performance and density. \
-               containerd leverages runC's advanced features such as seccomp and user namespace \
-               support as well as checkpoint and restore for cloning and live migration of containers."
-
-
-SRCREV = "b1624c3628954e769dd50783b63823040b2db38c"
-SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \
-           file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
-           file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \
-           file://0001-Makefile-update-default-PACKAGE-to-v2.patch \
-          "
-
-# Apache-2.0 for containerd
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"
-
-CONTAINERD_VERSION = "v2.0.0-beta.0"
-CVE_VERSION = "v2.0.0-beta.0"
-
-# EXTRA_OEMAKE += "GODEBUG=1"
-
-PROVIDES += "virtual/containerd"
-RPROVIDES:${PN} = "virtual-containerd"
-
-S = "${WORKDIR}/git/src/github.com/containerd/containerd/v2"
-
-PV = "${CONTAINERD_VERSION}+git"
-
-inherit go
-inherit goarch
-
-GO_IMPORT = "import"
-
-INSANE_SKIP:${PN} += "ldflags"
-
-do_configure[noexec] = "1"
-
-do_compile() {
-    export GOARCH="${TARGET_GOARCH}"
-
-    export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go:${WORKDIR}/git/"
-    export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
-
-    # Pass the needed cflags/ldflags so that cgo
-    # can find the needed headers files and libraries
-    export CGO_ENABLED="1"
-    export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-    export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-    export BUILDTAGS="no_btrfs static_build netgo"
-    export CFLAGS="${CFLAGS}"
-    export LDFLAGS="${LDFLAGS}"
-    export SHIM_CGO_ENABLED="${CGO_ENABLED}"
-    # fixes:
-    # cannot find package runtime/cgo (using -importcfg)
-    #        ... recipe-sysroot-native/usr/lib/aarch64-poky-linux/go/pkg/tool/linux_amd64/link:
-    #        cannot open file : open : no such file or directory
-    export GO_BUILD_FLAGS="-trimpath -a -pkgdir dontusecurrentpkgs"
-    export GO111MODULE=off
-
-    cd ${S}
-
-    oe_runmake binaries
-}
-
-inherit systemd
-SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
-SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','containerd.service','',d)}"
-
-do_install() {
-        mkdir -p ${D}/${bindir}
-
-        cp ${S}/bin/containerd ${D}/${bindir}/containerd
-        cp ${S}/bin/containerd-shim-runc-v2 ${D}/${bindir}/containerd-shim-runc-v2
-        cp ${S}/bin/ctr ${D}/${bindir}/containerd-ctr
-
-        ln -sf containerd ${D}/${bindir}/docker-containerd
-        ln -sf containerd-ctr ${D}/${bindir}/docker-containerd-ctr
-
-        ln -sf containerd-ctr ${D}/${bindir}/ctr
-
-        if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-                install -d ${D}${systemd_unitdir}/system
-                install -m 644 ${S}/containerd.service ${D}/${systemd_unitdir}/system
-                # adjust from /usr/local/bin to /usr/bin/
-                sed -e "s:/usr/local/bin/containerd:${bindir}/containerd:g" -i ${D}/${systemd_unitdir}/system/containerd.service
-        fi
-}
-
-FILES:${PN} += "${systemd_system_unitdir}/*"
-
-INSANE_SKIP:${PN} += "ldflags already-stripped"
-
-COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
-
-RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
-
-CVE_PRODUCT = "containerd"