* [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland
@ 2025-05-20 23:39 rs
2025-05-20 23:39 ` [oe-core][PATCHv6 1/5] libx11: create tmpfile dir for x11 domain socket rs
` (5 more replies)
0 siblings, 6 replies; 13+ messages in thread
From: rs @ 2025-05-20 23:39 UTC (permalink / raw)
To: mathieu.dubois-briand, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
From: Randolph Sapp <rs@ti.com>
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.
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
Randolph Sapp (5):
libx11: create tmpfile dir for x11 domain socket
emptty: add version 0.14.0
weston-init: convert to virtual-emptty-conf
weston: remove deprecated weston-start scripts
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 | 18 +-
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 -
.../weston/systemd-notify.weston-start | 9 -
.../wayland/weston/xwayland.weston-start | 6 -
.../recipes-graphics/wayland/weston_14.0.1.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/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 +--
meta/recipes-graphics/xorg-lib/libx11/99_x11 | 1 +
.../xorg-lib/libx11_1.8.12.bb | 15 +-
.../user-creation/xuser-account_0.1.bb | 3 +-
37 files changed, 332 insertions(+), 918 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/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/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
create mode 100644 meta/recipes-graphics/xorg-lib/libx11/99_x11
--
2.49.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [oe-core][PATCHv6 1/5] libx11: create tmpfile dir for x11 domain socket
2025-05-20 23:39 [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland rs
@ 2025-05-20 23:39 ` rs
2025-05-20 23:39 ` [oe-core][PATCHv6 2/5] emptty: add version 0.14.0 rs
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: rs @ 2025-05-20 23:39 UTC (permalink / raw)
To: mathieu.dubois-briand, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
From: Randolph Sapp <rs@ti.com>
Register a volatile directory entry for the x11 domain socket when not
using systemd. This will make sure the directory is always created with
the correct permissions. Systemd already provides their own tmpfile.d
entry for the same behavior.
Currently some x11 related applications will create this directory if it
doesn't already exist, but this is not true for everything. In addition,
if the application in question isn't started as root, it's possible this
directory can be owned by a non-root user. This isn't an issue by
itself, but it can potentially lead to problems in a multi-user
environment.
Signed-off-by: Randolph Sapp <rs@ti.com>
---
meta/recipes-graphics/xorg-lib/libx11/99_x11 | 1 +
meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb | 15 +++++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11/99_x11
diff --git a/meta/recipes-graphics/xorg-lib/libx11/99_x11 b/meta/recipes-graphics/xorg-lib/libx11/99_x11
new file mode 100644
index 0000000000..53c5b49d10
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/99_x11
@@ -0,0 +1 @@
+d root root 1777 /tmp/.X11-unix none
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
index 5ce5481743..46b6992839 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
@@ -22,7 +22,8 @@ PE = "1"
XORG_PN = "libX11"
-SRC_URI += "file://disable_tests.patch"
+SRC_URI += "file://disable_tests.patch \
+ file://99_x11"
SRC_URI[sha256sum] = "fa026f9bb0124f4d6c808f9aef4057aad65e7b35d8ff43951cef0abe06bb9a9a"
@@ -36,7 +37,17 @@ PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
PACKAGES =+ "${PN}-xcb"
-FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt"
+do_install:append() {
+ # temporary directory required for x11 domain sockets
+ # systemd provides their own definition using tmpfiles.d
+ if ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'false', 'true', d)}; then
+ install -d ${D}${sysconfdir}/default/volatiles
+ install -m 0644 ${UNPACKDIR}/99_x11 ${D}${sysconfdir}/default/volatiles/99_x11
+ fi
+}
+
+FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt \
+ ${libdir}/tmpfiles.d/x11.conf ${sysconfdir}/default/volatiles/99_x11"
FILES:${PN}-xcb += "${libdir}/libX11-xcb.so.*"
FILES:${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
--
2.49.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [oe-core][PATCHv6 2/5] emptty: add version 0.14.0
2025-05-20 23:39 [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland rs
2025-05-20 23:39 ` [oe-core][PATCHv6 1/5] libx11: create tmpfile dir for x11 domain socket rs
@ 2025-05-20 23:39 ` rs
2025-05-20 23:39 ` [oe-core][PATCHv6 3/5] weston-init: convert to virtual-emptty-conf rs
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: rs @ 2025-05-20 23:39 UTC (permalink / raw)
To: mathieu.dubois-briand, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
From: Randolph Sapp <rs@ti.com>
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.
Signed-off-by: Randolph Sapp <rs@ti.com>
---
.../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
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index ee91af8796..b5446c0f92 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -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"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 6c19e306cf..b39ff50fa6 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -172,6 +172,8 @@ RECIPE_MAINTAINER:pn-efivar = "Ross Burton <ross.burton@arm.com>"
RECIPE_MAINTAINER:pn-efibootmgr = "Ross Burton <ross.burton@arm.com>"
RECIPE_MAINTAINER:pn-elfutils = "Zang Ruochen <zangruochen@loongson.cn>"
RECIPE_MAINTAINER:pn-ell = "Zang Ruochen <zangruochen@loongson.cn>"
+RECIPE_MAINTAINER:pn-emptty = "Randolph Sapp <rs@ti.com>"
+RECIPE_MAINTAINER:pn-emptty-conf = "Randolph Sapp <rs@ti.com>"
RECIPE_MAINTAINER:pn-enchant2 = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-encodings = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-epiphany = "Unassigned <unassigned@yoctoproject.org>"
diff --git a/meta/recipes-graphics/emptty/emptty-conf.bb b/meta/recipes-graphics/emptty/emptty-conf.bb
new file mode 100644
index 0000000000..0aacb086cd
--- /dev/null
+++ b/meta/recipes-graphics/emptty/emptty-conf.bb
@@ -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"
diff --git a/meta/recipes-graphics/emptty/emptty.inc b/meta/recipes-graphics/emptty/emptty.inc
new file mode 100644
index 0000000000..11d5770f3a
--- /dev/null
+++ b/meta/recipes-graphics/emptty/emptty.inc
@@ -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"
diff --git a/meta/recipes-graphics/emptty/emptty/emptty.tab b/meta/recipes-graphics/emptty/emptty/emptty.tab
new file mode 100644
index 0000000000..6359c7224d
--- /dev/null
+++ b/meta/recipes-graphics/emptty/emptty/emptty.tab
@@ -0,0 +1 @@
+7:5:respawn:/usr/bin/emptty -t 7 -d
diff --git a/meta/recipes-graphics/emptty/emptty/pamconf b/meta/recipes-graphics/emptty/emptty/pamconf
new file mode 100644
index 0000000000..9cbfd6c4a5
--- /dev/null
+++ b/meta/recipes-graphics/emptty/emptty/pamconf
@@ -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
diff --git a/meta/recipes-graphics/emptty/emptty_0.14.0.bb b/meta/recipes-graphics/emptty/emptty_0.14.0.bb
new file mode 100644
index 0000000000..11d306a56d
--- /dev/null
+++ b/meta/recipes-graphics/emptty/emptty_0.14.0.bb
@@ -0,0 +1,53 @@
+require emptty.inc
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam x11', d)}"
+PACKAGECONFIG[pam] = ",,libpam,pam-plugin-succeed-if"
+PACKAGECONFIG[x11] = ",,virtual/libx11"
+
+DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'virtual/crypt', d)}"
+
+GO_TAGS = ""
+GO_TAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pam', '', ',nopam', d)}"
+GO_TAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ',noxlib', d)}"
+
+GOBUILDFLAGS:append = " -tags=${GO_TAGS}"
+
+export GO111MODULE = "off"
+
+inherit go
+
+DEPENDS += "gzip"
+
+do_install () {
+ # general collateral
+ install -Dm755 ${B}/${GO_BUILD_BINDIR}/emptty ${D}${bindir}/emptty
+ install -d ${D}${mandir}/man1
+ gzip -cn ${S}/src/${GO_IMPORT}/res/emptty.1 > ${D}${mandir}/man1/emptty.1.gz
+
+ # pam config
+ if "${@bb.utils.contains('PACKAGECONFIG','pam','true','false',d)}"
+ then
+ install -Dm644 ${S}/pamconf ${D}${sysconfdir}/pam.d/emptty
+ fi
+
+ # init services
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}
+ then
+ oe_runmake -C ${S}/src/${GO_IMPORT} DESTDIR=${D} install-systemd
+ else
+ install -Dm644 ${S}/emptty.tab ${D}${sysconfdir}/inittab.d/emptty.tab
+ fi
+}
+
+FILES:${PN} = "\
+ ${systemd_system_unitdir}/emptty.service \
+ ${sysconfdir}/inittab.d/emptty.tab \
+ ${bindir}/emptty \
+ ${mandir}/man1/emptty.1.gz \
+ ${sysconfdir}/pam.d/emptty \
+"
+
+RDEPENDS:${PN} += "virtual-emptty-conf"
+SYSTEMD_SERVICE:${PN} = "emptty.service"
+
+inherit systemd
--
2.49.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [oe-core][PATCHv6 3/5] weston-init: convert to virtual-emptty-conf
2025-05-20 23:39 [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland rs
2025-05-20 23:39 ` [oe-core][PATCHv6 1/5] libx11: create tmpfile dir for x11 domain socket rs
2025-05-20 23:39 ` [oe-core][PATCHv6 2/5] emptty: add version 0.14.0 rs
@ 2025-05-20 23:39 ` rs
2025-05-20 23:39 ` [oe-core][PATCHv6 4/5] weston: remove deprecated weston-start scripts rs
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: rs @ 2025-05-20 23:39 UTC (permalink / raw)
To: mathieu.dubois-briand, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
From: Randolph Sapp <rs@ti.com>
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 <rs@ti.com>
---
meta/lib/oeqa/runtime/cases/weston.py | 18 +++--
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, 101 insertions(+), 301 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
diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py
index ee4d336482..69be1f65e3 100644
--- a/meta/lib/oeqa/runtime/cases/weston.py
+++ b/meta/lib/oeqa/runtime/cases/weston.py
@@ -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))
@@ -55,12 +55,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):
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index 5723655a9b..d20cdd6803 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -1,17 +1,13 @@
-SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor"
+SUMMARY = "Autologin package for the Weston Wayland compositor"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-SRC_URI = "file://init \
- file://weston.env \
+SRC_URI = "\
file://weston.ini \
- file://weston.service \
- file://weston.socket \
- file://weston-socket.sh \
- file://weston-autologin \
- file://weston-start"
+ file://emptty.conf \
+"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
@@ -28,32 +24,8 @@ DEFAULTBACKEND ??= ""
DEFAULTBACKEND:qemuall ?= "drm"
do_install() {
- # Install weston-start script
- if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
- install -Dm755 ${S}/weston-start ${D}${bindir}/weston-start
- sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start
- sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
- install -Dm755 ${S}/init ${D}/${sysconfdir}/init.d/weston
- sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston
- fi
-
- # Install Weston systemd service
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -D -p -m0644 ${S}/weston.service ${D}${systemd_system_unitdir}/weston.service
- install -D -p -m0644 ${S}/weston.socket ${D}${systemd_system_unitdir}/weston.socket
- install -D -p -m0644 ${S}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh
- sed -i -e s:/etc:${sysconfdir}:g \
- -e s:/usr/bin:${bindir}:g \
- -e s:/var:${localstatedir}:g \
- ${D}${systemd_system_unitdir}/weston.service
- fi
-
- if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
- install -D -p -m0644 ${S}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin
- fi
-
install -D -p -m0644 ${S}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini
- install -Dm644 ${S}/weston.env ${D}${sysconfdir}/default/weston
+ install -D -p -m0644 ${S}/emptty.conf ${D}${sysconfdir}/emptty/conf
if [ -n "${DEFAULTBACKEND}" ]; then
sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini
@@ -74,9 +46,7 @@ do_install() {
install -dm 755 -o weston -g weston ${D}/home/weston
}
-INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}"
-
-inherit update-rc.d systemd useradd
+inherit useradd
USERADD_PACKAGES = "${PN}"
@@ -84,23 +54,16 @@ USERADD_PACKAGES = "${PN}"
#
require ${THISDIR}/required-distro-features.inc
-RDEPENDS:${PN} = "weston kbd ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
-
-INITSCRIPT_NAME = "weston"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+RDEPENDS:${PN} = "emptty weston kbd ${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'weston-xwayland', '', d)}"
FILES:${PN} += "\
${sysconfdir}/xdg/weston/weston.ini \
- ${sysconfdir}/profile.d/weston-socket.sh \
- ${systemd_system_unitdir}/weston.service \
- ${systemd_system_unitdir}/weston.socket \
- ${sysconfdir}/default/weston \
- ${sysconfdir}/pam.d/ \
+ ${sysconfdir}/emptty/conf \
/home/weston \
"
-CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston"
+CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/emptty/conf"
+RPROVIDES:${PN} += "virtual-emptty-conf"
-SYSTEMD_SERVICE:${PN} = "weston.service weston.socket"
-USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render,seat,wayland weston"
-GROUPADD_PARAM:${PN} = "-r wayland; -r render; -r seat"
+USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render,seat,nopasswdlogin weston"
+GROUPADD_PARAM:${PN} = "-r nopasswdlogin; -r render; -r seat"
diff --git a/meta/recipes-graphics/wayland/weston-init/emptty.conf b/meta/recipes-graphics/wayland/weston-init/emptty.conf
new file mode 100644
index 0000000000..1918cc02a7
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston-init/emptty.conf
@@ -0,0 +1,77 @@
+# TTY, where emptty will start.
+TTY_NUMBER=7
+
+# Enables switching to defined TTY number.
+SWITCH_TTY=true
+
+# Enables printing of /etc/issue in daemon mode.
+PRINT_ISSUE=true
+
+# Enables printing of default motd, /etc/emptty/motd or /etc/emptty/motd-gen.sh.
+PRINT_MOTD=true
+
+# Preselected user, if AUTOLOGIN is enabled, this user is logged in.
+DEFAULT_USER=weston
+
+# 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
+
+# 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
+
+# Default LANG, if user does not have set own in init script.
+#LANG=en_US.UTF-8
+
+# Starts desktop with calling "dbus-launch".
+DBUS_LAUNCH=true
+
+# Starts Xorg desktop with calling "~/.xinitrc" script, if is true, file exists and selected WM/DE is Xorg session, it overrides DBUS_LAUNCH.
+XINITRC_LAUNCH=false
+
+# Prints available WM/DE each on new line instead of printing on single line.
+VERTICAL_SELECTION=false
+
+# Defines the way, how is logging handled. Possible values are "rotate", "appending" or "disabled".
+#LOGGING=rotate
+
+# Overrides path of log file
+#LOGGING_FILE=/var/log/emptty/[TTY_NUMBER].log
+
+# Arguments passed to Xorg server.
+#XORG_ARGS=
+
+# Allows to use dynamic motd script to generate custom MOTD.
+#DYNAMIC_MOTD=false
+
+# Allows to override default path to dynamic motd.
+#DYNAMIC_MOTD_PATH=/etc/emptty/motd-gen.sh
+
+# Allows to override default path to static motd.
+#MOTD_PATH=/etc/emptty/motd
+
+# Foreground color, available only in daemon mode.
+#FG_COLOR=LIGHT_BLACK
+
+# Background color, available only in daemon mode.
+#BG_COLOR=BLACK
+
+# Enables numlock in daemon mode. Possible values are "true" or "false".
+#ENABLE_NUMLOCK=false
+
+# Defines the way, how is logging of session errors handled. Possible values are "rotate", "appending" or "disabled".
+SESSION_ERROR_LOGGING=rotate
+
+# Overrides path of session errors log file
+#SESSION_ERROR_LOGGING_FILE=/var/log/emptty/session-errors.[TTY_NUMBER].log
+
+# If set true, it will not use `.emptty-xauth` file, but the standard `~/.Xauthority` file. This allows to handle xauth issues.
+#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
+
+#If set true, environmental groups are printed to differ Xorg/Wayland/Custom/UserCustom desktops.
+IDENTIFY_ENVS=false
diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init
deleted file mode 100644
index a5c54e001e..0000000000
--- a/meta/recipes-graphics/wayland/weston-init/init
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: weston
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-### END INIT INFO
-
-if test -e /etc/default/weston ; then
- . /etc/default/weston
-fi
-
-killproc() {
- pid=`/bin/pidof $1`
- [ "$pid" != "" ] && kill $pid
-}
-
-read CMDLINE < /proc/cmdline
-for x in $CMDLINE; do
- case $x in
- weston=false)
- echo "Weston disabled"
- exit 0;
- ;;
- esac
-done
-
-case "$1" in
- start)
- . /etc/profile
- export HOME=ROOTHOME
-
- WESTON_USER=weston weston-start $OPTARGS &
- ;;
-
- stop)
- echo "Stopping Weston"
- killproc weston
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- *)
- echo "usage: $0 { start | stop | restart }"
- ;;
-esac
-
-exit 0
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-autologin b/meta/recipes-graphics/wayland/weston-init/weston-autologin
deleted file mode 100644
index f6e6d106de..0000000000
--- a/meta/recipes-graphics/wayland/weston-init/weston-autologin
+++ /dev/null
@@ -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
-
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-socket.sh b/meta/recipes-graphics/wayland/weston-init/weston-socket.sh
deleted file mode 100755
index 86389d63a3..0000000000
--- a/meta/recipes-graphics/wayland/weston-init/weston-socket.sh
+++ /dev/null
@@ -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
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
deleted file mode 100755
index 3b13a0047a..0000000000
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 O.S. Systems Software LTDA.
-# Copyright (C) 2016 Freescale Semiconductor
-
-export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-usage() {
- cat <<EOF
- $0 [<weston options>]
-EOF
-}
-
-## Module support
-modules_dir=@DATADIR@/weston-start
-
-# Add weston extra argument
-add_weston_argument() {
- weston_args="$weston_args $1"
-}
-
-## Add module to --modules argument
-add_weston_module() {
- if [[ "x${weston_modules}" == "x" ]]; then
- weston_modules="--modules "
- fi;
- weston_modules+="${1},"
-}
-
-if [ -n "$WAYLAND_DISPLAY" ]; then
- echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet."
- exit 1
-fi
-
-if [ -n "$WESTON_USER" ]; then
- if [ -z "$WESTON_GROUP" ]; then
- # no explicit WESTON_GROUP given, therefore use WESTON_USER
- export WESTON_GROUP="${WESTON_USER}"
- fi
-fi
-
-weston_args=$*
-
-# Load and run modules
-if [ -d "$modules_dir" ]; then
- for m in "$modules_dir"/*; do
- # Skip backup files
- if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then
- continue
- fi
-
- # process module
- . $m
- if [[ x"{$weston_modules}" != "x" ]]; then
- add_weston_argument "${weston_modules}"
- fi;
- done
-fi
-
-if test -z "$XDG_RUNTIME_DIR"; then
- export XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}`
- if test -d "$XDG_RUNTIME_DIR"; then
- # Check permissions on existing directory
- if [ "$(stat -c %u-%a "$XDG_RUNTIME_DIR")" != "$(id -u ${WESTON_USER})-700" ]; then
- echo "ERROR: $XDG_RUNTIME_DIR has incorrect permissions"
- exit 1
- fi
- else
- mkdir --mode 0700 --parents $XDG_RUNTIME_DIR
- if [ -n "$WESTON_USER" ]
- then
- chown $WESTON_USER:$WESTON_GROUP $XDG_RUNTIME_DIR
- fi
- fi
-fi
-
-su -c "XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR weston $weston_args --log=/tmp/weston.log" $WESTON_USER
diff --git a/meta/recipes-graphics/wayland/weston-init/weston.env b/meta/recipes-graphics/wayland/weston-init/weston.env
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service b/meta/recipes-graphics/wayland/weston-init/weston.service
deleted file mode 100644
index 80745998ed..0000000000
--- a/meta/recipes-graphics/wayland/weston-init/weston.service
+++ /dev/null
@@ -1,71 +0,0 @@
-# This is a system unit for launching Weston with auto-login as the
-# user configured here.
-#
-# Weston must be built with systemd support, and your weston.ini must load
-# the plugin systemd-notify.so.
-[Unit]
-Description=Weston, a Wayland compositor, as a system service
-Documentation=man:weston(1) man:weston.ini(5)
-Documentation=http://wayland.freedesktop.org/
-
-# Make sure we are started after logins are permitted.
-Requires=systemd-user-sessions.service
-After=systemd-user-sessions.service
-
-# If Plymouth is used, we want to start when it is on its way out.
-After=plymouth-quit-wait.service
-
-# D-Bus is necessary for contacting logind. Logind is required.
-Wants=dbus.socket
-After=dbus.socket
-
-# Ensure the socket is present
-Requires=weston.socket
-
-# Since we are part of the graphical session, make sure we are started before
-# it is complete.
-Before=graphical.target
-
-# Prevent starting on systems without virtual consoles, Weston requires one
-# for now.
-ConditionPathExists=/dev/tty0
-
-[Service]
-# Requires systemd-notify.so Weston plugin.
-Type=notify
-EnvironmentFile=/etc/default/weston
-ExecStart=/usr/bin/weston --modules=systemd-notify.so
-
-# Optional watchdog setup
-#TimeoutStartSec=60
-#WatchdogSec=20
-
-# The user to run Weston as.
-User=weston
-Group=weston
-
-# Make sure the working directory is the users home directory
-WorkingDirectory=/home/weston
-
-# Set up a full user session for the user, required by Weston.
-PAMName=weston-autologin
-
-# A virtual terminal is needed.
-TTYPath=/dev/tty7
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-
-# Fail to start if not controlling the tty.
-StandardInput=tty-fail
-StandardOutput=journal
-StandardError=journal
-
-# Log this user with utmp, letting it show up with commands 'w' and 'who'.
-UtmpIdentifier=tty7
-UtmpMode=user
-
-[Install]
-# Note: If you only want weston to start on-demand, remove this line with a
-# service drop file
-WantedBy=graphical.target
diff --git a/meta/recipes-graphics/wayland/weston-init/weston.socket b/meta/recipes-graphics/wayland/weston-init/weston.socket
deleted file mode 100644
index c1bdc83c05..0000000000
--- a/meta/recipes-graphics/wayland/weston-init/weston.socket
+++ /dev/null
@@ -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
-
--
2.49.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [oe-core][PATCHv6 4/5] weston: remove deprecated weston-start scripts
2025-05-20 23:39 [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland rs
` (2 preceding siblings ...)
2025-05-20 23:39 ` [oe-core][PATCHv6 3/5] weston-init: convert to virtual-emptty-conf rs
@ 2025-05-20 23:39 ` rs
2025-05-20 23:39 ` [oe-core][PATCHv6 5/5] xserver-nodm-init: convert to virtual-emptty-conf rs
2025-05-21 15:58 ` [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland Mathieu Dubois-Briand
5 siblings, 0 replies; 13+ messages in thread
From: rs @ 2025-05-20 23:39 UTC (permalink / raw)
To: mathieu.dubois-briand, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
From: Randolph Sapp <rs@ti.com>
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.
Signed-off-by: Randolph Sapp <rs@ti.com>
---
.../wayland/weston/systemd-notify.weston-start | 9 ---------
.../wayland/weston/xwayland.weston-start | 6 ------
meta/recipes-graphics/wayland/weston_14.0.1.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
diff --git a/meta/recipes-graphics/wayland/weston/systemd-notify.weston-start b/meta/recipes-graphics/wayland/weston/systemd-notify.weston-start
deleted file mode 100644
index a97e7b38d9..0000000000
--- a/meta/recipes-graphics/wayland/weston/systemd-notify.weston-start
+++ /dev/null
@@ -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
diff --git a/meta/recipes-graphics/wayland/weston/xwayland.weston-start b/meta/recipes-graphics/wayland/weston/xwayland.weston-start
deleted file mode 100644
index 342ac8d129..0000000000
--- a/meta/recipes-graphics/wayland/weston/xwayland.weston-start
+++ /dev/null
@@ -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
diff --git a/meta/recipes-graphics/wayland/weston_14.0.1.bb b/meta/recipes-graphics/wayland/weston_14.0.1.bb
index 2a0a403d99..e9a4c68ff0 100644
--- a/meta/recipes-graphics/wayland/weston_14.0.1.bb
+++ b/meta/recipes-graphics/wayland/weston_14.0.1.bb
@@ -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 \
"
SRC_URI[sha256sum] = "a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3"
@@ -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
--
2.49.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [oe-core][PATCHv6 5/5] xserver-nodm-init: convert to virtual-emptty-conf
2025-05-20 23:39 [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland rs
` (3 preceding siblings ...)
2025-05-20 23:39 ` [oe-core][PATCHv6 4/5] weston: remove deprecated weston-start scripts rs
@ 2025-05-20 23:39 ` rs
2025-05-21 15:58 ` [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland Mathieu Dubois-Briand
5 siblings, 0 replies; 13+ messages in thread
From: rs @ 2025-05-20 23:39 UTC (permalink / raw)
To: mathieu.dubois-briand, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
From: Randolph Sapp <rs@ti.com>
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
Signed-off-by: Randolph Sapp <rs@ti.com>
---
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.in
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index b39ff50fa6..3d37b0a98d 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -921,12 +921,12 @@ RECIPE_MAINTAINER:pn-xorgproto = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-xprop = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-xrandr = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-xrestop = "Unassigned <unassigned@yoctoproject.org>"
-RECIPE_MAINTAINER:pn-xserver-nodm-init = "Unassigned <unassigned@yoctoproject.org>"
+RECIPE_MAINTAINER:pn-xserver-nodm-init = "Randolph Sapp <rs@ti.com>"
RECIPE_MAINTAINER:pn-xserver-xf86-config = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-xserver-xorg = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-xset = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-xtrans = "Unassigned <unassigned@yoctoproject.org>"
-RECIPE_MAINTAINER:pn-xuser-account = "Unassigned <unassigned@yoctoproject.org>"
+RECIPE_MAINTAINER:pn-xuser-account = "Randolph Sapp <rs@ti.com>"
RECIPE_MAINTAINER:pn-xvinfo = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-xwayland = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-xwininfo = "Unassigned <unassigned@yoctoproject.org>"
diff --git a/meta/lib/oeqa/runtime/cases/xorg.py b/meta/lib/oeqa/runtime/cases/xorg.py
index 09afb1e3d1..8593be5b77 100644
--- a/meta/lib/oeqa/runtime/cases/xorg.py
+++ b/meta/lib/oeqa/runtime/cases/xorg.py
@@ -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)
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
deleted file mode 100644
index 0b73127ae1..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
+++ /dev/null
@@ -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
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
deleted file mode 100644
index 912f79761c..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
+++ /dev/null
@@ -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
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
deleted file mode 100644
index 3d7008ca45..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
+++ /dev/null
@@ -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
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
deleted file mode 100644
index b936dedf3b..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
+++ /dev/null
@@ -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
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver b/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver
deleted file mode 100644
index 0edbfbfc20..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver
+++ /dev/null
@@ -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 $*
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf
deleted file mode 100644
index 7ab7460816..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-cap_sys_admin @USER@
-none *
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop b/meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop
new file mode 100644
index 0000000000..3357cd9a7f
--- /dev/null
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Default X11 Desktop
+Exec=x-session-manager
diff --git a/meta/recipes-graphics/wayland/weston-init/emptty.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in
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..406a6d1249 100644
--- a/meta/recipes-graphics/wayland/weston-init/emptty.conf
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in
@@ -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
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch b/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
deleted file mode 100644
index eff975e341..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-COPYING: add GPLv2 license file
-
-this is a local file recipe and the license file is missing.In order
-to pass the license checksum checking, the license file is needed. So
-this patch add the GPLv2 license file.
-
-Upstream-Status: Inappropriate [licensing]
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-diff --git a/COPYING b/COPYING
-new file mode 100644
-index 0000000..d511905
---- /dev/null
-+++ b/COPYING
-@@ -0,0 +1,339 @@
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users. This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it. (Some other Free Software Foundation software is covered by
-+the GNU Lesser General Public License instead.) You can apply it to
-+your programs, too.
-+
-+ When we speak of free software, we are referring to freedom, not
-+price. Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+ For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have. You must make sure that they, too, receive or can get the
-+source code. And you must show them these terms so they know their
-+rights.
-+
-+ We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+ Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software. If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+ Finally, any free program is threatened constantly by software
-+patents. We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary. To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+ GNU GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License. The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language. (Hereinafter, translation is included without limitation in
-+the term "modification".) Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+ 1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+ 2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) You must cause the modified files to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ b) You must cause any work that you distribute or publish, that in
-+ whole or in part contains or is derived from the Program or any
-+ part thereof, to be licensed as a whole at no charge to all third
-+ parties under the terms of this License.
-+
-+ c) If the modified program normally reads commands interactively
-+ when run, you must cause it, when started running for such
-+ interactive use in the most ordinary way, to print or display an
-+ announcement including an appropriate copyright notice and a
-+ notice that there is no warranty (or else, saying that you provide
-+ a warranty) and that users may redistribute the program under
-+ these conditions, and telling the user how to view a copy of this
-+ License. (Exception: if the Program itself is interactive but
-+ does not normally print such an announcement, your work based on
-+ the Program is not required to print an announcement.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+ a) Accompany it with the complete corresponding machine-readable
-+ source code, which must be distributed under the terms of Sections
-+ 1 and 2 above on a medium customarily used for software interchange; or,
-+
-+ b) Accompany it with a written offer, valid for at least three
-+ years, to give any third party, for a charge no more than your
-+ cost of physically performing source distribution, a complete
-+ machine-readable copy of the corresponding source code, to be
-+ distributed under the terms of Sections 1 and 2 above on a medium
-+ customarily used for software interchange; or,
-+
-+ c) Accompany it with the information you received as to the offer
-+ to distribute corresponding source code. (This alternative is
-+ allowed only for noncommercial distribution and only if you
-+ received the program in object code or executable form with such
-+ an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it. For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable. However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License. Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+ 5. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+ 6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+ 7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded. In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+ 9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time. Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation. If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+ 10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission. For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this. Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Programs
-+
-+ If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+ To do so, attach the following notices to the program. It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the program's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License along
-+ with this program; if not, write to the Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+ Gnomovision version 69, Copyright (C) year name of author
-+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+ This is free software, and you are welcome to redistribute it
-+ under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License. Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1989
-+ Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs. If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library. If this is what you want to do, use the GNU Lesser General
-+Public License instead of this License.
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
deleted file mode 100755
index 116bb278bc..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: xserver
-# Required-Start: $local_fs $remote_fs dbus
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 5
-# Default-Stop: 0 1 2 3 6
-### END INIT INFO
-
-killproc() { # kill the named process(es)
- pid=`/bin/pidof $1`
- [ "$pid" != "" ] && kill $pid
-}
-
-read CMDLINE < /proc/cmdline
-for x in $CMDLINE; do
- case $x in
- x11=false)
- echo "X Server disabled"
- exit 0;
- ;;
- esac
-done
-
-case "$1" in
- start)
- . /etc/profile
-
- #default for USER
- . /etc/default/xserver-nodm
- echo "Starting Xserver"
- if [ "$USER" != "root" ]; then
- # setting for rootless X
- chmod o+w /var/log
- chmod g+r /dev/tty[0-3]
- # hidraw device is probably needed
- if [ -e /dev/hidraw0 ]; then
- chmod o+rw /dev/hidraw*
- fi
- # Make sure that the Xorg has the cap_sys_admin capability which is
- # needed for setting the drm master
- if ! grep -q "^auth.*pam_cap\.so" /etc/pam.d/su; then
- echo "auth optional pam_cap.so" >>/etc/pam.d/su
- fi
- if ! /usr/sbin/getcap $XSERVER | grep -q cap_sys_admin; then
- /usr/sbin/setcap cap_sys_admin+eip $XSERVER
- fi
- fi
-
- # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
- su -l -c '/etc/xserver-nodm/Xserver &' $USER
- # Wait for the desktop to say its finished loading
- # before loading the rest of the system
- # dbus-wait org.matchbox_project.desktop Loaded
- ;;
-
- stop)
- echo "Stopping XServer"
- killproc xinit
- sleep 1
- chvt 1 &
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
-
- *)
- echo "usage: $0 { start | stop | restart }"
- ;;
-esac
-
-exit 0
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
deleted file mode 100644
index 4a9670d8d2..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
+++ /dev/null
@@ -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@
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in
deleted file mode 100644
index 87dc4f8fcd..0000000000
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in
+++ /dev/null
@@ -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
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
index cd4acf8155..09b112c1ac 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
@@ -1,16 +1,10 @@
SUMMARY = "Simple Xserver Init Script (no dm)"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SECTION = "x11"
-SRC_URI = "file://xserver-nodm \
- file://Xserver \
- file://X11 \
- file://gplv2-license.patch \
- file://xserver-nodm.service.in \
- file://xserver-nodm.conf.in \
- file://capability.conf \
-"
+SRC_URI = "file://emptty.conf.in \
+ file://default.desktop"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
@@ -18,7 +12,7 @@ UNPACKDIR = "${S}"
# Since we refer to ROOTLESS_X which is normally enabled per-machine
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit update-rc.d systemd features_check
+inherit features_check
REQUIRED_DISTRO_FEATURES = "x11 ${@oe.utils.conditional('ROOTLESS_X', '1', 'pam', '', d)}"
@@ -28,45 +22,26 @@ PACKAGECONFIG[blank] = ""
PACKAGECONFIG[nocursor] = ""
do_install() {
- install -d ${D}${sysconfdir}/default
- install xserver-nodm.conf.in ${D}${sysconfdir}/default/xserver-nodm
- install -d ${D}${sysconfdir}/xserver-nodm
- install Xserver ${D}${sysconfdir}/xserver-nodm/Xserver
- install -d ${D}${sysconfdir}/X11/Xsession.d
- install X11/Xsession.d/* ${D}${sysconfdir}/X11/Xsession.d/
- install X11/Xsession ${D}${sysconfdir}/X11/
+ 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)}"
+ ROOTLESS_X_ARG="${@oe.utils.conditional('ROOTLESS_X', '1', 'true', 'false', d)}"
if [ "${ROOTLESS_X}" = "1" ] ; then
- XUSER_HOME="/home/xuser"
XUSER="xuser"
- install -D capability.conf ${D}${sysconfdir}/security/capability.conf
- sed -i "s:@USER@:${XUSER}:" ${D}${sysconfdir}/security/capability.conf
else
- XUSER_HOME=${ROOT_HOME}
XUSER="root"
fi
- sed -i "s:@HOME@:${XUSER_HOME}:; s:@USER@:${XUSER}:; s:@BLANK_ARGS@:${BLANK_ARGS}:" \
- ${D}${sysconfdir}/default/xserver-nodm
- sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/default/xserver-nodm
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${systemd_system_unitdir}
- install -m 0644 ${S}/xserver-nodm.service.in ${D}${systemd_system_unitdir}/xserver-nodm.service
- sed -i "s:@USER@:${XUSER}:" ${D}${systemd_system_unitdir}/xserver-nodm.service
- fi
-
- if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
- install -d ${D}${sysconfdir}/init.d
- install xserver-nodm ${D}${sysconfdir}/init.d
- fi
+ sed -i "s:@USER@:${XUSER}:" ${D}${sysconfdir}/emptty/conf
+ 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:@ROOTLESS_X_ARG@:${ROOTLESS_X_ARG}:" ${D}${sysconfdir}/emptty/conf
}
-RDEPENDS:${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}"
-
-INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ."
-SYSTEMD_SERVICE:${PN} = "xserver-nodm.service"
+FILES:${PN} = "${sysconfdir}/emptty/conf \
+ ${datadir}/xsessions/default.desktop"
+RDEPENDS:${PN} = "emptty xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}"
+RPROVIDES:${PN} += "virtual-emptty-conf"
RCONFLICTS:${PN} = "xserver-common (< 1.34-r9) x11-common"
diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb
index 80a429c6d3..57caccac4b 100644
--- a/meta/recipes-support/user-creation/xuser-account_0.1.bb
+++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb
@@ -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"
--
2.49.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland
2025-05-20 23:39 [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland rs
` (4 preceding siblings ...)
2025-05-20 23:39 ` [oe-core][PATCHv6 5/5] xserver-nodm-init: convert to virtual-emptty-conf rs
@ 2025-05-21 15:58 ` Mathieu Dubois-Briand
2025-05-27 22:16 ` Randolph Sapp
5 siblings, 1 reply; 13+ messages in thread
From: Mathieu Dubois-Briand @ 2025-05-21 15:58 UTC (permalink / raw)
To: rs, richard.purdie, ross.burton, alex, otavio, kexin.hao, afd,
detheridge, denis, reatmon
Cc: openembedded-core, vijayp
On Wed May 21, 2025 at 1:39 AM CEST, rs wrote:
> From: Randolph Sapp <rs@ti.com>
>
> 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.
> 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
>
Hi Randolph,
Thanks for the version, but again a previously seen error. Sorry for
the bad news :(
RESULTS - xorg.XorgTest.test_xorg_running: FAILED (1.31s)
...
AssertionError: 1 != 0 : Xorg does not appear to be running PID USER VSZ STAT COMMAND
https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1637
https://autobuilder.yoctoproject.org/valkyrie/#/builders/95/builds/1638
https://autobuilder.yoctoproject.org/valkyrie/#/builders/9/builds/1649
I will drop the patch on my side, but I will keep the a-full build
running, we might see some other failures in the coming hours:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/1630
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland
2025-05-21 15:58 ` [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland Mathieu Dubois-Briand
@ 2025-05-27 22:16 ` Randolph Sapp
2025-05-28 11:53 ` Mathieu Dubois-Briand
0 siblings, 1 reply; 13+ messages in thread
From: Randolph Sapp @ 2025-05-27 22:16 UTC (permalink / raw)
To: Mathieu Dubois-Briand, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
On Wed May 21, 2025 at 10:58 AM CDT, Mathieu Dubois-Briand wrote:
> On Wed May 21, 2025 at 1:39 AM CEST, rs wrote:
>> From: Randolph Sapp <rs@ti.com>
>>
>> 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.
>> 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
>>
>
> Hi Randolph,
>
> Thanks for the version, but again a previously seen error. Sorry for
> the bad news :(
>
> RESULTS - xorg.XorgTest.test_xorg_running: FAILED (1.31s)
> ...
> AssertionError: 1 != 0 : Xorg does not appear to be running PID USER VSZ STAT COMMAND
>
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1637
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/95/builds/1638
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/9/builds/1649
>
> I will drop the patch on my side, but I will keep the a-full build
> running, we might see some other failures in the coming hours:
>
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/1630
Ah, the auth failures persist. Normally this is caused when the user attempts to
login before the user account was created or something unusual like that. I
don't suppose there's any way this could be happening on the test machines?
I'm not able to reproduce this locally, but my build config is different. I tend
to use oe-core and nodistro instead of poky. They aren't playing around with the
reproducible build date stuff or anything like that are they?
Well, I mean I did see this on occasion. The first login attempt almost always
failed, but the subsequent attempts were fine. Bumping the attempt count back up
the default (2) was enough to resolve it on my end, but evidently it's not
enough here.
This is not happening on hardware from what I'm seeing.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland
2025-05-27 22:16 ` Randolph Sapp
@ 2025-05-28 11:53 ` Mathieu Dubois-Briand
2025-06-05 0:12 ` Randolph Sapp
0 siblings, 1 reply; 13+ messages in thread
From: Mathieu Dubois-Briand @ 2025-05-28 11:53 UTC (permalink / raw)
To: Randolph Sapp, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
On Wed May 28, 2025 at 12:16 AM CEST, Randolph Sapp wrote:
> On Wed May 21, 2025 at 10:58 AM CDT, Mathieu Dubois-Briand wrote:
>> On Wed May 21, 2025 at 1:39 AM CEST, rs wrote:
>>> From: Randolph Sapp <rs@ti.com>
>>>
>>> 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.
>>> 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
>>>
>>
>> Hi Randolph,
>>
>> Thanks for the version, but again a previously seen error. Sorry for
>> the bad news :(
>>
>> RESULTS - xorg.XorgTest.test_xorg_running: FAILED (1.31s)
>> ...
>> AssertionError: 1 != 0 : Xorg does not appear to be running PID USER VSZ STAT COMMAND
>>
>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1637
>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/95/builds/1638
>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/9/builds/1649
>>
>> I will drop the patch on my side, but I will keep the a-full build
>> running, we might see some other failures in the coming hours:
>>
>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/1630
>
> Ah, the auth failures persist. Normally this is caused when the user attempts to
> login before the user account was created or something unusual like that. I
> don't suppose there's any way this could be happening on the test machines?
>
> I'm not able to reproduce this locally, but my build config is different. I tend
> to use oe-core and nodistro instead of poky. They aren't playing around with the
> reproducible build date stuff or anything like that are they?
>
> Well, I mean I did see this on occasion. The first login attempt almost always
> failed, but the subsequent attempts were fine. Bumping the attempt count back up
> the default (2) was enough to resolve it on my end, but evidently it's not
> enough here.
>
> This is not happening on hardware from what I'm seeing.
Hi Randolph,
I was able to reproduce it locally, with the following configuration:
- https://git.yoctoproject.org/poky-ci-archive on tag
autobuilder.yoctoproject.org/valkyrie/a-full-1630.
- template local.conf, with the following modifications:
MACHINE = "qemux86"
DISTRO = "poky-altcfg"
SDKMACHINE = "x86_64"
PACKAGE_CLASSES = "package_rpm package_deb package_ipk"
INHERIT += 'image-buildinfo'
IMAGE_BUILDINFO_VARS:append = ' IMAGE_BASENAME IMAGE_NAME'
PACKAGE_CLASSES = 'package_ipk package_rpm package_deb'
IMAGE_ROOTFS_EXTRA_SPACE:append = '${@bb.utils.contains('IMAGE_FEATURES', 'package-management', ' + 262144', '', d)}'
IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'
SANITY_TESTED_DISTROS = ''
OE_FRAGMENTS += 'core/yocto-autobuilder/autobuilder core/yocto-autobuilder/autobuilder-resource-constraints'
# (Plus my own sstate cache and downloads dir).
- bitbake core-image-sato
- bitbake core-image-sato:do_testimage
Of course using the tag from poky-ci-archive is not mandatory, you
should see the same behaviour with master branch and your patches.
I saw some oe-selftest was also failing on the autobuilder, with an
error related to emptty. You can reproduce it with:
oe-selftest -r sstatetests.SStateHashSameSigs3.test_sstate_sametune_samesigs
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland
2025-05-28 11:53 ` Mathieu Dubois-Briand
@ 2025-06-05 0:12 ` Randolph Sapp
2025-06-06 23:49 ` Randolph Sapp
[not found] ` <1846990D23EB4550.17668@lists.openembedded.org>
0 siblings, 2 replies; 13+ messages in thread
From: Randolph Sapp @ 2025-06-05 0:12 UTC (permalink / raw)
To: Mathieu Dubois-Briand, richard.purdie, ross.burton, alex, otavio,
kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
On Wed May 28, 2025 at 6:53 AM CDT, Mathieu Dubois-Briand wrote:
> On Wed May 28, 2025 at 12:16 AM CEST, Randolph Sapp wrote:
[snip]
>> Ah, the auth failures persist. Normally this is caused when the user attempts to
>> login before the user account was created or something unusual like that. I
>> don't suppose there's any way this could be happening on the test machines?
>>
>> I'm not able to reproduce this locally, but my build config is different. I tend
>> to use oe-core and nodistro instead of poky. They aren't playing around with the
>> reproducible build date stuff or anything like that are they?
>>
>> Well, I mean I did see this on occasion. The first login attempt almost always
>> failed, but the subsequent attempts were fine. Bumping the attempt count back up
>> the default (2) was enough to resolve it on my end, but evidently it's not
>> enough here.
>>
>> This is not happening on hardware from what I'm seeing.
>
> Hi Randolph,
>
> I was able to reproduce it locally, with the following configuration:
> - https://git.yoctoproject.org/poky-ci-archive on tag
> autobuilder.yoctoproject.org/valkyrie/a-full-1630.
> - template local.conf, with the following modifications:
> MACHINE = "qemux86"
> DISTRO = "poky-altcfg"
> SDKMACHINE = "x86_64"
> PACKAGE_CLASSES = "package_rpm package_deb package_ipk"
> INHERIT += 'image-buildinfo'
> IMAGE_BUILDINFO_VARS:append = ' IMAGE_BASENAME IMAGE_NAME'
> PACKAGE_CLASSES = 'package_ipk package_rpm package_deb'
> IMAGE_ROOTFS_EXTRA_SPACE:append = '${@bb.utils.contains('IMAGE_FEATURES', 'package-management', ' + 262144', '', d)}'
> IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'
> SANITY_TESTED_DISTROS = ''
> OE_FRAGMENTS += 'core/yocto-autobuilder/autobuilder core/yocto-autobuilder/autobuilder-resource-constraints'
> # (Plus my own sstate cache and downloads dir).
> - bitbake core-image-sato
> - bitbake core-image-sato:do_testimage
>
> Of course using the tag from poky-ci-archive is not mandatory, you
> should see the same behaviour with master branch and your patches.
>
> I saw some oe-selftest was also failing on the autobuilder, with an
> error related to emptty. You can reproduce it with:
>
> oe-selftest -r sstatetests.SStateHashSameSigs3.test_sstate_sametune_samesigs
Status report, since it's been a little bit.
Seems this some i386/x86 fault only exposed in this specific environment. I was
unable to reproduce it on Archlinux32. I've traced it back to a SEGFAULT when we
attempt to execute mcookie as the target user. Odd stuff. Delve and gdb aren't
helping me here. Running some more tests to see if I can corner this some other
way.
- Randolph
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland
2025-06-05 0:12 ` Randolph Sapp
@ 2025-06-06 23:49 ` Randolph Sapp
[not found] ` <1846990D23EB4550.17668@lists.openembedded.org>
1 sibling, 0 replies; 13+ messages in thread
From: Randolph Sapp @ 2025-06-06 23:49 UTC (permalink / raw)
To: Randolph Sapp, Mathieu Dubois-Briand, richard.purdie, ross.burton,
alex, otavio, kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
On Wed Jun 4, 2025 at 7:12 PM CDT, Randolph Sapp wrote:
> On Wed May 28, 2025 at 6:53 AM CDT, Mathieu Dubois-Briand wrote:
>> On Wed May 28, 2025 at 12:16 AM CEST, Randolph Sapp wrote:
>
> [snip]
>
>>> Ah, the auth failures persist. Normally this is caused when the user attempts to
>>> login before the user account was created or something unusual like that. I
>>> don't suppose there's any way this could be happening on the test machines?
>>>
>>> I'm not able to reproduce this locally, but my build config is different. I tend
>>> to use oe-core and nodistro instead of poky. They aren't playing around with the
>>> reproducible build date stuff or anything like that are they?
>>>
>>> Well, I mean I did see this on occasion. The first login attempt almost always
>>> failed, but the subsequent attempts were fine. Bumping the attempt count back up
>>> the default (2) was enough to resolve it on my end, but evidently it's not
>>> enough here.
>>>
>>> This is not happening on hardware from what I'm seeing.
>>
>> Hi Randolph,
>>
>> I was able to reproduce it locally, with the following configuration:
>> - https://git.yoctoproject.org/poky-ci-archive on tag
>> autobuilder.yoctoproject.org/valkyrie/a-full-1630.
>> - template local.conf, with the following modifications:
>> MACHINE = "qemux86"
>> DISTRO = "poky-altcfg"
>> SDKMACHINE = "x86_64"
>> PACKAGE_CLASSES = "package_rpm package_deb package_ipk"
>> INHERIT += 'image-buildinfo'
>> IMAGE_BUILDINFO_VARS:append = ' IMAGE_BASENAME IMAGE_NAME'
>> PACKAGE_CLASSES = 'package_ipk package_rpm package_deb'
>> IMAGE_ROOTFS_EXTRA_SPACE:append = '${@bb.utils.contains('IMAGE_FEATURES', 'package-management', ' + 262144', '', d)}'
>> IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'
>> SANITY_TESTED_DISTROS = ''
>> OE_FRAGMENTS += 'core/yocto-autobuilder/autobuilder core/yocto-autobuilder/autobuilder-resource-constraints'
>> # (Plus my own sstate cache and downloads dir).
>> - bitbake core-image-sato
>> - bitbake core-image-sato:do_testimage
>>
>> Of course using the tag from poky-ci-archive is not mandatory, you
>> should see the same behaviour with master branch and your patches.
>>
>> I saw some oe-selftest was also failing on the autobuilder, with an
>> error related to emptty. You can reproduce it with:
>>
>> oe-selftest -r sstatetests.SStateHashSameSigs3.test_sstate_sametune_samesigs
>
> Status report, since it's been a little bit.
>
> Seems this some i386/x86 fault only exposed in this specific environment. I was
> unable to reproduce it on Archlinux32. I've traced it back to a SEGFAULT when we
> attempt to execute mcookie as the target user. Odd stuff. Delve and gdb aren't
> helping me here. Running some more tests to see if I can corner this some other
> way.
>
> - Randolph
Well, I managed to determine this is specifically an issue after loading libpam
and attempting to authenticate.
Seems like loading both common-auth and common-account before calling
pam_acct_mgmt results in the above described segfault.
There are 3 pam interactions made after the initial auth.
1. pam_acct_mgmt
2. pam_set_item
3. pam_setcred
Loading only common-account reports that pam_acct_mgmt fails with the PAM_SILENT
flag set.
Removing that flag makes the later pam_setcred fail, but allows pam_acct_mgmt
and pam_set_item to work correctly. Removing the call to pam_acct_mgmt
altogether seems to allow pam_setcred to work.
Removing the call to pam_acct_mgmt also allows both common-auth and
common-account to be loaded without triggering the segfault.
Very unusual. Everything points at the obvious "arch specific problems with the
go pam wrapper", but other distributions don't seem to have this issue and
nothing seems particularly wrong with the wrapper itself. Could be a
manifestation of multiple issues though, considering how much the behavior
changes depending on what pam modules are loaded.
Guess I have some reading to do this weekend.
- Randolph
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland
[not found] ` <1846990D23EB4550.17668@lists.openembedded.org>
@ 2025-06-14 1:04 ` Randolph Sapp
[not found] ` <1848C33B8404DBE8.1272@lists.openembedded.org>
1 sibling, 0 replies; 13+ messages in thread
From: Randolph Sapp @ 2025-06-14 1:04 UTC (permalink / raw)
To: rs, Mathieu Dubois-Briand, richard.purdie, ross.burton, alex,
otavio, kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
On Fri Jun 6, 2025 at 6:49 PM CDT, Randolph Sapp via lists.openembedded.org wrote:
> On Wed Jun 4, 2025 at 7:12 PM CDT, Randolph Sapp wrote:
>> On Wed May 28, 2025 at 6:53 AM CDT, Mathieu Dubois-Briand wrote:
>>> On Wed May 28, 2025 at 12:16 AM CEST, Randolph Sapp wrote:
>>
>> [snip]
>>
>>>> Ah, the auth failures persist. Normally this is caused when the user attempts to
>>>> login before the user account was created or something unusual like that. I
>>>> don't suppose there's any way this could be happening on the test machines?
>>>>
>>>> I'm not able to reproduce this locally, but my build config is different. I tend
>>>> to use oe-core and nodistro instead of poky. They aren't playing around with the
>>>> reproducible build date stuff or anything like that are they?
>>>>
>>>> Well, I mean I did see this on occasion. The first login attempt almost always
>>>> failed, but the subsequent attempts were fine. Bumping the attempt count back up
>>>> the default (2) was enough to resolve it on my end, but evidently it's not
>>>> enough here.
>>>>
>>>> This is not happening on hardware from what I'm seeing.
>>>
>>> Hi Randolph,
>>>
>>> I was able to reproduce it locally, with the following configuration:
>>> - https://git.yoctoproject.org/poky-ci-archive on tag
>>> autobuilder.yoctoproject.org/valkyrie/a-full-1630.
>>> - template local.conf, with the following modifications:
>>> MACHINE = "qemux86"
>>> DISTRO = "poky-altcfg"
>>> SDKMACHINE = "x86_64"
>>> PACKAGE_CLASSES = "package_rpm package_deb package_ipk"
>>> INHERIT += 'image-buildinfo'
>>> IMAGE_BUILDINFO_VARS:append = ' IMAGE_BASENAME IMAGE_NAME'
>>> PACKAGE_CLASSES = 'package_ipk package_rpm package_deb'
>>> IMAGE_ROOTFS_EXTRA_SPACE:append = '${@bb.utils.contains('IMAGE_FEATURES', 'package-management', ' + 262144', '', d)}'
>>> IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'
>>> SANITY_TESTED_DISTROS = ''
>>> OE_FRAGMENTS += 'core/yocto-autobuilder/autobuilder core/yocto-autobuilder/autobuilder-resource-constraints'
>>> # (Plus my own sstate cache and downloads dir).
>>> - bitbake core-image-sato
>>> - bitbake core-image-sato:do_testimage
>>>
>>> Of course using the tag from poky-ci-archive is not mandatory, you
>>> should see the same behaviour with master branch and your patches.
>>>
>>> I saw some oe-selftest was also failing on the autobuilder, with an
>>> error related to emptty. You can reproduce it with:
>>>
>>> oe-selftest -r sstatetests.SStateHashSameSigs3.test_sstate_sametune_samesigs
>>
>> Status report, since it's been a little bit.
>>
>> Seems this some i386/x86 fault only exposed in this specific environment. I was
>> unable to reproduce it on Archlinux32. I've traced it back to a SEGFAULT when we
>> attempt to execute mcookie as the target user. Odd stuff. Delve and gdb aren't
>> helping me here. Running some more tests to see if I can corner this some other
>> way.
>>
>> - Randolph
>
> Well, I managed to determine this is specifically an issue after loading libpam
> and attempting to authenticate.
>
> Seems like loading both common-auth and common-account before calling
> pam_acct_mgmt results in the above described segfault.
>
> There are 3 pam interactions made after the initial auth.
> 1. pam_acct_mgmt
> 2. pam_set_item
> 3. pam_setcred
>
> Loading only common-account reports that pam_acct_mgmt fails with the PAM_SILENT
> flag set.
>
> Removing that flag makes the later pam_setcred fail, but allows pam_acct_mgmt
> and pam_set_item to work correctly. Removing the call to pam_acct_mgmt
> altogether seems to allow pam_setcred to work.
>
> Removing the call to pam_acct_mgmt also allows both common-auth and
> common-account to be loaded without triggering the segfault.
>
> Very unusual. Everything points at the obvious "arch specific problems with the
> go pam wrapper", but other distributions don't seem to have this issue and
> nothing seems particularly wrong with the wrapper itself. Could be a
> manifestation of multiple issues though, considering how much the behavior
> changes depending on what pam modules are loaded.
>
> Guess I have some reading to do this weekend.
>
> - Randolph
Found out that specifying the noreap option for pam_unix in the account context
fixes things. Suppose go was having issues with the new signal handler being
registered in _unix_run_verify_binary. Still weird that it was only really an
issue on i386/x86, and only in this environment.
This means we can't inherit the common-account, we'll have to require pam_unix
as part of the pam.conf directly. There's also a conditional fork in the
pam_unix password path with another signal handler that we should probably guard
against to prevent issues with selinux configs.
I'm still not entirely satisfied with this debug. Something seems off, but given
go's use of coroutines it would make sense this would cause *some* issue. Still
odd. I'll poke around a bit more.
- Randolph
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland
[not found] ` <1848C33B8404DBE8.1272@lists.openembedded.org>
@ 2025-09-05 18:52 ` Randolph Sapp
0 siblings, 0 replies; 13+ messages in thread
From: Randolph Sapp @ 2025-09-05 18:52 UTC (permalink / raw)
To: rs, Mathieu Dubois-Briand, richard.purdie, ross.burton, alex,
otavio, kexin.hao, afd, detheridge, denis, reatmon
Cc: openembedded-core, vijayp
On Fri Jun 13, 2025 at 8:04 PM CDT, Randolph Sapp via lists.openembedded.org wrote:
> On Fri Jun 6, 2025 at 6:49 PM CDT, Randolph Sapp via lists.openembedded.org wrote:
>> On Wed Jun 4, 2025 at 7:12 PM CDT, Randolph Sapp wrote:
>>> On Wed May 28, 2025 at 6:53 AM CDT, Mathieu Dubois-Briand wrote:
>>>> On Wed May 28, 2025 at 12:16 AM CEST, Randolph Sapp wrote:
>>>
>>> [snip]
>>>
>>>>> Ah, the auth failures persist. Normally this is caused when the user attempts to
>>>>> login before the user account was created or something unusual like that. I
>>>>> don't suppose there's any way this could be happening on the test machines?
>>>>>
>>>>> I'm not able to reproduce this locally, but my build config is different. I tend
>>>>> to use oe-core and nodistro instead of poky. They aren't playing around with the
>>>>> reproducible build date stuff or anything like that are they?
>>>>>
>>>>> Well, I mean I did see this on occasion. The first login attempt almost always
>>>>> failed, but the subsequent attempts were fine. Bumping the attempt count back up
>>>>> the default (2) was enough to resolve it on my end, but evidently it's not
>>>>> enough here.
>>>>>
>>>>> This is not happening on hardware from what I'm seeing.
>>>>
>>>> Hi Randolph,
>>>>
>>>> I was able to reproduce it locally, with the following configuration:
>>>> - https://git.yoctoproject.org/poky-ci-archive on tag
>>>> autobuilder.yoctoproject.org/valkyrie/a-full-1630.
>>>> - template local.conf, with the following modifications:
>>>> MACHINE = "qemux86"
>>>> DISTRO = "poky-altcfg"
>>>> SDKMACHINE = "x86_64"
>>>> PACKAGE_CLASSES = "package_rpm package_deb package_ipk"
>>>> INHERIT += 'image-buildinfo'
>>>> IMAGE_BUILDINFO_VARS:append = ' IMAGE_BASENAME IMAGE_NAME'
>>>> PACKAGE_CLASSES = 'package_ipk package_rpm package_deb'
>>>> IMAGE_ROOTFS_EXTRA_SPACE:append = '${@bb.utils.contains('IMAGE_FEATURES', 'package-management', ' + 262144', '', d)}'
>>>> IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'
>>>> SANITY_TESTED_DISTROS = ''
>>>> OE_FRAGMENTS += 'core/yocto-autobuilder/autobuilder core/yocto-autobuilder/autobuilder-resource-constraints'
>>>> # (Plus my own sstate cache and downloads dir).
>>>> - bitbake core-image-sato
>>>> - bitbake core-image-sato:do_testimage
>>>>
>>>> Of course using the tag from poky-ci-archive is not mandatory, you
>>>> should see the same behaviour with master branch and your patches.
>>>>
>>>> I saw some oe-selftest was also failing on the autobuilder, with an
>>>> error related to emptty. You can reproduce it with:
>>>>
>>>> oe-selftest -r sstatetests.SStateHashSameSigs3.test_sstate_sametune_samesigs
>>>
>>> Status report, since it's been a little bit.
>>>
>>> Seems this some i386/x86 fault only exposed in this specific environment. I was
>>> unable to reproduce it on Archlinux32. I've traced it back to a SEGFAULT when we
>>> attempt to execute mcookie as the target user. Odd stuff. Delve and gdb aren't
>>> helping me here. Running some more tests to see if I can corner this some other
>>> way.
>>>
>>> - Randolph
>>
>> Well, I managed to determine this is specifically an issue after loading libpam
>> and attempting to authenticate.
>>
>> Seems like loading both common-auth and common-account before calling
>> pam_acct_mgmt results in the above described segfault.
>>
>> There are 3 pam interactions made after the initial auth.
>> 1. pam_acct_mgmt
>> 2. pam_set_item
>> 3. pam_setcred
>>
>> Loading only common-account reports that pam_acct_mgmt fails with the PAM_SILENT
>> flag set.
>>
>> Removing that flag makes the later pam_setcred fail, but allows pam_acct_mgmt
>> and pam_set_item to work correctly. Removing the call to pam_acct_mgmt
>> altogether seems to allow pam_setcred to work.
>>
>> Removing the call to pam_acct_mgmt also allows both common-auth and
>> common-account to be loaded without triggering the segfault.
>>
>> Very unusual. Everything points at the obvious "arch specific problems with the
>> go pam wrapper", but other distributions don't seem to have this issue and
>> nothing seems particularly wrong with the wrapper itself. Could be a
>> manifestation of multiple issues though, considering how much the behavior
>> changes depending on what pam modules are loaded.
>>
>> Guess I have some reading to do this weekend.
>>
>> - Randolph
>
> Found out that specifying the noreap option for pam_unix in the account context
> fixes things. Suppose go was having issues with the new signal handler being
> registered in _unix_run_verify_binary. Still weird that it was only really an
> issue on i386/x86, and only in this environment.
>
> This means we can't inherit the common-account, we'll have to require pam_unix
> as part of the pam.conf directly. There's also a conditional fork in the
> pam_unix password path with another signal handler that we should probably guard
> against to prevent issues with selinux configs.
>
> I'm still not entirely satisfied with this debug. Something seems off, but given
> go's use of coroutines it would make sense this would cause *some* issue. Still
> odd. I'll poke around a bit more.
>
> - Randolph
Bit of a status update. Sorry for the delay, this got the backburner for far
too long. I isolated this to specifically the operation of switching the signal
handler back to the go runtime one.
As to why this was only viewable under yocto, it seems that yocto is the only
env that feels the need to run the binary helper for shadowed users. Not really
sure why, but that's more configuration prone and not relevant to the more
glaring issue.
Sigaction when used in libraries linked to cgo applications can misbehave as it
uses the glibc version of sigaction. Cgo applications actually use a go
definition of sigaction with some additional checks depending on the OS and
architecture selected. Seems like only i386/x86 platforms were actually
misbehaving, but it's something to note moving forward.
There are upstream tickets to track the current debug:
https://github.com/msteinert/pam/issues/33
https://github.com/golang/go/issues/75253
I'll refrain from updating this thread until those are closed.
- Randolph
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2025-09-05 18:52 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-20 23:39 [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland rs
2025-05-20 23:39 ` [oe-core][PATCHv6 1/5] libx11: create tmpfile dir for x11 domain socket rs
2025-05-20 23:39 ` [oe-core][PATCHv6 2/5] emptty: add version 0.14.0 rs
2025-05-20 23:39 ` [oe-core][PATCHv6 3/5] weston-init: convert to virtual-emptty-conf rs
2025-05-20 23:39 ` [oe-core][PATCHv6 4/5] weston: remove deprecated weston-start scripts rs
2025-05-20 23:39 ` [oe-core][PATCHv6 5/5] xserver-nodm-init: convert to virtual-emptty-conf rs
2025-05-21 15:58 ` [oe-core][PATCHv6 0/5] Display manager proposal for x11 and wayland Mathieu Dubois-Briand
2025-05-27 22:16 ` Randolph Sapp
2025-05-28 11:53 ` Mathieu Dubois-Briand
2025-06-05 0:12 ` Randolph Sapp
2025-06-06 23:49 ` Randolph Sapp
[not found] ` <1846990D23EB4550.17668@lists.openembedded.org>
2025-06-14 1:04 ` Randolph Sapp
[not found] ` <1848C33B8404DBE8.1272@lists.openembedded.org>
2025-09-05 18:52 ` Randolph Sapp
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.