docker: make aufs dependency depend on distro feature
PATCH 1/1 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.
--- recipes-containers/docker/docker_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
recipes-containers/docker/docker_git.bb +3 -2
@@ -64,8 +64,9 @@ DEPENDS = " \ PACKAGES =+ "${PN}-contrib" DEPENDS_append_class-target = " lvm2" -RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ +RDEPENDS_${PN} = "util-linux iptables \ + ${@bb.utils.contains('DISTRO_FEATURES', 'aufs', 'aufs-util', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'cgroup-lite', d)} \ " RDEPENDS_${PN} += "virtual/containerd virtual/runc"
Signature · 1 line
2.11.0
The problem is .. that this is now a magic distro feature that no one knows about.
At a minimum, this new distro feature use needs to be documented in the layers README.
Bruce
Quoted 32 lines · Pascal Bach
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 <[email protected]>--- recipes-containers/docker/docker_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)recipes-containers/docker/docker_git.bb +3
-3@@ -64,8 +64,9 @@ DEPENDS = " \ PACKAGES =+ "${PN}-contrib" DEPENDS_append_class-target = " lvm2" -RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ +RDEPENDS_${PN} = "util-linux iptables \ + ${@bb.utils.contains('DISTRO_FEATURES', 'aufs', 'aufs-util', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'cgroup-lite', d)} \ " RDEPENDS_${PN} += "virtual/containerd virtual/runc" --2.11.0
--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Quoted 10 lines
-----Original Message-----
From: Bruce Ashfield [mailto:[email protected]]
Sent: Mittwoch, 14. März 2018 13:41
To: Bach, Pascal (BT CPS R&D ZG FW CCP) <[email protected]>
Cc: [email protected]
Subject: Re: [meta-virtualization] [PATCH] docker: make aufs dependency depend on distro feature
Quoted 5 lines
The problem is .. that this is now a magic distro feature that no one knows about.
At a minimum, this new distro feature use needs to be documented in the layers README.
This check is already used in recipes-kernel/linux/linux-yocto_virtualization.inc where it enables aufs support in the kernel. But you are right this should be documented as a distro feature for this layer.
Pascal
Quoted 46 lines
Bruce
Quoted 14 lines · Pascal Bach
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 <[email protected]>--- recipes-containers/docker/docker_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)recipes-containers/docker/docker_git.bb +0
-0recipes-containers/docker/docker_git.bb DEPENDS = " \ · line 68
Quoted 5 lines
recipes-containers/docker/docker_git.bb +0
-2@@ -64,8 +64,9 @@ DEPENDS = " \ PACKAGES =+ "${PN}-contrib" DEPENDS_append_class-target = " lvm2" -RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \
recipes-containers/docker/docker_git.bb DEPENDS = " \ · line 68
Quoted 2 lines
recipes-containers/docker/docker_git.bb +2
-0+RDEPENDS_${PN} = "util-linux iptables \ + ${@bb.utils.contains('DISTRO_FEATURES', 'aufs', 'aufs-util', '', d)}\
Quoted 8 lines
recipes-containers/docker/docker_git.bb +2
-1+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', +'', 'cgroup-lite', d)} \ " RDEPENDS_${PN} += "virtual/containerd virtual/runc" --2.11.0
Quoted 5 lines
--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Quoted 10 lines · Pascal
Quoted 10 lines
-----Original Message-----
From: Bruce Ashfield [mailto:[email protected]]
Sent: Mittwoch, 14. März 2018 13:41
To: Bach, Pascal (BT CPS R&D ZG FW CCP) <[email protected]>
Cc: [email protected]
Subject: Re: [meta-virtualization] [PATCH] docker: make aufs dependency depend on distro feature
Quoted 8 lines
Quoted 5 lines
The problem is .. that this is now a magic distro feature that no one knows about.
At a minimum, this new distro feature use needs to be documented in the layers README.
This check is already used in recipes-kernel/linux/linux-yocto_virtualization.inc where it enables aufs support in the kernel. But you are right this should be documented as a distro feature for this layer.
Ahaha. I missed that when I was giving them a hard time about the magic virtualization distro feature, I should have done it then :D
I can do the tweak to the README if you want, and I'll take this patch as-is.
Bruce
Quoted 49 lines
Pascal
Quoted 46 lines
Bruce
Quoted 14 lines · Pascal Bach
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 <[email protected]>--- recipes-containers/docker/docker_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)recipes-containers/docker/docker_git.bb +0
-0recipes-containers/docker/docker_git.bb DEPENDS = " \ · line 68
Quoted 5 lines
recipes-containers/docker/docker_git.bb +0
-2@@ -64,8 +64,9 @@ DEPENDS = " \ PACKAGES =+ "${PN}-contrib" DEPENDS_append_class-target = " lvm2" -RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \
recipes-containers/docker/docker_git.bb DEPENDS = " \ · line 68
Quoted 2 lines
recipes-containers/docker/docker_git.bb +2
-0+RDEPENDS_${PN} = "util-linux iptables \ + ${@bb.utils.contains('DISTRO_FEATURES', 'aufs', 'aufs-util', '', d)}\
Quoted 8 lines
recipes-containers/docker/docker_git.bb +2
-1+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', +'', 'cgroup-lite', d)} \ " RDEPENDS_${PN} += "virtual/containerd virtual/runc" --2.11.0
Quoted 5 lines
--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"