[OE-core] [PATCH 4/9] weston-init: added systemd build logic

Valentin Popa valentin.popa at intel.com
Tue Jul 15 08:00:47 UTC 2014


Handle the case when systemd is in DISTRO_FEATURES.

Signed-off-by: Valentin Popa <valentin.popa at intel.com>
---
 meta/recipes-graphics/wayland/weston-init.bb | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index 38b78bc..60cdb8d 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -7,13 +7,24 @@ SRC_URI = "file://init"
 S = "${WORKDIR}"
 
 do_install() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
+       if ${@base_contains("DISTRO_FEATURES", "sysvinit", "true", "false", d)}; then
+               install -d ${D}/${sysconfdir}/init.d
+               install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
+       fi
+
+       if ${@base_contains("DISTRO_FEATURES", "systemd", "true", "false", d)}; then
+       fi
 }
 
 inherit allarch update-rc.d
 
-RDEPENDS_${PN} = "weston kbd"
+RDEPENDS_${PN} = "weston \
+                  ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'kbd', '', d)} \
+                  ${@base_contains('DISTRO_FEATURES', 'systemd', 'user-session-units', '', d)} \
+                  "
+
+DEPENDS += "weston \
+            ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 
-INITSCRIPT_NAME = "weston"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+INITSCRIPT_NAME = "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'weston', '', d)}"
+INITSCRIPT_PARAMS = "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'start 9 5 2 . stop 20 0 1 6 .', '', d)}"
-- 
1.9.1




More information about the Openembedded-core mailing list