summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2016-08-31 14:19:42 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-08-31 17:33:23 -0400
commit951c83c74d04827856c726a30d7307270df9c033 (patch)
tree82e22a194d72541253e1b4fbd885580b25d5cb14
parent3907b0961960e0fcea1b18f0e1d39e4edb70137e (diff)
downloadmeta-virtualization-951c83c74d04827856c726a30d7307270df9c033.tar.gz
docker: cgroup-lite is not required with systemd
Systemd takes care of setting up the various cgroup mounts at boot, and likewise the tearing down of these at shutdown. It is therefor a useless dependency when we are using systemd. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/docker/docker_git.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index f3c940d1..4f851935 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -53,7 +53,9 @@ DEPENDS = "go-cross \
53 " 53 "
54 54
55DEPENDS_append_class-target = "lvm2" 55DEPENDS_append_class-target = "lvm2"
56RDEPENDS_${PN} = "curl aufs-util git cgroup-lite util-linux iptables" 56RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \
57 ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \
58 "
57RDEPENDS_${PN} += "containerd runc" 59RDEPENDS_${PN} += "containerd runc"
58RRECOMMENDS_${PN} = "lxc docker-registry rt-tests" 60RRECOMMENDS_${PN} = "lxc docker-registry rt-tests"
59RRECOMMENDS_${PN} += " kernel-module-dm-thin-pool kernel-module-nf-nat" 61RRECOMMENDS_${PN} += " kernel-module-dm-thin-pool kernel-module-nf-nat"