diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/weston-init.bb')
-rw-r--r-- | meta/recipes-graphics/wayland/weston-init.bb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index b7a99be646..4b2a6ca983 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb | |||
@@ -26,7 +26,9 @@ DEFAULTBACKEND_qemux86 = "drm" | |||
26 | DEFAULTBACKEND_qemux86-64 = "drm" | 26 | DEFAULTBACKEND_qemux86-64 = "drm" |
27 | 27 | ||
28 | do_install() { | 28 | do_install() { |
29 | install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston | 29 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then |
30 | install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston | ||
31 | fi | ||
30 | install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini | 32 | install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini |
31 | install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston | 33 | install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston |
32 | 34 | ||
@@ -55,10 +57,13 @@ do_install() { | |||
55 | fi | 57 | fi |
56 | } | 58 | } |
57 | 59 | ||
60 | INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}" | ||
61 | |||
58 | inherit update-rc.d features_check systemd | 62 | inherit update-rc.d features_check systemd |
59 | 63 | ||
60 | # rdepends on weston which depends on virtual/egl | 64 | # rdepends on weston which depends on virtual/egl |
61 | REQUIRED_DISTRO_FEATURES = "opengl" | 65 | # requires pam enabled if started via systemd |
66 | REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" | ||
62 | 67 | ||
63 | RDEPENDS_${PN} = "weston kbd" | 68 | RDEPENDS_${PN} = "weston kbd" |
64 | 69 | ||