The variables only take effect if the corresponding init system is enabled
Signed-off-by: Pascal Bach <[email protected]>
---
recipes-containers/docker/docker_git.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes-containers/docker/docker_git.bb
b/recipes-containers/docker/docker_git.bb
index 5ae9211..5c21138 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -117,13 +117,13 @@ do_compile() {
go build -o ${S}/src/import/bundles/latest/dynbinary-client/docker
github.com/docker/cli/cmd/docker
}
-SYSTEMD_PACKAGES =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
-SYSTEMD_SERVICE_${PN} =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "docker.service"
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-INITSCRIPT_PACKAGES +=
"${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"
-INITSCRIPT_NAME_${PN} =
"${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}"
+INITSCRIPT_PACKAGES += "${PN}"
+INITSCRIPT_NAME_${PN} = "docker.init"
INITSCRIPT_PARAMS_${PN} = "defaults"
do_install() {
--
2.11.0
--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization
