[oe-commits] [openembedded-core] 01/05: weston-init: Let weston run without pam on distros without pam

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit ae66cf5e03f04361aad2bd8784fb7d42e0f0bb08
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Thu Jan 9 10:37:53 2020 -0800

    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 at denx.de>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../weston-init/{qemux86 => qemuall}/weston.ini    |  0
 .../wayland/weston-init/qemux86-64/weston.ini      |  2 --
 .../wayland/weston-init/weston at .service            | 34 ++++------------------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
similarity index 100%
rename from meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini
rename to meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini
deleted file mode 100644
index 17ebd7f..0000000
--- a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[core]
-backend=fbdev-backend.so
diff --git a/meta/recipes-graphics/wayland/weston-init/weston at .service b/meta/recipes-graphics/wayland/weston-init/weston at .service
index 9ecf2ab..39e1930 100644
--- a/meta/recipes-graphics/wayland/weston-init/weston at .service
+++ b/meta/recipes-graphics/wayland/weston-init/weston at .service
@@ -1,37 +1,15 @@
 [Unit]
-Description=Weston Wayland Compositor (on tty7)
+Description=Weston Wayland Compositor
 RequiresMountsFor=/run
-Conflicts=getty at tty7.service plymouth-quit.service
-After=systemd-user-sessions.service getty at 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.