From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/docker-engine: drop unused _DAEMON option
Date: Fri, 1 Feb 2019 23:04:08 +0100 [thread overview]
Message-ID: <20190201220408.7421-1-peter@korsgaard.com> (raw)
Since commit de336584d2 (package/docker-engine: split docker-{cli, engine},
bump to v18.09.0), the docker-engine package only builds the daemon part,
and the .mk file no longer use the _DAEMON option, so drop it.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/docker-engine/Config.in | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 11f17820a7..2a0c130fce 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -3,6 +3,11 @@ config BR2_PACKAGE_DOCKER_ENGINE
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU # docker-containerd
+ select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
+ select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
+ select BR2_PACKAGE_IPTABLES # runtime dependency
+ select BR2_PACKAGE_SQLITE # runtime dependency
help
Docker is a platform to build, ship,
and run applications as lightweight containers.
@@ -11,23 +16,9 @@ config BR2_PACKAGE_DOCKER_ENGINE
if BR2_PACKAGE_DOCKER_ENGINE
-config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
- bool "docker daemon"
- default y
- depends on BR2_USE_MMU # docker-containerd
- select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
- select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
- select BR2_PACKAGE_IPTABLES # runtime dependency
- select BR2_PACKAGE_SQLITE # runtime dependency
- help
- Build the Docker system daemon.
- If not selected, will build client only.
-
config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL
bool "build experimental features"
-if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
-
config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
bool "btrfs filesystem driver"
depends on BR2_USE_MMU # btrfs-progs
@@ -58,9 +49,8 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS
endif
-endif
-
comment "docker-engine needs a toolchain w/ threads"
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU
--
2.11.0
next reply other threads:[~2019-02-01 22:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 22:04 Peter Korsgaard [this message]
2019-02-02 6:51 ` [Buildroot] [PATCH] package/docker-engine: drop unused _DAEMON option Christian Stewart
2019-02-02 11:06 ` Peter Korsgaard
2019-02-15 16:14 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190201220408.7421-1-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.