package/docker-containerd: rename package to containerd

containerd is now an independent project from Docker.

This commit renames the Buildroot package from docker-containerd to containerd,
adding a entry in Config.in.legacy accordingly.

containerd is an industry-standard container runtime with an emphasis on
simplicity, robustness and portability. It is available as a daemon for Linux
and Windows, which can manage the complete container lifecycle of its host
system: image transfer and storage, container execution and supervision,
low-level storage and network attachments, etc.

https://containerd.io

Signed-off-by: Christian Stewart <christian@paral.in>
Reviewed-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[Arnout:
 - fix alphabetical ordering in package/Config.in
 - also do rename in DEVELOPERS
 - squash in second patch
]

diff --git a/Config.in.legacy b/Config.in.legacy
index 05b0e0d0da97872cc9484e6786837aec6d39f6f2..d583f3b60315e3273d2ccf528462e38ac5a1ad4e 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2021.05"
 
+config BR2_PACKAGE_DOCKER_CONTAINERD
+       bool "docker-containerd package was renamed to containerd"
+       select BR2_LEGACY
+       select BR2_PACKAGE_CONTAINERD
+       help
+         The containerd project is now independent from Docker.
+         The package was renamed to containerd accordingly.
+
 config BR2_PACKAGE_IOSTAT
        bool "iostat removed"
        select BR2_LEGACY

diff --git a/DEVELOPERS b/DEVELOPERS
index 573d8d84de03770e59524a510f904955166f29c2..1e3eec93aa0127749f749db1076c72c8ee8c73b5 100644 (file)
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -513,9 +513,9 @@ F:  package/python-pylibftdi/
 
 N:     Christian Stewart <christian@paral.in>
 F:     package/batman-adv/
+F:     package/containerd/
 F:     package/delve/
 F:     package/docker-cli/
-F:     package/docker-containerd/
 F:     package/docker-engine/
 F:     package/docker-proxy/
 F:     package/fuse-overlayfs/

diff --git a/package/Config.in b/package/Config.in
index 7ac10b9d4269264a2d5716f51a5e37dcd48d3c5f..6888e824a09184d90ba33165d8de841065f8f662 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -2426,6 +2426,7 @@ menu "System tools"
        source "package/bubblewrap/Config.in"
        source "package/cgroupfs-mount/Config.in"
        source "package/circus/Config.in"
+       source "package/containerd/Config.in"
        source "package/coreutils/Config.in"
        source "package/cpuload/Config.in"
        source "package/daemon/Config.in"
@@ -2435,7 +2436,6 @@ menu "System tools"
        source "package/debianutils/Config.in"
        source "package/docker-cli/Config.in"
        source "package/docker-compose/Config.in"
-       source "package/docker-containerd/Config.in"
        source "package/docker-engine/Config.in"
        source "package/docker-proxy/Config.in"
        source "package/earlyoom/Config.in"

diff --git a/package/containerd/Config.in b/package/containerd/Config.in
new file mode 100644 (file)
index 0000000..0e3a55e
--- /dev/null
+++ b/package/containerd/Config.in
@@ -0,0 +1,35 @@
+config BR2_PACKAGE_CONTAINERD
+       bool "containerd"
+       depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+       depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
+       depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
+       depends on BR2_USE_MMU # util-linux
+       select BR2_PACKAGE_RUNC # runtime dependency
+       select BR2_PACKAGE_UTIL_LINUX # runtime dependency
+       select BR2_PACKAGE_UTIL_LINUX_BINARIES
+       select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
+       select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT
+       select BR2_PACKAGE_UTIL_LINUX_MOUNT
+       help
+         containerd is a daemon to control runC.
+
+         https://containerd.io/
+
+if BR2_PACKAGE_CONTAINERD
+
+config BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS
+       bool "btrfs snapshot driver"
+       depends on BR2_USE_MMU # btrfs-progs
+       depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs
+       select BR2_PACKAGE_BTRFS_PROGS
+       help
+         Build the btrfs snapshot driver for containerd.
+
+endif
+
+comment "containerd needs a glibc or musl toolchain w/ threads"
+       depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+       depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
+       depends on BR2_USE_MMU
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC

diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash
new file mode 100644 (file)
index 0000000..b3cb3e4
--- /dev/null
+++ b/package/containerd/containerd.hash
@@ -0,0 +1,3 @@
+# Computed locally
+sha256  ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1  containerd-1.4.4.tar.gz
+sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE

diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk
new file mode 100644 (file)
index 0000000..761e080
--- /dev/null
+++ b/package/containerd/containerd.mk
@@ -0,0 +1,44 @@
+################################################################################
+#
+# containerd
+#
+################################################################################
+
+CONTAINERD_VERSION = 1.4.4
+CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION))
+CONTAINERD_LICENSE = Apache-2.0
+CONTAINERD_LICENSE_FILES = LICENSE
+CONTAINERD_CPE_ID_VENDOR = linuxfoundation
+CONTAINERD_CPE_ID_PRODUCT = containerd
+
+CONTAINERD_GOMOD = github.com/containerd/containerd
+
+CONTAINERD_LDFLAGS = \
+       -X $(CONTAINERD_GOMOD)/version.Version=$(CONTAINERD_VERSION)
+
+CONTAINERD_BUILD_TARGETS = \
+       cmd/containerd \
+       cmd/containerd-shim \
+       cmd/containerd-shim-runc-v1 \
+       cmd/containerd-shim-runc-v2 \
+       cmd/ctr
+
+CONTAINERD_INSTALL_BINS = $(notdir $(CONTAINERD_BUILD_TARGETS))
+
+ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
+CONTAINERD_DEPENDENCIES += libapparmor
+CONTAINERD_TAGS += apparmor
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
+CONTAINERD_TAGS += seccomp
+endif
+
+ifeq ($(BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS),y)
+CONTAINERD_DEPENDENCIES += btrfs-progs
+else
+CONTAINERD_TAGS += no_btrfs
+endif
+
+$(eval $(golang-package))

diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in
deleted file mode 100644 (file)
index 9568dd0..0000000
--- a/package/docker-containerd/Config.in
+++ /dev/null
@@ -1,35 +0,0 @@
-config BR2_PACKAGE_DOCKER_CONTAINERD
-       bool "docker-containerd"
-       depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
-       depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
-       depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
-       depends on BR2_USE_MMU # util-linux
-       select BR2_PACKAGE_RUNC # runtime dependency
-       select BR2_PACKAGE_UTIL_LINUX # runtime dependency
-       select BR2_PACKAGE_UTIL_LINUX_BINARIES
-       select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
-       select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT
-       select BR2_PACKAGE_UTIL_LINUX_MOUNT
-       help
-         containerd is a daemon to control runC.
-
-         https://containerd.io/
-
-if BR2_PACKAGE_DOCKER_CONTAINERD
-
-config BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS
-       bool "btrfs snapshot driver"
-       depends on BR2_USE_MMU # btrfs-progs
-       depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs
-       select BR2_PACKAGE_BTRFS_PROGS
-       help
-         Build the btrfs snapshot driver for containerd.
-
-endif
-
-comment "docker-containerd needs a glibc or musl toolchain w/ threads"
-       depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
-       depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
-       depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC

diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
deleted file mode 100644 (file)
index bb544e8..0000000
--- a/package/docker-containerd/docker-containerd.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Computed locally
-sha256  ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1  docker-containerd-1.4.4.tar.gz
-sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE

diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
deleted file mode 100644 (file)
index e229d9c..0000000
--- a/package/docker-containerd/docker-containerd.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-################################################################################
-#
-# docker-containerd
-#
-################################################################################
-
-DOCKER_CONTAINERD_VERSION = 1.4.4
-DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
-DOCKER_CONTAINERD_LICENSE = Apache-2.0
-DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
-DOCKER_CONTAINERD_CPE_ID_VENDOR = linuxfoundation
-DOCKER_CONTAINERD_CPE_ID_PRODUCT = containerd
-
-DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd
-
-DOCKER_CONTAINERD_LDFLAGS = \
-       -X $(DOCKER_CONTAINERD_GOMOD)/version.Version=$(DOCKER_CONTAINERD_VERSION)
-
-DOCKER_CONTAINERD_BUILD_TARGETS = \
-       cmd/containerd \
-       cmd/containerd-shim \
-       cmd/containerd-shim-runc-v1 \
-       cmd/containerd-shim-runc-v2 \
-       cmd/ctr
-
-DOCKER_CONTAINERD_INSTALL_BINS = $(notdir $(DOCKER_CONTAINERD_BUILD_TARGETS))
-
-ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
-DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
-DOCKER_CONTAINERD_TAGS += apparmor
-endif
-
-ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
-DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
-DOCKER_CONTAINERD_TAGS += seccomp
-endif
-
-ifeq ($(BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS),y)
-DOCKER_CONTAINERD_DEPENDENCIES += btrfs-progs
-else
-DOCKER_CONTAINERD_TAGS += no_btrfs
-endif
-
-$(eval $(golang-package))

diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 85a4bc6a0f315ffe66fed0fc7d4776b7c5f45580..357101f28041882fe1987d0c211e0f5cc00645a9 100644 (file)
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_DOCKER_ENGINE
        depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
        depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc
-       depends on BR2_USE_MMU # docker-containerd
+       depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd -> runc
+       depends on BR2_USE_MMU # containerd
        select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency
-       select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
+       select BR2_PACKAGE_CONTAINERD # runtime dependency
        select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
        select BR2_PACKAGE_IPTABLES # runtime dependency
        select BR2_PACKAGE_SQLITE # runtime dependency