Skip to contentSkip to conversation

package/docker-engine: drop unused _DAEMON option

PATCH New Peter Korsgaard 2 participants 4 messages Feb 1, 2019 – Feb 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/docker-engine: drop unused _DAEMON option

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.

---
 package/docker-engine/Config.in | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)
package/docker-engine/Config.in +6 -16
index 11f17820a7..2a0c130fce 100644
@@ -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
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/docker-engine: drop unused _DAEMON option

Hi Peter,

Quoted 3 lines · Peter Korsgaard

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.

Thanks, not sure how I missed this in the original series.

LGTM.

~ Christian

#2 lore raw

PATCH 1/1 package/docker-engine: drop unused _DAEMON option

In reply to Peter Korsgaard
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

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.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 package/docker-engine: drop unused _DAEMON option

In reply to Peter Korsgaard
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

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.

Committed to 2018.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard