diff options
| author |   Marek Vasut <marex@denx.de> | 2022-01-20 00:17:55 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-01-19 14:25:16 -1000 |
| commit | dabd41819563ec63fc5bd5fd0f4af64230e58130 (patch) | |
| tree | efe313933eccf01edfda8d1d19fb711530f2e4fb /meta/recipes-graphics/wayland/weston-init | |
| parent | 32dd9e93c8a49c07d28c8bf240145c9e48864de7 (diff) | |
| download | openembedded-core-contrib-dabd41819563ec63fc5bd5fd0f4af64230e58130.tar.gz | |
Revert "weston: Use systemd notify,"
Commit 4efdcc1090 ("weston: Use systemd notify,") has non-trivial to
backport dependencies without which it cannot work, revert backport.
In oe-core dunfell, weston is still started using /usr/bin/weston-start
script in meta/recipes-graphics/wayland/weston-init/weston@.service .
Since 76ed534267 ("weston-init: Use weston-launch when starting weston
as the first windowing system"), the weston-start script starts weston
using weston-launch executable in case $DISPLAY is not set, i.e. when
weston is started as the primary compositor.
When weston is started via weston-launch, the notification to systemd
is not delivered, and weston service fails to start with the following:
"
weston@root.service: start operation timed out. Terminating.
"
The weston systemd service has been reworked considerably since oe-core
dunfell in commit c21fa5a291 ("weston-init: Redefine weston service and
add socket activation option"), which replaced the use of weston-start
in weston@.service with plain weston, and has been further improved in
commit dd83fb40f7 ("weston-init: Stop running weston as root") . The
commit reverted here, oe-core/master commit c8aa0222ce ("weston: wrapper
for weston modules argument"), landed only with the two aforementioned
reworks already in place, therefore the commit could have never been
tested with weston started via weston-launch executable and the timeout
at delivering systemd notification could not have happened in master.
Both c21fa5a291 ("weston-init: Redefine weston service and add socket
activation option") and dd83fb40f7 ("weston-init: Stop running weston
as root") are large feature patches and thus unsuitable for stable
backports, hence this revert seems to be the least problematic way.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Joshua Watt <JPEWhacker@gmail.com>
Cc: Pavel Zhukov <pavel.zhukov@huawei.com>
Cc: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston-init')
| -rwxr-xr-x | meta/recipes-graphics/wayland/weston-init/weston-start | 12 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston-init/weston@.service | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start index 97471df80d..ccc7093425 100755 --- a/meta/recipes-graphics/wayland/weston-init/weston-start +++ b/meta/recipes-graphics/wayland/weston-init/weston-start @@ -23,15 +23,6 @@ add_openvt_argument() { openvt_args="$openvt_args $1" } -## Add module to --modules argument -add_weston_module() { - if [ -z "${weston_modules}" ]; then - weston_modules="--modules " - fi; - weston_modules="${weston_modules}${1}," -} - - if [ -n "$WAYLAND_DISPLAY" ]; then echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." exit 1 @@ -74,9 +65,6 @@ if [ -d "$modules_dir" ]; then # process module . $m done - if [ -n "${weston_modules}" ]; then - add_weston_argument "${weston_modules} " - fi; fi if test -z "$XDG_RUNTIME_DIR"; then diff --git a/meta/recipes-graphics/wayland/weston-init/weston@.service b/meta/recipes-graphics/wayland/weston-init/weston@.service index 70c706d75c..39e193014a 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston@.service +++ b/meta/recipes-graphics/wayland/weston-init/weston@.service @@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - [Unit] Description=Weston Wayland Compositor RequiresMountsFor=/run @@ -9,8 +5,6 @@ Conflicts=plymouth-quit.service After=systemd-user-sessions.service plymouth-quit-wait.service [Service] -Type=notify -NotifyAccess=all User=%i PAMName=login EnvironmentFile=-/etc/default/weston |