summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2018-03-14 09:39:12 +0100
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-03-22 00:48:12 -0400
commit4b6d33c87f368b22d75c7fea569797e9d852c31f (patch)
treebdb5a74457186029138d3edc0db0add96c5c120b
parente63819669747585baa0284528ac76bdd34fc9e78 (diff)
downloadmeta-virtualization-4b6d33c87f368b22d75c7fea569797e9d852c31f.tar.gz
docker: make aufs dependency depend on distro feature
Only include aufs-utils if the corresponding distro feature is enabled. Without that the aufs kernel driver is not included too. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/docker/docker_git.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 4ba5e817..28781fa0 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -64,8 +64,9 @@ DEPENDS = " \
64PACKAGES =+ "${PN}-contrib" 64PACKAGES =+ "${PN}-contrib"
65 65
66DEPENDS_append_class-target = " lvm2" 66DEPENDS_append_class-target = " lvm2"
67RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ 67RDEPENDS_${PN} = "util-linux iptables \
68 ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ 68 ${@bb.utils.contains('DISTRO_FEATURES', 'aufs', 'aufs-util', '', d)} \
69 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'cgroup-lite', d)} \
69 " 70 "
70RDEPENDS_${PN} += "virtual/containerd virtual/runc" 71RDEPENDS_${PN} += "virtual/containerd virtual/runc"
71 72