Skip to contentSkip to conversation

Display manager proposal for x11 and wayland

PATCH New [email protected] 1 participant 7 messages Feb 27

lore
Share & tools
lore
#0 lore raw

v16 cover Display manager proposal for x11 and wayland

From: Randolph Sapp <[email protected]>

No functional changes. Just bumping PR to help with automated testing issues.

Information from v15:

Alright, now that cgo binary reproducibility has been addressed this should be good to go. One slight change from v13, I replaced the inittab.d entry with a rootfs-postcommands function since busybox-init doesn't support it.

Information from v13:

Hello maintainers, I wanted to wait for the latest tag to get cut before bringing this back up, but here it is. This version addresses most of the concerns I've seen regarding this series and adds on a little more functionality considering we now allow for proper session selection.

This led me into a bit of a dive into the desktop-entry-spec [1] and associated validator [2] that I wouldn't mind some opinions on as well if people are curious about that.

Legacy details follow:

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 [3]. 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://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/110
[2] https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/28
[3] 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.
v4:
- Add a tmpfile entry for the x11 domain socket directory.
- Remove some scripts associated with weston-init that were being shipped with weston
v5:
- Move tmpfile data to individual files
- Add explicit entries for these in the FILES variable
v6:
- Do not attempt to ship a tmpfiles.d entry in libx11
v7:
- Include a backported fix for go/runtime to address segfault issues reported on x86 platforms in previous revisions
v8:
- Sign-off backported patch
v9:
- Resolve merge conflict in maintainers file
v10:
- Remove the ability to run x11 as root in xserver-nodm-init, see
https://lists.openembedded.org/g/openembedded-core/topic/115318655#msg223906
for more information
- Merge xuser-account and xserver-nodm-init as this is now a direct dependency with no other consumers
- Fix warning about multiple providers for virtual-emptty-conf
v11:
- Bump emptty revision to 0.15.0
- Add session entries for all the session providers
- Make autologin default session configurable for xserver-nodm-init
v12:
- Add util-linux-mcookie as a runtime dependency to emptty when x11 support is enabled
v13:
- Add nopasswdlogin to the static group definitions list, also register it in the emptty recipe itself since the pam rule provided in that package mentions it
- Always ship the legacy inittab entry, since it's possible the end user has some unusual distro configuration with multiple init managers enabled
v14:
- Move from legacy inittab.d entry that only sysvinit supports to modifying the inittab file itself for both sysvinit and busybox init support
v15:
- Remind myself how POSIX shell "return" is supposed to work when not given an explicit value
v16:
- Bump PR to make sure caching isn't generating weird test results after changes to source date epoch calculation method

Randolph Sapp (6):
emptty: add version 0.15.0
weston-init: convert to virtual-emptty-conf
weston: remove deprecated weston-start scripts
xserver-nodm-init: convert to virtual-emptty-conf
xuser-account: merge with xserver-nodm-init
xsessions: add unique desktop entries

 meta-selftest/files/static-group              |   2 +-
 .../rootfs-postcommands.bbclass               |  14 +-
 .../conf/distro/include/default-providers.inc |   1 +
 meta/conf/distro/include/maintainers.inc      |   5 +-
 meta/lib/oeqa/runtime/cases/weston.py         |  18 +-
 meta/lib/oeqa/runtime/cases/xorg.py           |   8 +
 meta/recipes-graphics/emptty/emptty-conf.bb   |  14 +
 meta/recipes-graphics/emptty/emptty.inc       |  27 ++
 meta/recipes-graphics/emptty/emptty/pamconf   |  10 +
 meta/recipes-graphics/emptty/emptty_0.15.0.bb |  55 +++
 .../matchbox-session/matchbox-session.desktop |   6 +
 .../matchbox-session/matchbox-session_0.1.bb  |  13 +-
 .../files/mini-x-session.desktop              |   6 +
 .../mini-x-session/mini-x-session_0.1.bb      |  13 +-
 meta/recipes-graphics/wayland/weston-init.bb  |  66 +---
 .../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 -
 .../weston/systemd-notify.weston-start        |   9 -
 .../wayland/weston/xwayland.weston-start      |   6 -
 .../recipes-graphics/wayland/weston_14.0.2.bb |  10 -
 .../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/emptty.conf.in          |  77 ++++
 .../xserver-nodm-init/gplv2-license.patch     | 355 ------------------
 .../xserver-nodm-init}/system-xuser.conf      |   0
 .../x11-common/xserver-nodm-init/xserver-nodm |  75 ----
 .../xserver-nodm-init/xserver-nodm.conf.in    |   7 -
 .../xserver-nodm-init/xserver-nodm.service.in |  13 -
 .../x11-common/xserver-nodm-init_3.0.bb       |  73 ++--
 .../user-creation/xuser-account_0.1.bb        |  30 --
 40 files changed, 358 insertions(+), 976 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/pamconf
 create mode 100644 meta/recipes-graphics/emptty/emptty_0.15.0.bb
 create mode 100644 meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session.desktop
 create mode 100644 meta/recipes-graphics/mini-x-session/files/mini-x-session.desktop
 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/wayland/weston/systemd-notify.weston-start
 delete mode 100644 meta/recipes-graphics/wayland/weston/xwayland.weston-start
 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/emptty.conf.in
 delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
 rename meta/{recipes-support/user-creation/files => recipes-graphics/x11-common/xserver-nodm-init}/system-xuser.conf (100%)
 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
 delete mode 100644 meta/recipes-support/user-creation/xuser-account_0.1.bb

--
2.53.0

#1 lore raw

PATCH v16 1/6 emptty: add version 0.15.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.

---
 meta-selftest/files/static-group              |  1 +
 .../rootfs-postcommands.bbclass               | 14 ++++-
 .../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       | 27 +++++++++
 meta/recipes-graphics/emptty/emptty/pamconf   | 10 ++++
 meta/recipes-graphics/emptty/emptty_0.15.0.bb | 55 +++++++++++++++++++
 8 files changed, 123 insertions(+), 1 deletion(-)
 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/pamconf
 create mode 100644 meta/recipes-graphics/emptty/emptty_0.15.0.bb
meta-selftest/files/static-group +1 -0
index 3fca4aa5c9..1c3c6b73e3 100644
@@ -28,4 +28,5 @@ ptest:x:529:
 xuser:x:530:
 seat:x:531:
 audio:x:532:
+nopasswdlogin:x:533:
 nogroup:x:65534:
meta/classes-recipe/rootfs-postcommands.bbclass +13 -1
index f0c7ee658d..a6a23b46a9 100644
@@ -45,7 +45,7 @@ POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
 SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains_any("IMAGE_FEATURES", [ "x11-base", "weston" ], "graphical.target", "multi-user.target", d)}'
 ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target systemd_sysusers_check systemd_handle_machine_id", "", d)}'
 
-ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile'
+ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile add_emptty_inittab'
 
 ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "overlayfs", "overlayfs_qa_check", "", d)}'
 
@@ -193,6 +193,18 @@ systemd_handle_machine_id() {
     fi
 }
 
+#
+# A hook function to work around limitations of legacy inittab behavior
+#
+add_emptty_inittab() {
+    [ -f ${IMAGE_ROOTFS}${sysconfdir}/inittab ] || return 0
+
+    if ${@bb.utils.contains_any("IMAGE_FEATURES", [ "x11-base", "weston" ], "true", "false", d)}
+    then
+	echo "7:5:respawn:${bindir}/emptty -t 7 -d" >> ${IMAGE_ROOTFS}${sysconfdir}/inittab
+    fi
+}
+
 #
 # A hook function to support read-only-rootfs IMAGE_FEATURES
 #
meta/conf/distro/include/default-providers.inc +1 -0
index 5101ad78f8..e9a6d299bc 100644
@@ -67,3 +67,4 @@ PREFERRED_PROVIDER_virtual/nativesdk-libsdl2 ?= "nativesdk-libsdl2"
 PREFERRED_RPROVIDER_virtual-libegl-icd ?= "mesa"
 PREFERRED_RPROVIDER_virtual-libglx-icd ?= "mesa"
 PREFERRED_RPROVIDER_virtual-x-terminal-emulator ?= "rxvt-unicode"
+PREFERRED_RPROVIDER_virtual-emptty-conf ?= "emptty-conf"
meta/conf/distro/include/maintainers.inc +2 -0
index b5ab35d92a..81c7919aa4 100644
@@ -171,6 +171,8 @@ RECIPE_MAINTAINER:pn-efivar = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER:pn-efibootmgr = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER:pn-elfutils = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-ell = "Unassigned <[email protected]>"
+RECIPE_MAINTAINER:pn-emptty = "Randolph Sapp <[email protected]>"
+RECIPE_MAINTAINER:pn-emptty-conf = "Randolph Sapp <[email protected]>"
 RECIPE_MAINTAINER:pn-enchant2 = "Unassigned <[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
