summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2016-05-18 13:40:47 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 22:24:56 +0100
commit5fb0c1edcee0b267cb4f5191002898f70675baa0 (patch)
tree56c2ae38351a52dc5ee7850e8822c56d76e79b87 /meta/recipes-graphics
parent7b779c8c2aa43c1a263962f395c2602211ed5159 (diff)
downloadopenembedded-core-contrib-5fb0c1edcee0b267cb4f5191002898f70675baa0.tar.gz
openembedded-core-contrib-5fb0c1edcee0b267cb4f5191002898f70675baa0.tar.bz2
openembedded-core-contrib-5fb0c1edcee0b267cb4f5191002898f70675baa0.zip
weston-init: Use weston-launch when starting weston as the first windowing system
When weston is started as the first windowing system (i.e. not under X nor under another Wayland server), it should be done with the command weston-launch to set up proper privileged access to devices. (From OE-Core rev: 76ed534267ed16677eeb86b85670338a1064a733) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rwxr-xr-xmeta/recipes-graphics/wayland/weston-init/weston-start7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index 4aa7c66d3b..72ba4b7079 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -31,6 +31,11 @@ if [ -n "$WAYLAND_DISPLAY" ]; then
echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet."
exit 1
fi
+if [ -n "$DISPLAY" ]; then
+ launcher="weston"
+else
+ launcher="weston-launch --"
+fi
openvt_args=""
while [ -n "$1" ]; do
@@ -64,4 +69,4 @@ if test -z "$XDG_RUNTIME_DIR"; then
chmod 0700 $XDG_RUNTIME_DIR
fi
-exec openvt $openvt_args -- weston $weston_args --log=/var/log/weston.log
+exec openvt $openvt_args -- $launcher $weston_args --log=/var/log/weston.log