summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/weston-init.bb
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-11-09 09:31:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-11 10:08:12 +0000
commita839c9ba881ea3fae06a3a4d85e27832a9b2762d (patch)
treecae106dc91cbdd8f9ec10417b9521a4ed207d64e /meta/recipes-graphics/wayland/weston-init.bb
parent65993a90a6c3b780cf724f6409683b4b8e6c1845 (diff)
downloadpoky-a839c9ba881ea3fae06a3a4d85e27832a9b2762d.tar.gz
weston-init: correctly start under systemd
Several issues are addressed: 1. weston requires pam when starting under systemd 2. systemd was attempting to launch weston twice (from sysvinit script and from systemd unit file) which caused confusion and errors. 3. runtime test should stop/start weston via systemd only if systemd actually controls system startup, not merely when systemd is present. (From OE-Core rev: 72dd74c5d384dbe641cc7c02ecf766ff8d5f555f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston-init.bb')
-rw-r--r--meta/recipes-graphics/wayland/weston-init.bb9
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"
26DEFAULTBACKEND_qemux86-64 = "drm" 26DEFAULTBACKEND_qemux86-64 = "drm"
27 27
28do_install() { 28do_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
60INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}"
61
58inherit update-rc.d features_check systemd 62inherit 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
61REQUIRED_DISTRO_FEATURES = "opengl" 65# requires pam enabled if started via systemd
66REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}"
62 67
63RDEPENDS_${PN} = "weston kbd" 68RDEPENDS_${PN} = "weston kbd"
64 69