new file mode 100644
index 0000000000..0b98e2e13e
@@ -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} = "${sysconfdir}/emptty/conf"
+CONFFILES:${PN} = "${sysconfdir}/emptty/conf"
+RPROVIDES:${PN} += "virtual-emptty-conf"
meta/recipes-graphics/emptty/emptty.inc new file +27 -0
new file mode 100644
index 0000000000..d99c4d8c39
@@ -0,0 +1,27 @@
+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 \
+    "
+SRCREV = "bb203ad0a224731a7a2ff50deeb342ab79c4af09"
+SRCREV_pam = "50ded1b0e7864b9bf75005eb945a8ec826bcf69d"
+
+SRCREV_FORMAT .= "_pam"
+
+PR = "r1"
meta/recipes-graphics/emptty/emptty/pamconf new file +10 -0
new file mode 100644
index 0000000000..9cbfd6c4a5
@@ -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.15.0.bb new file +55 -0

55 lines not on this page · raw message

Signature · 1 line
2.53.0
#2 lore raw

PATCH v16 2/6 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-selftest/files/static-group              |  1 -
 meta/lib/oeqa/runtime/cases/weston.py         | 18 +++--
 meta/recipes-graphics/wayland/weston-init.bb  | 66 +++-------------
 .../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 ----
 11 files changed, 101 insertions(+), 307 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-selftest/files/static-group +0 -1
index 1c3c6b73e3..c941513acb 100644
@@ -21,7 +21,6 @@ bind:x:521:
 builder:x:522:
 weston-launch:x:524:
 weston:x:525:
-wayland:x:526:
 render:x:527:
 sgx:x:528:
 ptest:x:529:
meta/lib/oeqa/runtime/cases/weston.py +12 -6
index b0dccee73b..bf18331e84 100644
@@ -33,7 +33,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))
 
@@ -51,12 +51,18 @@ class WestonTest(OERuntimeTestCase):
 
     @OEHasPackage(['wayland-utils'])
     def test_wayland_info(self):
-        if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']:
-            command = 'XDG_RUNTIME_DIR=/run wayland-info'
-        else:
-            command = self.get_weston_command('wayland-info')
+        command = self.get_weston_command('wayland-info')
         status, output = self.target.run(command)
-        self.assertEqual(status, 0, msg='wayland-info error: %s' % output)
+        msg = 'wayland-info error: %s' % output
+
+        # 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)
 
     @OEHasPackage(['weston'])
     def test_weston_can_initialize_new_wayland_compositor(self):
meta/recipes-graphics/wayland/weston-init.bb +12 -54

99 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
deleted file mode 100644
index f6e6d106de..0000000000
@@ -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
deleted file mode 100755
index 8f652862da..0000000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# set weston variables for use with global weston socket
-global_socket="@runtimedir@/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
deleted file mode 100644
index e69de29bb2..0000000000
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
deleted file mode 100644
index a7d461ee30..0000000000
@@ -1,14 +0,0 @@
-[Unit]
-Description=Weston socket
-RequiresMountsFor=@runtimedir@
-
-[Socket]
-ListenStream=@runtimedir@/wayland-0
-SocketMode=0775
-SocketUser=@WESTON_USER@
-SocketGroup=wayland
-RemoveOnStop=yes
-
-[Install]
-WantedBy=sockets.target
-
Signature · 1 line
2.53.0
#3 lore raw

PATCH v16 3/6 weston: remove deprecated weston-start scripts

In reply to [email protected]

From: Randolph Sapp <[email protected]>

The weston-start scripts are not parsed unless using the old version of weston-init. These files are no longer required since weston-init moved to a virtual-emptty-conf.

---
 .../wayland/weston/systemd-notify.weston-start         |  9 ---------
 .../wayland/weston/xwayland.weston-start               |  6 ------
 meta/recipes-graphics/wayland/weston_14.0.2.bb         | 10 ----------
 3 files changed, 25 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston/systemd-notify.weston-start
 delete mode 100644 meta/recipes-graphics/wayland/weston/xwayland.weston-start
