summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/weston-init/weston-start
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-02-02 19:27:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-05 17:46:05 +0000
commitb3bb369ba44bc29e6394e93a44ed33ac03b922c4 (patch)
treed66af2d8312c65d2d6407161c5d413a2977c7826 /meta/recipes-graphics/wayland/weston-init/weston-start
parent35666a87ae0ce873bd1dc35742a3f78322beee01 (diff)
downloadpoky-b3bb369ba44bc29e6394e93a44ed33ac03b922c4.tar.gz
weston: upgrade 9.0.0 -> 10.0.0
Release announcement with changes: https://lists.freedesktop.org/archives/wayland-devel/2022-February/042103.html Upstream has deprecated both weston-launch and fbdev backend, so let's not delay the inevitable and find replacements. Fbdev can be replaced by passing --use-pixman to drm backend; this will bypass the opengl paths and use CPU for rendering. Apply where GL is too slow or unavailable. weston-launch can be replaced by starting weston directly, with a seat management daemon for support. This is provided either by systemd, or on systemd-less systems, by seatd. The sysvinit startup scripts and tests have been rewritten accordingly. Bonus fix: under sysvinit weston now starts under weston user as it should, and not under root. Upstream discussion: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725 License-Update: copyright years (From OE-Core rev: 4efc81fc575aea1e12e00de8644a4b853719f8df) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston-init/weston-start')
-rwxr-xr-xmeta/recipes-graphics/wayland/weston-init/weston-start30
1 files changed, 2 insertions, 28 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index 0f1bc4c29d..01670cd4f5 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -6,7 +6,7 @@ export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
6 6
7usage() { 7usage() {
8 cat <<EOF 8 cat <<EOF
9 $0 [<openvt arguments>] [-- <weston options>] 9 $0 [<weston options>]
10EOF 10EOF
11} 11}
12 12
@@ -18,11 +18,6 @@ add_weston_argument() {
18 weston_args="$weston_args $1" 18 weston_args="$weston_args $1"
19} 19}
20 20
21# Add openvt extra argument
22add_openvt_argument() {
23 openvt_args="$openvt_args $1"
24
25}
26## Add module to --modules argument 21## Add module to --modules argument
27add_weston_module() { 22add_weston_module() {
28 if [[ "x${weston_modules}" == "x" ]]; then 23 if [[ "x${weston_modules}" == "x" ]]; then
@@ -37,33 +32,12 @@ if [ -n "$WAYLAND_DISPLAY" ]; then
37fi 32fi
38 33
39if [ -n "$WESTON_USER" ]; then 34if [ -n "$WESTON_USER" ]; then
40 if [ -z "$WESTON_TTY" ]; then
41 echo "ERROR: If you have WESTON_USER variable set, you also need WESTON_TTY."
42 exit 1
43 fi
44 if [ -z "$WESTON_GROUP" ]; then 35 if [ -z "$WESTON_GROUP" ]; then
45 # no explicit WESTON_GROUP given, therefore use WESTON_USER 36 # no explicit WESTON_GROUP given, therefore use WESTON_USER
46 export WESTON_GROUP="${WESTON_USER}" 37 export WESTON_GROUP="${WESTON_USER}"
47 fi 38 fi
48 weston_args_user="-u $WESTON_USER -t $WESTON_TTY"
49fi 39fi
50 40
51if [ -n "$DISPLAY" ]; then
52 launcher="weston"
53else
54 launcher="weston-launch $weston_args_user --"
55fi
56
57openvt_args="-s"
58while [ -n "$1" ]; do
59 if [ "$1" = "--" ]; then
60 shift
61 break
62 fi
63 openvt_args="$openvt_args $1"
64 shift
65done
66
67weston_args=$* 41weston_args=$*
68 42
69# Load and run modules 43# Load and run modules
@@ -94,4 +68,4 @@ if test -z "$XDG_RUNTIME_DIR"; then
94 fi 68 fi
95fi 69fi
96 70
97exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log 71su -c "XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` weston $weston_args --log=/tmp/weston.log" $WESTON_USER