From d72fe250e4eafb4147ff21ad0624b23ea3bede4c Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Wed, 21 Aug 2024 11:15:56 +0200 Subject: [PATCH] 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: ba66fa75e57f94d35bfd703075ea6706879c63cb) Signed-off-by: Quentin Schulz Signed-off-by: Richard Purdie (cherry picked from commit fa2314125318634108452af4e40c9eeee260767c) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/wayland/weston-init.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 024e400665..34b7eb78d2 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -83,7 +83,7 @@ USERADD_PACKAGES = "${PN}" # require ${THISDIR}/required-distro-features.inc -RDEPENDS:${PN} = "weston kbd" +RDEPENDS:${PN} = "weston kbd ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}" INITSCRIPT_NAME = "weston" INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."