meta/recipes-graphics/wayland/weston/systemd-notify.weston-start deleted +0 -9
deleted file mode 100644
index a97e7b38d9..0000000000
@@ -1,9 +0,0 @@
-#!/bin/sh
-  
-# SPDX-FileCopyrightText: Huawei Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-
-if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then
-        add_weston_module "systemd-notify.so"
-fi
meta/recipes-graphics/wayland/weston/xwayland.weston-start deleted +0 -6
deleted file mode 100644
index 342ac8d129..0000000000
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if type Xwayland  >/dev/null 2>/dev/null; then
-	mkdir -m 775 -p /tmp/.X11-unix
-	chown root:video /tmp/.X11-unix
-fi
meta/recipes-graphics/wayland/weston_14.0.2.bb +0 -10
index c53b03def0..7ac7d5d314 100644
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
 SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
            file://weston.png \
            file://weston.desktop \
-           file://xwayland.weston-start \
-           file://systemd-notify.weston-start \
            file://0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch \
            "
 
@@ -108,14 +106,6 @@ do_install:append() {
 		install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
 	fi
 
-	if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-		install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
-	fi
-
-	if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-		install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
-	fi
-
 	if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
 		chmod u+s ${D}${bindir}/weston-launch
 	fi
Signature · 1 line
2.53.0
#4 lore raw

PATCH v16 4/6 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 descending into the specified user. This does not currently handle loading of autostart applications in "/etc/xdg/autostart".

This explicitly removes rooted x11 support for security related issues, as this recipe has always automatically setup passwordless login for the specified account. This was particularly useful for the underprivileged xuser account, but is quickly a problem for the root user.

See the following discussion for additional information:
https://lists.openembedded.org/g/openembedded-core/topic/115318655#msg223906

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 |  13 -
 .../x11-common/xserver-nodm-init_3.0.bb       |  64 +---
 .../user-creation/xuser-account_0.1.bb        |   3 +-
 16 files changed, 35 insertions(+), 605 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.in
meta/conf/distro/include/maintainers.inc +2 -2
index 81c7919aa4..7c95ac5a9a 100644
@@ -929,12 +929,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
index 09afb1e3d1..8593be5b77 100644
@@ -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
deleted file mode 100644
index 0b73127ae1..0000000000
@@ -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
deleted file mode 100644
index 912f79761c..0000000000
@@ -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
deleted file mode 100644
index 3d7008ca45..0000000000
@@ -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
deleted file mode 100644
index b936dedf3b..0000000000
@@ -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
deleted file mode 100644
index 0edbfbfc20..0000000000
@@ -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
deleted file mode 100644
index 7ab7460816..0000000000
@@ -1,2 +0,0 @@
-cap_sys_admin	@USER@
-none	*
meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop new file +5 -0
new file mode 100644
index 0000000000..3357cd9a7f
@@ -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
similarity index 95%
copy from meta/recipes-graphics/wayland/weston-init/emptty.conf
copy to meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in
index 1918cc02a7..bdb3bec782 100644
@@ -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=xuser
 
 # 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=true
 
 #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
deleted file mode 100644
index 4a9670d8d2..0000000000
@@ -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 -13
deleted file mode 100644
index 43aaa84c0f..0000000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=Xserver startup without a display manager
-After=systemd-udev-settle.service
-Wants=systemd-udev-settle.service
-
-[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 +14 -50

84 lines not on this page · raw message

meta/recipes-support/user-creation/xuser-account_0.1.bb +2 -1
index 04f506e7a3..f1e4cb674f 100644
@@ -24,7 +24,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.53.0
#5 lore raw

PATCH v16 5/6 xuser-account: merge with xserver-nodm-init

In reply to [email protected]

From: Randolph Sapp <[email protected]>

Merge the xuser-account recipe with xserver-nodm-init, since:

- This is the only recipe dependent on it
- This matches the current behavior in weston-init
- Running x11 as root is no longer a supported path in xserver-nodm-init
- The display manager configuration and user account name are heavily connected
- The existing method of integration ignored this connection

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../xserver-nodm-init}/system-xuser.conf      |  0
 .../x11-common/xserver-nodm-init_3.0.bb       | 20 +++++++++---
 .../user-creation/xuser-account_0.1.bb        | 31 -------------------
 4 files changed, 15 insertions(+), 37 deletions(-)
 rename meta/{recipes-support/user-creation/files => recipes-graphics/x11-common/xserver-nodm-init}/system-xuser.conf (100%)
 delete mode 100644 meta/recipes-support/user-creation/xuser-account_0.1.bb
meta/conf/distro/include/maintainers.inc +0 -1
index 7c95ac5a9a..19fa6c977e 100644
@@ -934,7 +934,6 @@ RECIPE_MAINTAINER:pn-xserver-xf86-config = "Unassigned <unassigned@yoctoproject.
 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 = "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/recipes-graphics/x11-common/xserver-nodm-init/system-xuser.conf renamed from meta/recipes-support/user-creation/files/system-xuser.conf +0 -0
similarity index 100%
rename from meta/recipes-support/user-creation/files/system-xuser.conf
rename to meta/recipes-graphics/x11-common/xserver-nodm-init/system-xuser.conf
meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +15 -5
index ed056df72f..0e9fe1e65a 100644
@@ -1,14 +1,15 @@
-SUMMARY = "Simple Xserver Init Script (no dm)"
+SUMMARY = "Simple Xserver Init Script and user account"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SECTION = "x11"
 
 SRC_URI = "file://emptty.conf.in \
-           file://default.desktop"
+           file://default.desktop \
+           file://system-xuser.conf"
 
 S = "${UNPACKDIR}"
 
-inherit features_check
+inherit features_check useradd
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
@@ -26,10 +27,19 @@ do_install() {
 
     sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/emptty/conf
     sed -i "s:@BLANK_ARGS@:${BLANK_ARGS}:" ${D}${sysconfdir}/emptty/conf
+
+    install -D -m 0644 ${S}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf
 }
 
 FILES:${PN} = "${sysconfdir}/emptty/conf \
-               ${datadir}/xsessions/default.desktop"
+               ${datadir}/xsessions/default.desktop \
+               ${sysconfdir}/dbus-1/system.d/system-xuser.conf"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = "--create-home \
+                       --groups video,tty,audio,input,shutdown,disk,nopasswdlogin \
+                       --user-group xuser"
+GROUPADD_PARAM:${PN} = "-r nopasswdlogin"
 
-RDEPENDS:${PN} = "emptty xuser-account"
+RDEPENDS:${PN} = "emptty"
 RPROVIDES:${PN} += "virtual-emptty-conf"
meta/recipes-support/user-creation/xuser-account_0.1.bb deleted +0 -31
deleted file mode 100644
index f1e4cb674f..0000000000
@@ -1,31 +0,0 @@
-SUMMARY = "Creates an 'xuser' account used for running X11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = "file://system-xuser.conf"
-
-inherit allarch useradd
-
-S = "${UNPACKDIR}"
-
-do_configure() {
-    :
-}
-
-do_compile() {
-    :
-}
-
-do_install() {
-    install -D -m 0644 ${UNPACKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf
-}
-
-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,nopasswdlogin \
-                       --user-group xuser"
-GROUPADD_PARAM:${PN} = "-r nopasswdlogin"
-
-ALLOW_EMPTY:${PN} = "1"
Signature · 1 line
2.53.0
#6 lore raw

PATCH v16 6/6 xsessions: add unique desktop entries

In reply to [email protected]

From: Randolph Sapp <[email protected]>

Now that we have a display manager, users can have the option to choose a session manager with the default emptty configuration. Currently this could be either mini-x-session or matchbox-session.

Previously, only one was selectable via update-alternatives logic switching out the x-session-manager link that xserver-nodm-init would unconditionally use. From my testing this normally resulted in matchbox-session being chosen.

Now xserver-nodm-init will use a DEFAULT_SESSION variable to configure the automatic login session, and both of these session managers will provide unique desktop entries for their respective sessions.

The loose default for DEFAULT_SESSION will be matchbox-session to keep in line with the existing behavior.

---
 .../matchbox-session/matchbox-session.desktop       |  6 ++++++
 .../matchbox-session/matchbox-session_0.1.bb        | 13 ++++++-------
 .../mini-x-session/files/mini-x-session.desktop     |  6 ++++++
 .../mini-x-session/mini-x-session_0.1.bb            | 13 ++++++-------
 .../x11-common/xserver-nodm-init/default.desktop    |  5 -----
 .../x11-common/xserver-nodm-init/emptty.conf.in     |  2 +-
 .../x11-common/xserver-nodm-init_3.0.bb             |  7 ++++---
 7 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session.desktop
 create mode 100644 meta/recipes-graphics/mini-x-session/files/mini-x-session.desktop
 delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop
meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session.desktop new file +6 -0
new file mode 100644
index 0000000000..f496fd860f
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Matchbox Session
+Comment=Very simple session manager for matchbox tools
+Type=Application
+Exec=matchbox-session
+DesktopNames=matchbox
meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb +6 -7
index d8be3417cc..bee18ad617 100644
@@ -9,17 +9,16 @@ LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c3
 SECTION = "x11"
 RCONFLICTS:${PN} = "matchbox-common"
 
-SRC_URI = "file://matchbox-session"
+SRC_URI = "file://matchbox-session \
+           file://matchbox-session.desktop"
 
 S = "${UNPACKDIR}"
 
-inherit update-alternatives
-
-ALTERNATIVE:${PN} = "x-session-manager"
-ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "100"
-
 do_install() {
 	install -d ${D}/${bindir}
 	install -m 0755 ${S}/matchbox-session ${D}/${bindir}
+	install -d ${D}${datadir}/xsessions
+	install -m 0644 ${S}/matchbox-session.desktop ${D}${datadir}/xsessions
 }
+
+FILES:${PN} += "${datadir}/xsessions"
meta/recipes-graphics/mini-x-session/files/mini-x-session.desktop new file +6 -0
new file mode 100644
index 0000000000..d7afed9cfd
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Mini X Session
+Comment=Very simple session manager for X
+Type=Application
+Exec=mini-x-session
+DesktopNames=matchbox
meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb +6 -7
index e90786df44..b223c38c9e 100644
@@ -9,19 +9,18 @@ LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938
 SECTION = "x11"
 RCONFLICTS:${PN} = "matchbox-common"
 
-SRC_URI = "file://mini-x-session"
+SRC_URI = "file://mini-x-session \
+           file://mini-x-session.desktop"
 
 S = "${UNPACKDIR}"
 
 RDEPENDS:${PN} = "sudo"
 
-inherit update-alternatives
-
-ALTERNATIVE:${PN} = "x-session-manager"
-ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/mini-x-session"
-ALTERNATIVE_PRIORITY = "50"
-
 do_install() {
 	install -d ${D}/${bindir}
 	install -m 0755 ${S}/mini-x-session ${D}/${bindir}
+	install -d ${D}${datadir}/xsessions
+	install -m 0644 ${S}/mini-x-session.desktop ${D}${datadir}/xsessions
 }
+
+FILES:${PN} += "${datadir}/xsessions"
meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop deleted +0 -5
deleted file mode 100644
index 3357cd9a7f..0000000000
@@ -1,5 +0,0 @@
-[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 +1 -1
index bdb3bec782..fbe106d9b6 100644
@@ -17,7 +17,7 @@ DEFAULT_USER=xuser
 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=Default X11 Desktop
+AUTOLOGIN_SESSION=@DEFAULT_SESSION@
 
 # 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
meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +4 -3
index 0e9fe1e65a..a4b4a11d1b 100644
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 SECTION = "x11"
 
 SRC_URI = "file://emptty.conf.in \
-           file://default.desktop \
            file://system-xuser.conf"
 
 S = "${UNPACKDIR}"
@@ -18,21 +17,23 @@ PACKAGECONFIG ??= "blank"
 PACKAGECONFIG[blank] = ""
 PACKAGECONFIG[nocursor] = ""
 
+# matchbox-session seems to be the current preferred session provider
+DEFAULT_SESSION ??= "matchbox-session"
+
 do_install() {
     install -D -p -m0644 ${S}/emptty.conf.in ${D}${sysconfdir}/emptty/conf
-    install -D -p -m0644 ${S}/default.desktop ${D}${datadir}/xsessions/default.desktop
 
     BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}"
     NO_CURSOR_ARG="${@bb.utils.contains('PACKAGECONFIG', 'nocursor', '-nocursor', '', d)}"
 
     sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/emptty/conf
     sed -i "s:@BLANK_ARGS@:${BLANK_ARGS}:" ${D}${sysconfdir}/emptty/conf
+    sed -i "s:@DEFAULT_SESSION@:${DEFAULT_SESSION}:" ${D}${sysconfdir}/emptty/conf
 
     install -D -m 0644 ${S}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf
 }
 
 FILES:${PN} = "${sysconfdir}/emptty/conf \
-               ${datadir}/xsessions/default.desktop \
                ${sysconfdir}/dbus-1/system.d/system-xuser.conf"
 
 USERADD_PACKAGES = "${PN}"
Signature · 1 line
2.53.0