summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-01-09 10:37:53 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-11 15:19:27 +0000
commit3189be6d6319d3b598beb52db0ea48fd7516b381 (patch)
tree8d5d012b18df6df52b8a6a719629ac8082ea60e6 /meta/recipes-graphics
parent34c7222e1d8601cb459da1070bf2065a1c7707eb (diff)
downloadpoky-3189be6d6319d3b598beb52db0ea48fd7516b381.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> (From OE-Core rev: ae66cf5e03f04361aad2bd8784fb7d42e0f0bb08) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-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.ini2
-rw-r--r--meta/recipes-graphics/wayland/weston-init/weston@.service34
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 @@
1[core]
2backend=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 @@
1[Unit] 1[Unit]
2Description=Weston Wayland Compositor (on tty7) 2Description=Weston Wayland Compositor
3RequiresMountsFor=/run 3RequiresMountsFor=/run
4Conflicts=getty@tty7.service plymouth-quit.service 4Conflicts=plymouth-quit.service
5After=systemd-user-sessions.service getty@tty7.service plymouth-quit-wait.service 5After=systemd-user-sessions.service plymouth-quit-wait.service
6 6
7[Service] 7[Service]
8User=%i 8User=%i
9PermissionsStartOnly=true
10
11# Log us in via PAM so we get our XDG & co. environment and
12# are treated as logged in so we can use the tty:
13PAMName=login 9PAMName=login
14
15# Grab tty7
16UtmpIdentifier=tty7
17TTYPath=/dev/tty7
18TTYReset=yes
19TTYVHangup=yes
20TTYVTDisallocate=yes
21
22# stderr to journal so our logging doesn't get thrown into /dev/null
23StandardOutput=tty
24StandardInput=tty
25StandardError=journal
26
27EnvironmentFile=-/etc/default/weston 10EnvironmentFile=-/etc/default/weston
28 11StandardError=journal
29# Weston does not successfully change VT, nor does systemd place us on 12PermissionsStartOnly=true
30# the VT it just activated for us. Switch manually:
31ExecStartPre=/usr/bin/chvt 7
32ExecStart=/usr/bin/weston --log=${XDG_RUNTIME_DIR}/weston.log $OPTARGS
33
34IgnoreSIGPIPE=no 13IgnoreSIGPIPE=no
35 14
36#[Install] 15ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS
37#Alias=multi-user.target.wants/weston.service