[OE-core] [PATCH v2] weston-init: Use weston-launch for XWayland
Tom Hochstein
tom.hochstein at freescale.com
Tue Dec 1 20:31:06 UTC 2015
From: Prabhu Sundararaj <prabhu.sundararaj at freescale.com>
When XWayland is configured, Weston must be started using the
weston-launch utility.
Signed-off-by: Tom Hochstein <tom.hochstein at freescale.com>
---
meta/recipes-graphics/wayland/weston-init/init | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init
index 2e938f4..d1e902f 100644
--- a/meta/recipes-graphics/wayland/weston-init/init
+++ b/meta/recipes-graphics/wayland/weston-init/init
@@ -38,7 +38,15 @@ case "$1" in
chmod 0700 $XDG_RUNTIME_DIR
fi
- openvt -s weston -- $OPTARGS
+ # If weston-launch exists, we're configured for XWayland.
+ if [ -f /usr/bin/weston-launch ]; then
+ echo "Starting Weston in XWayland"
+ export XDG_CONFIG_HOME=/etc
+ openvt -v -- weston-launch -- --log=/var/log/weston.log $OPTARGS
+ else
+ echo "Starting Weston"
+ openvt -s weston -- --log=/var/log/weston.log $OPTARGS
+ fi
;;
stop)
--
2.1.4
More information about the Openembedded-core
mailing list