Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -13,8 +13,9 @@ if BR2_PACKAGE_DOCKER_ENGINE
|
||||
|
||||
config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
|
||||
bool "docker daemon"
|
||||
depends on BR2_USE_WCHAR # docker-containerd
|
||||
depends on BR2_USE_MMU # docker-containerd
|
||||
select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
|
||||
select BR2_PACKAGE_IPTABLES # runtime dependency
|
||||
select BR2_PACKAGE_SQLITE # runtime dependency
|
||||
default y
|
||||
help
|
||||
@@ -28,7 +29,6 @@ if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
|
||||
|
||||
config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
|
||||
bool "btrfs filesystem driver"
|
||||
depends on BR2_USE_WCHAR # btrfs-progs
|
||||
depends on BR2_USE_MMU # btrfs-progs
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs
|
||||
select BR2_PACKAGE_BTRFS_PROGS
|
||||
@@ -40,6 +40,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
|
||||
depends on BR2_USE_MMU # lvm2
|
||||
depends on !BR2_STATIC_LIBS # lvm2
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
|
||||
select BR2_PACKAGE_LVM2
|
||||
select BR2_PACKAGE_LVM2_APP_LIBRARY
|
||||
help
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 f8139acba98248eb1fdb0b6d94efee89b876f9a50d00e263dc144fd2b0c372d4 docker-engine-v1.12.0.tar.gz
|
||||
sha256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e docker-engine-v1.12.6.tar.gz
|
||||
|
||||
@@ -4,20 +4,23 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOCKER_ENGINE_VERSION = v1.12.0
|
||||
DOCKER_ENGINE_VERSION = v1.12.6
|
||||
DOCKER_ENGINE_COMMIT = 78d18021ecba00c00730dec9d56de6896f9e708d
|
||||
DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
|
||||
|
||||
DOCKER_ENGINE_LICENSE = Apache-2.0
|
||||
DOCKER_ENGINE_LICENSE_FILES = LICENSE
|
||||
|
||||
DOCKER_ENGINE_DEPENDENCIES = host-go
|
||||
DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf
|
||||
|
||||
DOCKER_ENGINE_GOPATH = "$(@D)/vendor"
|
||||
DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
|
||||
CGO_ENABLED=1 \
|
||||
CGO_NO_EMULATION=1 \
|
||||
GOBIN="$(@D)/bin" \
|
||||
GOPATH="$(DOCKER_ENGINE_GOPATH)"
|
||||
GOPATH="$(DOCKER_ENGINE_GOPATH)" \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
$(TARGET_MAKE_ENV)
|
||||
|
||||
DOCKER_ENGINE_GLDFLAGS = \
|
||||
-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
|
||||
@@ -65,7 +68,10 @@ endif
|
||||
define DOCKER_ENGINE_CONFIGURE_CMDS
|
||||
ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker
|
||||
cd $(@D) && \
|
||||
GITCOMMIT="unknown" BUILDTIME="$$(date)" VERSION="$(DOCKER_ENGINE_VERSION)" \
|
||||
GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
|
||||
BUILDTIME="$$(date)" \
|
||||
VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \
|
||||
bash ./hack/make/.go-autogen
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user