diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-01-09 10:37:53 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-11 15:19:21 +0000 |
| commit | ae66cf5e03f04361aad2bd8784fb7d42e0f0bb08 (patch) | |
| tree | 33104759bf942ead2cd3441b582ca21fe9158077 | |
| parent | 65d38cc1ce5a106c4c2e5068b8440eb6e5a2b33e (diff) | |
| download | openembedded-core-contrib-ae66cf5e03f04361aad2bd8784fb7d42e0f0bb08.tar.gz | |
weston-init: Let weston run without pam on distros without pam
When pam is not part of distro, user specific XDG_* environment
variables are not available since PAMName=login is in-effective and as a
result weston can not start because it direly needs XDG_RUNTIME_DIR
defined, therefore launching weston directly in systemd service will not
work, therefore call the helper script weston-start, which is also used
with sysvinit
extend enabling fbdev backend fallback to all qemu machines
Reported-by: Marek Vasut <marex@denx.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini (renamed from meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston-init/weston@.service | 34 |
3 files changed, 6 insertions, 30 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini index 17ebd7fdab..17ebd7fdab 100644 --- a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini +++ b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini deleted file mode 100644 index 17ebd7fdab..0000000000 --- a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini +++ /dev/null @@ -1,2 +0,0 @@ -[core] -backend=fbdev-backend.so diff --git a/meta/recipes-graphics/wayland/weston-init/weston@.service b/meta/recipes-graphics/wayland/weston-init/weston@.service index 9ecf2ab069..39e193014a 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston@.service +++ b/meta/recipes-graphics/wayland/weston-init/weston@.service @@ -1,37 +1,15 @@ [Unit] -Description=Weston Wayland Compositor (on tty7) +Description=Weston Wayland Compositor RequiresMountsFor=/run -Conflicts=getty@tty7.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty7.service plymouth-quit-wait.service +Conflicts=plymouth-quit.service +After=systemd-user-sessions.service plymouth-quit-wait.service [Service] User=%i -PermissionsStartOnly=true - -# Log us in via PAM so we get our XDG & co. environment and -# are treated as logged in so we can use the tty: PAMName=login - -# Grab tty7 -UtmpIdentifier=tty7 -TTYPath=/dev/tty7 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes - -# stderr to journal so our logging doesn't get thrown into /dev/null -StandardOutput=tty -StandardInput=tty -StandardError=journal - EnvironmentFile=-/etc/default/weston - -# Weston does not successfully change VT, nor does systemd place us on -# the VT it just activated for us. Switch manually: -ExecStartPre=/usr/bin/chvt 7 -ExecStart=/usr/bin/weston --log=${XDG_RUNTIME_DIR}/weston.log $OPTARGS - +StandardError=journal +PermissionsStartOnly=true IgnoreSIGPIPE=no -#[Install] -#Alias=multi-user.target.wants/weston.service +ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS |