summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Schulz <quentin.schulz@cherry.de>2024-08-21 11:15:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-23 09:12:37 +0100
commit005c9350fbe89bd06b8277f3d7d0e5bb38979605 (patch)
tree31d54ae19c4e79fc8722bd87d15c4b73ad10dedf
parent54706243e272ecac430023734bc6012e09b47ba4 (diff)
downloadpoky-005c9350fbe89bd06b8277f3d7d0e5bb38979605.tar.gz
weston-init: fix weston not starting when xwayland is enabled
When xwayland PACKAGECONFIG option is set, xwayland is enabled in weston.ini. However, if the xwayland module isn't installed, weston will refuse to start with the following error message: Failed to load module: /usr/lib/libweston-13/xwayland.so: cannot open shared object file: No such file or directory Therefore, whenever the xwayland PACKAGECONFIG is set, weston-init should depend on weston-xwayland to bring this module in. Fixes: fdbe559c66c9 ("weston.init: enabled xwayland") (From OE-Core rev: fa2314125318634108452af4e40c9eeee260767c) Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston-init.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index 83f0cea49c..3de697ec34 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -84,7 +84,7 @@ USERADD_PACKAGES = "${PN}"
84# 84#
85require ${THISDIR}/required-distro-features.inc 85require ${THISDIR}/required-distro-features.inc
86 86
87RDEPENDS:${PN} = "weston kbd" 87RDEPENDS:${PN} = "weston kbd ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
88 88
89INITSCRIPT_NAME = "weston" 89INITSCRIPT_NAME = "weston"
90INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." 90INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."