weston-init: guard against systemd configs

Just as sysvinit scripts shouldn't be present in a distro using systemd,
systemd scripts shouldn't be present in a system not using systemd.

Signed-off-by: Randolph Sapp <rs@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index e538469a58bc748eaac837e4684c5ad779bfe6b0..9d892d58f2f461aa1fae169e915cccf147049915 100644 (file)
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -26,27 +26,32 @@ DEFAULTBACKEND ??= ""
 DEFAULTBACKEND:qemuall ?= "drm"
 
 do_install() {
+       # Install weston-start script
        if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
+               install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start
+               sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start
+               sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
                install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
                sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston
        fi
-       install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini
-       install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston
 
        # Install Weston systemd service and accompanying udev rule
-       install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service
-       install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket
+       if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+               install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service
+               install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket
+               sed -i -e s:/etc:${sysconfdir}:g \
+                       -e s:/usr/bin:${bindir}:g \
+                       -e s:/var:${localstatedir}:g \
+                       ${D}${systemd_system_unitdir}/weston.service
+       fi
+
        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
                install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin
        fi
-       sed -i -e s:/etc:${sysconfdir}:g \
-               -e s:/usr/bin:${bindir}:g \
-               -e s:/var:${localstatedir}:g \
-               ${D}${systemd_system_unitdir}/weston.service
-       # Install weston-start script
-       install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start
-       sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start
-       sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
+
+       install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini
+       install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston
+
        if [ -n "${DEFAULTBACKEND}" ]; then
                sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini
        fi