Display manager proposal for x11 and wayland
v3 cover Display manager proposal for x11 and wayland
From: Randolph Sapp <[email protected]>
We've recently run into some issues with weston-init attempting to start Weston prior to all drm devices being registered. There's not really a good, scriptable mechanism to listen in to device registration events that works with the existing weston-init package. Well, at least one that doesn't involve polling files or introducing more dependency on the init system being used.
I also see there is also a lot of scripting around starting X11, xserver-nodm-init, that (from my limited review) should experience the same issue.
I'd like to introduce the following display manager for oe-core, emptty [1]. This display manager is, as described upstream, a "Dead simple CLI Display Manager on TTY". It supports both x11 and wayland sessions, with togglable build parameters to completely remove x11 and pam dependencies. It's licensed MIT, which shouldn't be an issue for any users. (It is written in Go, if you have opinions about that.)
With this, both weston-init and the xserver-nodm-init packages can be re-tuned to leverage this display manager and simply add a user and emptty config for an autologin session. This can resolve the current behavior across init systems without additional scripting, and move some development out of this layer.
This lists myself as a maintainer of emptty as well as xserver-nodm-init and xuser-account since these are currently unassigned and I've reworked them significantly here.
Sorry for the delay on this series. I found a few bugs in emptty that I wanted to address before submitting this officially.
[1] https://github.com/tvrzna/emptty
v2:
- Address spelling issues in commit messages
- Attempt to resolve some test related issues with weston
- Add additional logs to X11 related tests
v3:
- Reset AUTOLOGIN_MAX_RETRY to the default value of 2. When running under QEMU the first auth attempt almost always fails.
Randolph Sapp (3):
emptty: add version 0.14.0
weston-init: convert to virtual-emptty-conf
xserver-nodm-init: convert to virtual-emptty-conf
.../conf/distro/include/default-providers.inc | 1 + meta/conf/distro/include/maintainers.inc | 6 +- meta/lib/oeqa/runtime/cases/weston.py | 2 +- meta/lib/oeqa/runtime/cases/xorg.py | 8 + meta/recipes-graphics/emptty/emptty-conf.bb | 14 + meta/recipes-graphics/emptty/emptty.inc | 26 ++ .../recipes-graphics/emptty/emptty/emptty.tab | 1 + meta/recipes-graphics/emptty/emptty/pamconf | 10 + meta/recipes-graphics/emptty/emptty_0.14.0.bb | 53 +++ meta/recipes-graphics/wayland/weston-init.bb | 61 +-- .../wayland/weston-init/emptty.conf | 77 ++++ .../recipes-graphics/wayland/weston-init/init | 54 --- .../wayland/weston-init/weston-autologin | 11 - .../wayland/weston-init/weston-socket.sh | 20 - .../wayland/weston-init/weston-start | 76 ---- .../wayland/weston-init/weston.env | 0 .../wayland/weston-init/weston.service | 71 ---- .../wayland/weston-init/weston.socket | 14 - .../x11-common/xserver-nodm-init/X11/Xsession | 38 -- .../X11/Xsession.d/13xdgbasedirs.sh | 19 - .../X11/Xsession.d/89xdgautostart.sh | 7 - .../X11/Xsession.d/90XWindowManager.sh | 7 - .../x11-common/xserver-nodm-init/Xserver | 25 -- .../xserver-nodm-init/capability.conf | 2 - .../xserver-nodm-init/default.desktop | 5 + .../xserver-nodm-init/emptty.conf.in | 77 ++++ .../xserver-nodm-init/gplv2-license.patch | 355 ------------------ .../x11-common/xserver-nodm-init/xserver-nodm | 75 ---- .../xserver-nodm-init/xserver-nodm.conf.in | 7 - .../xserver-nodm-init/xserver-nodm.service.in | 11 - .../x11-common/xserver-nodm-init_3.0.bb | 57 +-- .../user-creation/xuser-account_0.1.bb | 3 +- 32 files changed, 307 insertions(+), 886 deletions(-) create mode 100644 meta/recipes-graphics/emptty/emptty-conf.bb create mode 100644 meta/recipes-graphics/emptty/emptty.inc create mode 100644 meta/recipes-graphics/emptty/emptty/emptty.tab create mode 100644 meta/recipes-graphics/emptty/emptty/pamconf create mode 100644 meta/recipes-graphics/emptty/emptty_0.14.0.bb create mode 100644 meta/recipes-graphics/wayland/weston-init/emptty.conf delete mode 100644 meta/recipes-graphics/wayland/weston-init/init delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston-autologin delete mode 100755 meta/recipes-graphics/wayland/weston-init/weston-socket.sh delete mode 100755 meta/recipes-graphics/wayland/weston-init/weston-start delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.env delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.service delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.socket delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch delete mode 100755 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in
Signature · 1 line
2.49.0
PATCH v3 1/3 emptty: add version 0.14.0
From: Randolph Sapp <[email protected]>
Add emptty, a "Dead simple CLI Display Manager on TTY". This is a relatively lightweight display manager that supports x11 as well as wayland through both a CLI and an automatic login mechanism.
This can effectively replace the custom init scripts for both x11 (xserver-nodm-init) and wayland (weston-init) with a single tool with more verbose logging capabilities.
This is split into two recipes. The emptty package provides the binary and various agnostic configs while the emptty-conf package provides the default configuration for the application itself. This RPROVIDES virtual-emptty-conf, allowing other recipes to provide their own configurations to override the default behavior.
--- .../conf/distro/include/default-providers.inc | 1 + meta/conf/distro/include/maintainers.inc | 2 + meta/recipes-graphics/emptty/emptty-conf.bb | 14 +++++ meta/recipes-graphics/emptty/emptty.inc | 26 +++++++++ .../recipes-graphics/emptty/emptty/emptty.tab | 1 + meta/recipes-graphics/emptty/emptty/pamconf | 10 ++++ meta/recipes-graphics/emptty/emptty_0.14.0.bb | 53 +++++++++++++++++++ 7 files changed, 107 insertions(+) create mode 100644 meta/recipes-graphics/emptty/emptty-conf.bb create mode 100644 meta/recipes-graphics/emptty/emptty.inc create mode 100644 meta/recipes-graphics/emptty/emptty/emptty.tab create mode 100644 meta/recipes-graphics/emptty/emptty/pamconf create mode 100644 meta/recipes-graphics/emptty/emptty_0.14.0.bb
meta/conf/distro/include/default-providers.inc +1 -0
@@ -68,3 +68,4 @@ PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" PREFERRED_PROVIDER_virtual/nativesdk-libsdl2 ?= "nativesdk-libsdl2" PREFERRED_RPROVIDER_virtual-x-terminal-emulator ?= "rxvt-unicode" +PREFERRED_RPROVIDER_virtual-emptty-conf ?= "emptty-conf"
meta/conf/distro/include/maintainers.inc +2 -0
@@ -172,6 +172,8 @@ RECIPE_MAINTAINER:pn-efivar = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-efibootmgr = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-elfutils = "Zang Ruochen <[email protected]>" RECIPE_MAINTAINER:pn-ell = "Zang Ruochen <[email protected]>" +RECIPE_MAINTAINER:pn-emptty = "Randolph Sapp <[email protected]>" +RECIPE_MAINTAINER:pn-emptty-conf = "Randolph Sapp <[email protected]>" RECIPE_MAINTAINER:pn-enchant2 = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-encodings = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-epiphany = "Unassigned <[email protected]>"
meta/recipes-graphics/emptty/emptty-conf.bb new file +14 -0
@@ -0,0 +1,14 @@ +require emptty.inc + +SUMMARY += " (Default config)" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install () { + oe_runmake -C ${S}/src/${GO_IMPORT} DESTDIR=${D} install-config +} + +FILES:${PN}-conf = "${sysconfdir}/emptty/conf" +CONFFILES:${PN}-conf = "${sysconfdir}/emptty/conf" +RPROVIDES:${PN}-conf += "virtual-emptty-conf"
meta/recipes-graphics/emptty/emptty.inc new file +26 -0
@@ -0,0 +1,26 @@ +SUMMARY = "Dead simple CLI Display Manager on TTY" +DESCRIPTION = "Emptty is a simple display manager with a command line greeter \ +It supports both X11 and Wayland sessions, exporting required variables and \ +creating user paths as necessary." + +HOMEPAGE = "https://github.com/tvrzna/emptty" +BUGTRACKER = "https://github.com/tvrzna/emptty/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=d1e4d12c7d1d17367ba5668706a405ba" + +S = "${UNPACKDIR}" + +FILESEXTRAPATHS:append = ":${THISDIR}/emptty" + +GO_IMPORT = "github.com/tvrzna/emptty" +GO_IMPORT_pam = "github.com/msteinert/pam" +SRC_URI = "\ + git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=src/${GO_IMPORT} \ + git://${GO_IMPORT_pam}.git;protocol=https;branch=master;name=pam;destsuffix=src/${GO_IMPORT_pam} \ + file://pamconf \ + file://emptty.tab \ + " +SRCREV = "d162bef75fadc8ae1d8e33dbb3de5e2795a196e0" +SRCREV_pam = "50ded1b0e7864b9bf75005eb945a8ec826bcf69d" + +SRCREV_FORMAT .= "_pam"
meta/recipes-graphics/emptty/emptty/emptty.tab new file +1 -0
@@ -0,0 +1 @@ +7:5:respawn:/usr/bin/emptty -t 7 -d
meta/recipes-graphics/emptty/emptty/pamconf new file +10 -0
@@ -0,0 +1,10 @@ +#%PAM-1.0 +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include common-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet5.so +account include common-account +session include common-session +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet5.so auto_start force_run +password include common-password
meta/recipes-graphics/emptty/emptty_0.14.0.bb new file +53 -0
53 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v3 2/3 weston-init: convert to virtual-emptty-conf
In reply to [email protected]From: Randolph Sapp <[email protected]>
Convert this script package into a simple config for emptty using the same weston user but leveraging the nopasswdlogin session provided by emptty. Runtime provide virtual-emptty-conf as we need to set parameters for the default session.
--- meta/lib/oeqa/runtime/cases/weston.py | 2 +- meta/recipes-graphics/wayland/weston-init.bb | 61 +++------------ .../wayland/weston-init/emptty.conf | 77 +++++++++++++++++++ .../recipes-graphics/wayland/weston-init/init | 54 ------------- .../wayland/weston-init/weston-autologin | 11 --- .../wayland/weston-init/weston-socket.sh | 20 ----- .../wayland/weston-init/weston-start | 76 ------------------ .../wayland/weston-init/weston.env | 0 .../wayland/weston-init/weston.service | 71 ----------------- .../wayland/weston-init/weston.socket | 14 ---- 10 files changed, 90 insertions(+), 296 deletions(-) create mode 100644 meta/recipes-graphics/wayland/weston-init/emptty.conf delete mode 100644 meta/recipes-graphics/wayland/weston-init/init delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston-autologin delete mode 100755 meta/recipes-graphics/wayland/weston-init/weston-socket.sh delete mode 100755 meta/recipes-graphics/wayland/weston-init/weston-start delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.env delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.service delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.socket
meta/lib/oeqa/runtime/cases/weston.py +1 -1
@@ -37,7 +37,7 @@ class WestonTest(OERuntimeTestCase): def run_weston_init(self): if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']: - self.target.run('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR=/tmp -E WAYLAND_DISPLAY=wayland-0 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file) + self.target.run(self.get_weston_command('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR -E WAYLAND_DISPLAY /usr/bin/weston --socket=wayland-2 --log=%s' % self.weston_log_file)) else: self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-2 --log=%s' % self.weston_log_file))
meta/recipes-graphics/wayland/weston-init.bb +12 -49
93 lines not on this page · raw message
meta/recipes-graphics/wayland/weston-init/emptty.conf new file +77 -0
77 lines not on this page · raw message
meta/recipes-graphics/wayland/weston-init/init deleted +0 -54
54 lines not on this page · raw message
meta/recipes-graphics/wayland/weston-init/weston-autologin deleted +0 -11
@@ -1,11 +0,0 @@ -auth required pam_nologin.so -auth required pam_unix.so try_first_pass nullok - -account required pam_nologin.so -account required pam_unix.so - -session required pam_env.so -session required pam_unix.so --session optional pam_systemd.so type=wayland class=user desktop=weston --session optional pam_loginuid.so -
meta/recipes-graphics/wayland/weston-init/weston-socket.sh deleted +0 -20
@@ -1,20 +0,0 @@ -#!/bin/sh - -# set weston variables for use with global weston socket -global_socket="/run/wayland-0" -if [ -e "$global_socket" ]; then - weston_group=$(stat -c "%G" "$global_socket") - if [ "$(id -u)" = "0" ]; then - export WAYLAND_DISPLAY="$global_socket" - else - case "$(groups "$USER")" in - *"$weston_group"*) - export WAYLAND_DISPLAY="$global_socket" - ;; - *) - ;; - esac - fi - unset weston_group -fi -unset global_socket
meta/recipes-graphics/wayland/weston-init/weston-start deleted +0 -76
76 lines not on this page · raw message
meta/recipes-graphics/wayland/weston-init/weston.env deleted +0 -0
meta/recipes-graphics/wayland/weston-init/weston.service deleted +0 -71
71 lines not on this page · raw message
meta/recipes-graphics/wayland/weston-init/weston.socket deleted +0 -14
@@ -1,14 +0,0 @@ -[Unit] -Description=Weston socket -RequiresMountsFor=/run - -[Socket] -ListenStream=/run/wayland-0 -SocketMode=0775 -SocketUser=weston -SocketGroup=wayland -RemoveOnStop=yes - -[Install] -WantedBy=sockets.target -
Signature · 1 line
2.49.0
PATCH v3 3/3 xserver-nodm-init: convert to virtual-emptty-conf
In reply to [email protected]From: Randolph Sapp <[email protected]>
Convert this script package into a simple config for emptty. This is capable of using either the root user or the underprivileged xuser account based on the same ROOTLESS_X variable. The xuser will leverage the nopasswdlogin session provided by emptty for automatic logins. Runtime provide virtual-emptty-conf as we need to set parameters for the default session.
This also gets rid of the xuser security/capability override since emptty sets up required components as root before decending into the specified user. This does not currently handle loading of autostart applications in "/etc/xdg/autostart".
License-Update: GPLv2 scripts were replaced with MIT based config files
---
meta/conf/distro/include/maintainers.inc | 4 +-
meta/lib/oeqa/runtime/cases/xorg.py | 8 +
.../x11-common/xserver-nodm-init/X11/Xsession | 38 --
.../X11/Xsession.d/13xdgbasedirs.sh | 19 -
.../X11/Xsession.d/89xdgautostart.sh | 7 -
.../X11/Xsession.d/90XWindowManager.sh | 7 -
.../x11-common/xserver-nodm-init/Xserver | 25 --
.../xserver-nodm-init/capability.conf | 2 -
.../xserver-nodm-init/default.desktop | 5 +
.../xserver-nodm-init/emptty.conf.in} | 8 +-
.../xserver-nodm-init/gplv2-license.patch | 355 ------------------
.../x11-common/xserver-nodm-init/xserver-nodm | 75 ----
.../xserver-nodm-init/xserver-nodm.conf.in | 7 -
.../xserver-nodm-init/xserver-nodm.service.in | 11 -
.../x11-common/xserver-nodm-init_3.0.bb | 57 +--
.../user-creation/xuser-account_0.1.bb | 3 +-
16 files changed, 37 insertions(+), 594 deletions(-)
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf
create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop
copy meta/recipes-graphics/{wayland/weston-init/emptty.conf => x11-common/xserver-nodm-init/emptty.conf.in} (95%)
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
delete mode 100755 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.inmeta/conf/distro/include/maintainers.inc +2 -2
@@ -922,12 +922,12 @@ RECIPE_MAINTAINER:pn-xorgproto = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xprop = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xrandr = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xrestop = "Unassigned <[email protected]>" -RECIPE_MAINTAINER:pn-xserver-nodm-init = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-xserver-nodm-init = "Randolph Sapp <[email protected]>" RECIPE_MAINTAINER:pn-xserver-xf86-config = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xserver-xorg = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xset = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xtrans = "Unassigned <[email protected]>" -RECIPE_MAINTAINER:pn-xuser-account = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-xuser-account = "Randolph Sapp <[email protected]>" RECIPE_MAINTAINER:pn-xvinfo = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xwayland = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xwininfo = "Unassigned <[email protected]>"
meta/lib/oeqa/runtime/cases/xorg.py +8 -0
@@ -20,4 +20,12 @@ class XorgTest(OERuntimeTestCase): status, output = self.target.run(cmd) msg = ('Xorg does not appear to be running %s' % self.target.run(self.tc.target_cmds['ps'])[1]) + + # dump last 20 lines of emptty log in case of failure + log_cmd = 'tail -n 20 /var/log/emptty/7.log' + msg += '\n\n===== start: snippet =====\n\n' + msg += 'file: /var/log/emptty/7.log\n\n' + msg += '\n\n%s\n\n' % self.target.run(log_cmd)[1] + msg += '\n\n===== end: snippet =====\n\n' + self.assertEqual(status, 0, msg=msg)
meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession deleted +0 -38
@@ -1,38 +0,0 @@ -#!/bin/sh - -if [ -x /usr/bin/dbus-launch ]; then - # As this is the X session script, always start a new DBus session. - eval `dbus-launch --sh-syntax --exit-with-session </dev/null` - echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS" -fi - -. /etc/profile - -if [ -f $HOME/.profile ]; then - . $HOME/.profile -fi - -SYSSESSIONDIR=/etc/X11/Xsession.d - -export CLUTTER_DISABLE_MIPMAPPED_TEXT=1 - -for SESSIONFILE in $SYSSESSIONDIR/*; do - set +e - case "$SESSIONFILE" in - *.sh) - . "$SESSIONFILE" - ;; - *.shbg) - "$SESSIONFILE" & - ;; - *~) - # Ignore backup files - ;; - *) - "$SESSIONFILE" - ;; - esac - set -e -done - -exit 0
meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh deleted +0 -19
@@ -1,19 +0,0 @@ -# Minimal/stub implementation of the XDG Base Directory specification. -# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html - -# If the runtime directory hasn't been set already (for example by systemd, -# elogind, or pam) create a directory in TMPDIR. -if [ -z "$XDG_RUNTIME_DIR" ]; then - XDG_RUNTIME_DIR=/run/user/$(id -u) - export XDG_RUNTIME_DIR -fi - -if [ -d "$XDG_RUNTIME_DIR" ]; then - # If the directory exists, check the permissions and ownership - if [ "$(stat -c %u-%a "$XDG_RUNTIME_DIR")" != "$(id -u)-700" ]; then - echo "ERROR: $XDG_RUNTIME_DIR has incorrect permissions" - exit 1 - fi -else - mkdir --mode 0700 --parents "${XDG_RUNTIME_DIR}" -fi
meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh deleted +0 -7
@@ -1,7 +0,0 @@ -XDGAUTOSTART=/etc/xdg/autostart -if [ -d $XDGAUTOSTART ]; then - for SCRIPT in $XDGAUTOSTART/*; do - CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2` - $CMD & - done -fi
meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh deleted +0 -7
@@ -1,7 +0,0 @@ -if [ -x $HOME/.Xsession ]; then - exec $HOME/.Xsession -elif [ -x /usr/bin/x-session-manager ]; then - exec /usr/bin/x-session-manager -else - exec /usr/bin/x-window-manager -fi
meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver deleted +0 -25
@@ -1,25 +0,0 @@ -#!/bin/sh - -# This script is only needed to make sure /etc/X11/xserver-common -# can affect XSERVER, ARGS & DPI: otherwise systemd could just use -# /etc/default/xserver-nodm as EnvironmentFile and sysvinit could just -# source the same file - -. /etc/profile - -# load default values for XSERVER, ARGS, DISPLAY... -. /etc/default/xserver-nodm - -# Allow xserver-common to override ARGS, XSERVER, DPI -if [ -e /etc/X11/xserver-common ] ; then - . /etc/X11/xserver-common - if [ ! -e $XSERVER ] ; then - XSERVER=$(which $XSERVER) - fi -fi - -if [ -n "$DPI" ] ; then - ARGS="$ARGS -dpi $DPI" -fi - -exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf deleted +0 -2
@@ -1,2 +0,0 @@ -cap_sys_admin @USER@ -none *
meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop new file +5 -0
@@ -0,0 +1,5 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=Default X11 Desktop +Exec=x-session-manager
meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in renamed from meta/recipes-graphics/wayland/weston-init/emptty.conf +4 -4
@@ -11,13 +11,13 @@ PRINT_ISSUE=true PRINT_MOTD=true # Preselected user, if AUTOLOGIN is enabled, this user is logged in. -DEFAULT_USER=weston +DEFAULT_USER=@USER@ # Enables Autologin, if DEFAULT_USER is defined and part of nopasswdlogin group. Possible values are "true" or "false". AUTOLOGIN=true # The default session used, if Autologin is enabled. If session is not found in list of session, it proceeds to manual selection. -AUTOLOGIN_SESSION=Weston +AUTOLOGIN_SESSION=Default X11 Desktop # If Autologin is enabled and session does not start correctly, the number of retries in short period is kept to eventually stop the infinite loop of restarts. -1 is for infinite retries, 0 is for no retry. # AUTOLOGIN_MAX_RETRY=2
@@ -41,7 +41,7 @@ VERTICAL_SELECTION=false #LOGGING_FILE=/var/log/emptty/[TTY_NUMBER].log # Arguments passed to Xorg server. -#XORG_ARGS= +XORG_ARGS=@NO_CURSOR_ARG@ @BLANK_ARGS@ # Allows to use dynamic motd script to generate custom MOTD. #DYNAMIC_MOTD=false
@@ -71,7 +71,7 @@ SESSION_ERROR_LOGGING=rotate #DEFAULT_XAUTHORITY=false #If set true, Xorg will be started as rootless, if system allows and emptty is running in daemon mode. -#ROOTLESS_XORG=false +ROOTLESS_XORG=@ROOTLESS_X_ARG@ #If set true, environmental groups are printed to differ Xorg/Wayland/Custom/UserCustom desktops. IDENTIFY_ENVS=false
meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch deleted +0 -355
355 lines not on this page · raw message
meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm deleted +0 -75
75 lines not on this page · raw message
meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in deleted +0 -7
@@ -1,7 +0,0 @@ -# common environment file for sysvinit and systemd - -XSERVER=/usr/bin/Xorg -DISPLAY=:0 -ARGS=" -br -pn @BLANK_ARGS@ @NO_CURSOR_ARG@ " -HOME=@HOME@ -USER=@USER@
meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in deleted +0 -11
@@ -1,11 +0,0 @@ -[Unit] -Description=Xserver startup without a display manager - -[Service] -EnvironmentFile=/etc/default/xserver-nodm -User=@USER@ -ExecStart=/etc/xserver-nodm/Xserver -Restart=always - -[Install] -Alias=display-manager.service
meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +16 -41
84 lines not on this page · raw message
meta/recipes-support/user-creation/xuser-account_0.1.bb +2 -1
@@ -25,7 +25,8 @@ FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--create-home \ - --groups video,tty,audio,input,shutdown,disk \ + --groups video,tty,audio,input,shutdown,disk,nopasswdlogin \ --user-group xuser" +GROUPADD_PARAM:${PN} = "-r nopasswdlogin" ALLOW_EMPTY:${PN} = "1"
Signature · 1 line
2.49.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [oe-core][PATCHv3 2/3] weston-init: convert to virtual-emptty-conf
Quoted 20 lines · Randolph Sapp via lists.openembedded.org
From: Randolph Sapp <[email protected]>
Convert this script package into a simple config for emptty using the same weston user but leveraging the nopasswdlogin session provided by emptty. Runtime provide virtual-emptty-conf as we need to set parameters for the default session.
Signed-off-by Randolph Sapp <[email protected]>--- meta/lib/oeqa/runtime/cases/weston.py | 2 +- meta/recipes-graphics/wayland/weston-init.bb | 61 +++------------ .../wayland/weston-init/emptty.conf | 77 +++++++++++++++++++ .../recipes-graphics/wayland/weston-init/init | 54 ------------- .../wayland/weston-init/weston-autologin | 11 --- .../wayland/weston-init/weston-socket.sh | 20 ----- .../wayland/weston-init/weston-start | 76 ------------------ .../wayland/weston-init/weston.env | 0 .../wayland/weston-init/weston.service | 71 ----------------- .../wayland/weston-init/weston.socket | 14 ---- 10 files changed, 90 insertions(+), 296 deletions(-)
Quoted 9 lines
create mode 100644 meta/recipes-graphics/wayland/weston-init/emptty.conf delete mode 100644 meta/recipes-graphics/wayland/weston-init/init delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston-autologin delete mode 100755 meta/recipes-graphics/wayland/weston-init/weston-socket.sh delete mode 100755 meta/recipes-graphics/wayland/weston-init/weston-start delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.env delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.service delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.socket
[snip]
Rats. I thought I had it sorted, but as it turns out the wayland failures are actually partially due to weston's xwayland launcher failing to create /tmp/.X11-unix/ if it doesn't exist. Manually creating that directory with root:root 777 as advised allows it to start correctly. Otherwise it just bails out.
Suppose I'll have to fix that first.
Quoted 26 lines · rs
From: Randolph Sapp <[email protected]>
We've recently run into some issues with weston-init attempting to start Weston prior to all drm devices being registered. There's not really a good, scriptable mechanism to listen in to device registration events that works with the existing weston-init package. Well, at least one that doesn't involve polling files or introducing more dependency on the init system being used.
I also see there is also a lot of scripting around starting X11, xserver-nodm-init, that (from my limited review) should experience the same issue.
I'd like to introduce the following display manager for oe-core, emptty [1]. This display manager is, as described upstream, a "Dead simple CLI Display Manager on TTY". It supports both x11 and wayland sessions, with togglable build parameters to completely remove x11 and pam dependencies. It's licensed MIT, which shouldn't be an issue for any users. (It is written in Go, if you have opinions about that.)
With this, both weston-init and the xserver-nodm-init packages can be re-tuned to leverage this display manager and simply add a user and emptty config for an autologin session. This can resolve the current behavior across init systems without additional scripting, and move some development out of this layer.
Quoted 7 lines
This lists myself as a maintainer of emptty as well as xserver-nodm-init and xuser-account since these are currently unassigned and I've reworked them significantly here.
Sorry for the delay on this series. I found a few bugs in emptty that I wanted to address before submitting this officially.
Hi Randolph,
Thanks for the new version, but I believe we still have some issues:
AssertionError: 1 != 0 : Xorg does not appear to be running PID USER VSZ STAT COMMAND
https://autobuilder.yoctoproject.org/valkyrie/#/builders/9/builds/1604
https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1592
https://autobuilder.yoctoproject.org/valkyrie/#/builders/26/builds/1609
https://autobuilder.yoctoproject.org/valkyrie/#/builders/74/builds/1607
https://autobuilder.yoctoproject.org/valkyrie/#/builders/95/builds/1593
AssertionError: 255 != 0 : wayland-info error: failed to create display: No such file or directory
https://autobuilder.yoctoproject.org/valkyrie/#/builders/25/builds/1621
https://autobuilder.yoctoproject.org/valkyrie/#/builders/75/builds/1534
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com