Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
@@ -15,6 +15,18 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
|
||||
|
||||
https://github.com/docker/containerd
|
||||
|
||||
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 toolchain w/ threads"
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Computed locally
|
||||
sha256 08f057ece7e518b14cce2e9737228a5a899a7b58b78248a03e02f4a6c079eeaf docker-containerd-v1.1.0.tar.gz
|
||||
sha256 e0d6a92493c875741077c45684a094d61c032e6249454298f652b81e0b148f40 docker-containerd-v1.1.5.tar.gz
|
||||
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
|
||||
|
||||
@@ -4,19 +4,34 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOCKER_CONTAINERD_VERSION = v1.1.0
|
||||
DOCKER_CONTAINERD_VERSION = v1.1.5
|
||||
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
|
||||
DOCKER_CONTAINERD_LICENSE = Apache-2.0
|
||||
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code
|
||||
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
|
||||
|
||||
DOCKER_CONTAINERD_WORKSPACE = vendor
|
||||
|
||||
DOCKER_CONTAINERD_LDFLAGS = \
|
||||
-X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
|
||||
|
||||
DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
|
||||
DOCKER_CONTAINERD_TAGS = apparmor no_btrfs
|
||||
|
||||
DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
|
||||
DOCKER_CONTAINERD_TAGS = apparmor
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
||||
DOCKER_CONTAINERD_DEPENDENCIES += libseccomp
|
||||
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
|
||||
|
||||
define DOCKER_CONTAINERD_INSTALL_SYMLINKS
|
||||
ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc
|
||||
ln -fs containerd $(TARGET_DIR)/usr/bin/docker-containerd
|
||||
ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim
|
||||
ln -fs containerd $(TARGET_DIR)/usr/bin/docker-containerd
|
||||
endef
|
||||
|
||||
Reference in New Issue
Block a user