Skip to contentSkip to conversation

Display manager proposal for x11 and wayland

RFC In review [email protected] 4 participants 14 messages Mar 14, 2025 – Mar 15, 2025 2 messages not in the archive

lore
Share & tools
lore
#0 lore raw

cover Display manager proposal for x11 and wayland

From: Randolph Sapp <[email protected]>

Example implementation of emptty for weston-init following the request on the previous RFC [1] and previous example [2]. This variant is applicable to master.

This packages emptty and a default configuration for emptty as "emptty" and "emptty-conf" respectively. This allows the existing init packages to override the configuration similar to the way grub boot configs are handled.

The weston-init package still handles the weston config and weston user setup as it always has. The only real difference from a consumer standpoint is that the autologin group for the weston user changed from "wayland" to the more generic "nopasswdlogin".

[1] https://lists.openembedded.org/g/openembedded-core/message/212640
[2] https://lists.openembedded.org/g/openembedded-core/message/212785

Randolph Sapp (3):
emptty: add version 0.13.0
weston-init: convert to virtual-emptty-conf
default-providers: set virtual-emptty-conf

 .../conf/distro/include/default-providers.inc |  1 +
 meta/recipes-graphics/emptty/emptty/init      | 26 ++++++
 meta/recipes-graphics/emptty/emptty/pamconf   | 10 +++
 meta/recipes-graphics/emptty/emptty_0.13.0.bb | 80 +++++++++++++++++++
 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.env            |  0
 .../wayland/weston-init/weston.service        | 71 ----------------
 .../wayland/weston-init/weston.socket         | 14 ----
 12 files changed, 206 insertions(+), 219 deletions(-)
 create mode 100644 meta/recipes-graphics/emptty/emptty/init
 create mode 100644 meta/recipes-graphics/emptty/emptty/pamconf
 create mode 100644 meta/recipes-graphics/emptty/emptty_0.13.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 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
Signature · 1 line
2.48.1
#1 lore raw

PATCH 1/1 Revert "gettext: fix a parallel build issue"

From: Randolph Sapp <[email protected]>

This reverts commit e18fc96f9d4c0a0525c21371d3f36e8dfe008b35.

---
 ...1-intl-Fix-build-failure-with-make-j.patch | 35 -------------------
 meta/recipes-core/gettext/gettext_0.22.5.bb   |  1 -
 2 files changed, 36 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch
meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch deleted +0 -35
deleted file mode 100644
index 144259dd3f..0000000000
@@ -1,35 +0,0 @@
-From 97a6a63ad61949663283f5fad68c9d5fb9be1f15 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <[email protected]>
-Date: Tue, 12 Sep 2023 11:33:41 +0200
-Subject: [PATCH] intl: Fix build failure with "make -j".
-
-Reported by Christian Weisgerber <[email protected]> at
-<https://lists.gnu.org/archive/html/bug-gettext/2023-09/msg00005.html>.
-
-* gettext-runtime/intl/Makefile.am (langprefs.lo, log.lo): Depend on gettextP.h
-and its subordinate includes.
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15]
-Signed-off-by: Changqing Li <[email protected]>
----
- gettext-runtime/intl/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
-index da7abb758..9e56978bc 100644
---- a/gettext-runtime/intl/Makefile.am
-+++ b/gettext-runtime/intl/Makefile.am
-@@ -387,8 +387,8 @@ dngettext.lo:        ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo
- ngettext.lo:         ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
- plural.lo:           ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS)
- plural-exp.lo:       ../config.h $(srcdir)/plural-exp.h
--langprefs.lo:        ../config.h
--log.lo:              ../config.h
-+langprefs.lo:        ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
-+log.lo:              ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
- printf.lo:           ../config.h
- setlocale.lo:        ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
- version.lo:          ../config.h libgnuintl.h
--- 
-2.25.1
-
meta/recipes-core/gettext/gettext_0.22.5.bb +0 -1
index 7eeb1a86fd..1a66d37916 100644
@@ -28,7 +28,6 @@ SRC_URI += " \
            file://serial-tests-config.patch \
            file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \
            file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \
-           file://0001-intl-Fix-build-failure-with-make-j.patch \
            "
 
 inherit autotools texinfo pkgconfig ptest
Signature · 1 line
2.45.1
#2 lore raw

Re: [PATCH] Revert "gettext: fix a parallel build issue"

Quoted 4 lines · On 14 Mar 2025, at 00:29, [email protected] wrote:

From: Randolph Sapp <[email protected]>

This reverts commit e18fc96f9d4c0a0525c21371d3f36e8dfe008b35.

Can you explain why you’re reverting a fix for a build issue?

Ross

#3 lore raw

Re: [PATCH] Revert "gettext: fix a parallel build issue"

Quoted 9 lines · Ross Burton
Quoted 4 lines · On 14 Mar 2025, at 00:29, [email protected] wrote:

From: Randolph Sapp <[email protected]>

This reverts commit e18fc96f9d4c0a0525c21371d3f36e8dfe008b35.

Can you explain why you’re reverting a fix for a build issue?

Ross

Sorry about that. Please disregard this patch and "[OE-core] [PATCH] bzip2: add libbz2.so.1.0 link for compat". I didn't notice my glob picked up some old patches I was playing around with months ago. My bad.

- Randolph

#4 lore raw

PATCH 1/1 bzip2: add libbz2.so.1.0 link for compat

In reply to [email protected]

From: Randolph Sapp <[email protected]>

Add a link from libbz2.so.1.0 to libbz2.so.${PV} for compatibility with other distributions.

A handfull of distributions are still using the "Makefile-libbz2_so" to generate libbz2 and bzip2-shared. This creates a library with a soname of "libbz2.so.1.0". This library link is not provide by default in autotools builds so add one here as Gentoo does now [1].

This has been addressed upstream already, but there hasn't been a stable release since then [2].

[1] https://bugs.gentoo.org/338321
[2] https://gitlab.com/bzip2/bzip2/-/merge_requests/42

---
 meta/recipes-extended/bzip2/bzip2_1.0.8.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-extended/bzip2/bzip2_1.0.8.bb +5 -0
index 78138d1543..02d81e7069 100644
@@ -62,6 +62,11 @@ do_install_ptest () {
 	sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile
 }
 
+# add the following link for cross-distro compatibility
+do_install:append () {
+	ln -s libbz2.so.${PV} "${D}${libdir}/libbz2.so.1.0"
+}
+
 FILES:libbz2 = "${libdir}/lib*${SOLIBS}"
 
 RDEPENDS:${PN}-ptest += "make bash"
Signature · 1 line
2.44.0
#5 lore raw

RFC 1/3 emptty: add version 0.13.0

In reply to [email protected]

From: Randolph Sapp <[email protected]>

Add emptty, a "Dead simple CLI Display Manager on TTY". This is a relatively lightweight display manager that supports x11 as well as wayland though both a CLI and automatic login mechanism.

This can effetely replace the custom init scripts for both x11 (xserver-nodm-init) and wayland (weston-init) with a single tool with more verbose logging capabilities.

---
 meta/recipes-graphics/emptty/emptty/init      | 26 ++++++
 meta/recipes-graphics/emptty/emptty/pamconf   | 10 +++
 meta/recipes-graphics/emptty/emptty_0.13.0.bb | 80 +++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 meta/recipes-graphics/emptty/emptty/init
 create mode 100644 meta/recipes-graphics/emptty/emptty/pamconf
 create mode 100644 meta/recipes-graphics/emptty/emptty_0.13.0.bb
meta/recipes-graphics/emptty/emptty/init new file +26 -0
new file mode 100644
index 0000000000..52493142cd
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+PIDFILE=/var/run/emptty.pid
+
+# source function library
+. /etc/init.d/functions
+
+case "$1" in
+	start)
+		echo "Starting display manager: emptty"
+		start-stop-daemon -S -p $PIDFILE -x /usr/bin/emptty
+		;;
+	stop)
+		echo "Stopping display manager: emptty"
+		start-stop-daemon -S -p $PIDFILE -x /usr/bin/emptty
+		;;
+	restart)
+		start-stop-daemon -K -p $PIDFILE --oknodo -x /usr/bin/emptty
+		sleep 2
+		start-stop-daemon -S -p $PIDFILE -x /usr/bin/emptty
+		;;
+	*)
+		echo "usage: $0 { start | stop | restart }"
+		;;
+esac
+
meta/recipes-graphics/emptty/emptty/pamconf new file +10 -0
new file mode 100644
index 0000000000..9cbfd6c4a5
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth            sufficient      pam_succeed_if.so user ingroup nopasswdlogin
+auth            include         common-auth
+-auth           optional        pam_gnome_keyring.so
+-auth           optional        pam_kwallet5.so
+account         include         common-account
+session         include         common-session
+-session        optional        pam_gnome_keyring.so auto_start
+-session        optional        pam_kwallet5.so auto_start force_run
+password        include         common-password
meta/recipes-graphics/emptty/emptty_0.13.0.bb new file +80 -0

80 lines not on this page · raw message

Signature · 1 line
2.48.1
#6 lore raw

RFC 2/3 weston-init: convert to virtual-emptty-conf

In reply to [email protected]

From: Randolph Sapp <[email protected]>

Convert this script package into a simple config for emptty using the same weston user but leveraging the nopasswdlogin session provided by emptty. Runtime provide virtual-emptty-conf as we need to set parameters for the default session.

---
 meta/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.env            |  0
 .../wayland/weston-init/weston.service        | 71 -----------------
 .../wayland/weston-init/weston.socket         | 14 ----
 8 files changed, 89 insertions(+), 219 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 100644 meta/recipes-graphics/wayland/weston-init/weston.env
 delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.service
 delete mode 100644 meta/recipes-graphics/wayland/weston-init/weston.socket
meta/recipes-graphics/wayland/weston-init.bb +12 -49
index 5723655a9b..d20cdd6803 100644
@@ -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"
meta/recipes-graphics/wayland/weston-init/emptty.conf new file +77 -0

77 lines not on this page · raw message

meta/recipes-graphics/wayland/weston-init/init deleted +0 -54

54 lines not on this page · raw message

meta/recipes-graphics/wayland/weston-init/weston-autologin deleted +0 -11
deleted file mode 100644
index f6e6d106de..0000000000
@@ -1,11 +0,0 @@
-auth      required  pam_nologin.so
-auth      required  pam_unix.so     try_first_pass nullok
-
-account   required  pam_nologin.so
-account   required  pam_unix.so
-
-session   required  pam_env.so
-session   required  pam_unix.so
--session  optional  pam_systemd.so type=wayland class=user desktop=weston
--session  optional  pam_loginuid.so
-
meta/recipes-graphics/wayland/weston-init/weston-socket.sh deleted +0 -20
deleted file mode 100755
index 86389d63a3..0000000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# set weston variables for use with global weston socket
-global_socket="/run/wayland-0"
-if [ -e "$global_socket" ]; then
-	weston_group=$(stat -c "%G" "$global_socket")
-	if [ "$(id -u)" = "0" ]; then
-		export WAYLAND_DISPLAY="$global_socket"
-	else
-		case "$(groups "$USER")" in
-			*"$weston_group"*)
-				export WAYLAND_DISPLAY="$global_socket"
-				;;
-			*)
-				;;
-		esac
-	fi
-	unset weston_group
-fi
-unset global_socket
meta/recipes-graphics/wayland/weston-init/weston.env deleted +0 -0
deleted file mode 100644
index e69de29bb2..0000000000
meta/recipes-graphics/wayland/weston-init/weston.service deleted +0 -71

71 lines not on this page · raw message

meta/recipes-graphics/wayland/weston-init/weston.socket deleted +0 -14
deleted file mode 100644
index c1bdc83c05..0000000000
@@ -1,14 +0,0 @@
-[Unit]
-Description=Weston socket
-RequiresMountsFor=/run
-
-[Socket]
-ListenStream=/run/wayland-0
-SocketMode=0775
-SocketUser=weston
-SocketGroup=wayland
-RemoveOnStop=yes
-
-[Install]
-WantedBy=sockets.target
-
Signature · 1 line
2.48.1
#7 lore raw

Patchtest results for [oe-core][RFC 2/3] weston-init: convert to virtual-emptty-conf

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/RFC-2-3-weston-init-convert-to-virtual-emptty-conf.patch

FAIL: test src uri left files: Patches not removed from tree. Remove them and amend the submitted mbox (test_metadata.TestMetadata.test_src_uri_left_files)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#8 lore raw

RFC 3/3 default-providers: set virtual-emptty-conf

In reply to [email protected]

From: Randolph Sapp <[email protected]>

Set a soft default for virtual-emptty-conf to weston-init when IMAGE_FEATURES contains weston, since weston RRECOMMENDS weston-init and most builds pull it in by default. Silences warning about multiple providers for virtual-emptty-conf.

---
 meta/conf/distro/include/default-providers.inc | 1 +
 1 file changed, 1 insertion(+)
meta/conf/distro/include/default-providers.inc +1 -0
index d3eefb754b..925e03f13c 100644
@@ -63,3 +63,4 @@ PREFERRED_RPROVIDER_initd-functions ?= "initscripts"
 PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa"
 
 PREFERRED_RPROVIDER_virtual-x-terminal-emulator ?= "rxvt-unicode"
+PREFERRED_RPROVIDER_virtual-emptty-conf ?= "${@bb.utils.contains('IMAGE_FEATURES','weston','weston-init','emptty-conf',d)}"
Signature · 1 line
2.48.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

#10 lore raw

Re: [OE-core] [PATCH] Revert "gettext: fix a parallel build issue"

Quoted 55 lines · Randolph Sapp via lists.openembedded.org

From: Randolph Sapp <[email protected]>

This reverts commit e18fc96f9d4c0a0525c21371d3f36e8dfe008b35.

---
 ...1-intl-Fix-build-failure-with-make-j.patch | 35 -------------------
 meta/recipes-core/gettext/gettext_0.22.5.bb   |  1 -
 2 files changed, 36 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch
meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch deleted +0 -35
deleted file mode 100644
index 144259dd3f..0000000000
@@ -1,35 +0,0 @@
-From 97a6a63ad61949663283f5fad68c9d5fb9be1f15 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <[email protected]>
-Date: Tue, 12 Sep 2023 11:33:41 +0200
-Subject: [PATCH] intl: Fix build failure with "make -j".
-
-Reported by Christian Weisgerber <[email protected]> at
-<https://lists.gnu.org/archive/html/bug-gettext/2023-09/msg00005.html>.
-
-* gettext-runtime/intl/Makefile.am (langprefs.lo, log.lo): Depend on gettextP.h
-and its subordinate includes.
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15]
-Signed-off-by: Changqing Li <[email protected]>
----
- gettext-runtime/intl/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
-index da7abb758..9e56978bc 100644
---- a/gettext-runtime/intl/Makefile.am
-+++ b/gettext-runtime/intl/Makefile.am
-@@ -387,8 +387,8 @@ dngettext.lo:        ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo
- ngettext.lo:         ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
- plural.lo:           ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS)
- plural-exp.lo:       ../config.h $(srcdir)/plural-exp.h
--langprefs.lo:        ../config.h
--log.lo:              ../config.h
-+langprefs.lo:        ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
-+log.lo:              ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
- printf.lo:           ../config.h
- setlocale.lo:        ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
- version.lo:          ../config.h libgnuintl.h
--- 
-2.25.1
-
meta/recipes-core/gettext/gettext_0.22.5.bb +0 -0
index 7eeb1a86fd..1a66d37916 100644

meta/recipes-core/gettext/gettext_0.22.5.bb SRC_URI += " \ · line 33

Quoted 7 lines
meta/recipes-core/gettext/gettext_0.22.5.bb +0 -1
@@ -28,7 +28,6 @@ SRC_URI += " \
            file://serial-tests-config.patch \
            file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \
            file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \
-           file://0001-intl-Fix-build-failure-with-make-j.patch \
            "
 
 inherit autotools texinfo pkgconfig ptest

Sorry for the spam. These are not part of the RFC series and should be ignored. Old patches I forgot to clean out of my pwd.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#12 lore raw

Re: [OE-core] [PATCH] bzip2: add libbz2.so.1.0 link for compat

Quoted 27 lines · Randolph Sapp via lists.openembedded.org

From: Randolph Sapp <[email protected]>

Add a link from libbz2.so.1.0 to libbz2.so.${PV} for compatibility with other distributions.

A handfull of distributions are still using the "Makefile-libbz2_so" to generate libbz2 and bzip2-shared. This creates a library with a soname of "libbz2.so.1.0". This library link is not provide by default in autotools builds so add one here as Gentoo does now [1].

This has been addressed upstream already, but there hasn't been a stable release since then [2].

[1] https://bugs.gentoo.org/338321
[2] https://gitlab.com/bzip2/bzip2/-/merge_requests/42

---
 meta/recipes-extended/bzip2/bzip2_1.0.8.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-extended/bzip2/bzip2_1.0.8.bb +0 -0
index 78138d1543..02d81e7069 100644
@@ -62,6 +62,11 @@ do_install_ptest () {
 	sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile

meta/recipes-extended/bzip2/bzip2_1.0.8.bb do_install_ptest () { · line 72

Quoted 10 lines
meta/recipes-extended/bzip2/bzip2_1.0.8.bb +5 -0
 }
 
+# add the following link for cross-distro compatibility
+do_install:append () {
+	ln -s libbz2.so.${PV} "${D}${libdir}/libbz2.so.1.0"
+}
+
 FILES:libbz2 = "${libdir}/lib*${SOLIBS}"
 
 RDEPENDS:${PN}-ptest += "make bash"

Sorry for the spam. These are not part of the RFC series and should be ignored. Old patches I forgot to clean out of my pwd.

#13 lore raw
In reply to [email protected]
Quoted 7 lines · On Fri, 14 Mar 2025 at 01:30, <[email protected]> wrote:

Example implementation of emptty for weston-init following the request on the previous RFC [1] and previous example [2]. This variant is applicable to master.

This packages emptty and a default configuration for emptty as "emptty" and "emptty-conf" respectively. This allows the existing init packages to override the configuration similar to the way grub boot configs are handled.

Quoted 7 lines

The weston-init package still handles the weston config and weston user setup as it always has. The only real difference from a consumer standpoint is that the autologin group for the weston user changed from "wayland" to the more generic "nopasswdlogin".

[1] https://lists.openembedded.org/g/openembedded-core/message/212640
[2] https://lists.openembedded.org/g/openembedded-core/message/212785

I quickly checked this locally. There are some issues that need to be addressed before this goes to the autobuilder:

1. WARNING: emptty-0.13.0-r0 do_recipe_qa: QA Issue: Recipe emptty in /srv/work/alex/poky/meta/recipes-graphics/emptty/emptty_0.13.0.bb does not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc. [missing-maintainer]

2. With default poky config:

ERROR: Nothing RPROVIDES 'pam-plugin-succeed-if' (but /srv/work/alex/poky/meta/recipes-graphics/emptty/emptty_0.13.0.bb RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'pam-plugin-succeed-if' is unbuildable, removing... Missing or unbuildable dependency chain was: ['pam-plugin-succeed-if']
ERROR: Required build target 'emptty' has no buildable providers. Missing or unbuildable dependency chain was: ['emptty', 'pam-plugin-succeed-if']

You should either make the pam dependency optional (via PACKAGECONFIG subject to pam in DISTRO_FEATURES), or use REQUIRED_DISTRO_FEATURES.

3. Again, with default poky config:

NOTE: Multiple providers are available for runtime virtual-emptty-conf (emptty, weston-init)
Consider defining a PREFERRED_RPROVIDER entry to match virtual-emptty-conf

Alex

#14 lore raw
Quoted 16 lines · Alexander Kanavin
Quoted 7 lines · On Fri, 14 Mar 2025 at 01:30, <[email protected]> wrote:

Example implementation of emptty for weston-init following the request on the previous RFC [1] and previous example [2]. This variant is applicable to master.

This packages emptty and a default configuration for emptty as "emptty" and "emptty-conf" respectively. This allows the existing init packages to override the configuration similar to the way grub boot configs are handled.

Quoted 7 lines

The weston-init package still handles the weston config and weston user setup as it always has. The only real difference from a consumer standpoint is that the autologin group for the weston user changed from "wayland" to the more generic "nopasswdlogin".

[1] https://lists.openembedded.org/g/openembedded-core/message/212640
[2] https://lists.openembedded.org/g/openembedded-core/message/212785

Quoted 7 lines

I quickly checked this locally. There are some issues that need to be addressed before this goes to the autobuilder:

1. WARNING: emptty-0.13.0-r0 do_recipe_qa: QA Issue: Recipe emptty in /srv/work/alex/poky/meta/recipes-graphics/emptty/emptty_0.13.0.bb does not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc. [missing-maintainer]

Yeah. I wouldn't mind maintaining this package and can set that. Just didn't know if there was someone I needed to check with before I did that.

Quoted 10 lines

2. With default poky config:

ERROR: Nothing RPROVIDES 'pam-plugin-succeed-if' (but /srv/work/alex/poky/meta/recipes-graphics/emptty/emptty_0.13.0.bb RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'pam-plugin-succeed-if' is unbuildable, removing... Missing or unbuildable dependency chain was: ['pam-plugin-succeed-if']
ERROR: Required build target 'emptty' has no buildable providers. Missing or unbuildable dependency chain was: ['emptty', 'pam-plugin-succeed-if']

Quoted 2 lines

You should either make the pam dependency optional (via PACKAGECONFIG subject to pam in DISTRO_FEATURES), or use REQUIRED_DISTRO_FEATURES.

Good point. I added the PACKAGECONFIG to remove pam support, that should also toggle the runtime dep on pam-plugin-succeed-if. Will address in the proper series.

Quoted 8 lines

3. Again, with default poky config:

NOTE: Multiple providers are available for runtime virtual-emptty-conf (emptty, weston-init)
Consider defining a PREFERRED_RPROVIDER entry to match virtual-emptty-conf

Alex

That last note is perplexing. Patch 3/3 is literally setting the default runtime provider for virtual-emptty-conf. I'm also seeing the following notice though:

NOTE: Multiple providers are available for runtime libnss-mdns (avahi-libnss-mdns, mdns) Consider defining a PREFERRED_RPROVIDER entry to match libnss-mdns
Is there some other variable I need to set for master? Is that message now being printed if 2 package are being produced? If that's the case I can check the PREFERRED_RPROVIDER variable and conditionally prevent producing the emptty-conf package, but that feels a little hacky. Anyone have any better ideas about that?

- Randolph

#15 lore raw
Quoted 60 lines · Randolph Sapp
Quoted 16 lines · Alexander Kanavin
Quoted 7 lines · On Fri, 14 Mar 2025 at 01:30, <[email protected]> wrote:

Example implementation of emptty for weston-init following the request on the previous RFC [1] and previous example [2]. This variant is applicable to master.

This packages emptty and a default configuration for emptty as "emptty" and "emptty-conf" respectively. This allows the existing init packages to override the configuration similar to the way grub boot configs are handled.

Quoted 7 lines

The weston-init package still handles the weston config and weston user setup as it always has. The only real difference from a consumer standpoint is that the autologin group for the weston user changed from "wayland" to the more generic "nopasswdlogin".

[1] https://lists.openembedded.org/g/openembedded-core/message/212640
[2] https://lists.openembedded.org/g/openembedded-core/message/212785

Quoted 7 lines

I quickly checked this locally. There are some issues that need to be addressed before this goes to the autobuilder:

1. WARNING: emptty-0.13.0-r0 do_recipe_qa: QA Issue: Recipe emptty in /srv/work/alex/poky/meta/recipes-graphics/emptty/emptty_0.13.0.bb does not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc. [missing-maintainer]

Yeah. I wouldn't mind maintaining this package and can set that. Just didn't know if there was someone I needed to check with before I did that.

Quoted 10 lines

2. With default poky config:

ERROR: Nothing RPROVIDES 'pam-plugin-succeed-if' (but /srv/work/alex/poky/meta/recipes-graphics/emptty/emptty_0.13.0.bb RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'pam-plugin-succeed-if' is unbuildable, removing... Missing or unbuildable dependency chain was: ['pam-plugin-succeed-if']
ERROR: Required build target 'emptty' has no buildable providers. Missing or unbuildable dependency chain was: ['emptty', 'pam-plugin-succeed-if']

Quoted 2 lines

You should either make the pam dependency optional (via PACKAGECONFIG subject to pam in DISTRO_FEATURES), or use REQUIRED_DISTRO_FEATURES.

Good point. I added the PACKAGECONFIG to remove pam support, that should also toggle the runtime dep on pam-plugin-succeed-if. Will address in the proper series.

Quoted 8 lines

3. Again, with default poky config:

NOTE: Multiple providers are available for runtime virtual-emptty-conf (emptty, weston-init)
Consider defining a PREFERRED_RPROVIDER entry to match virtual-emptty-conf

Alex

That last note is perplexing. Patch 3/3 is literally setting the default runtime provider for virtual-emptty-conf. I'm also seeing the following notice though:

NOTE: Multiple providers are available for runtime libnss-mdns (avahi-libnss-mdns, mdns) Consider defining a PREFERRED_RPROVIDER entry to match libnss-mdns

Quoted 6 lines

Is there some other variable I need to set for master? Is that message now being printed if 2 package are being produced? If that's the case I can check the PREFERRED_RPROVIDER variable and conditionally prevent producing the emptty-conf package, but that feels a little hacky. Anyone have any better ideas about that?

- Randolph

Another fun issue. This actually adds additional checks to user accounts using unix_chkpwd in pam and an equivalent mechanism in the libxcrypt path. It's uncovered a relatively interesting issue around device initialization where system time is reset to a date prior to the build in the case where there is no RTC to read and the weston user's login attempts fail until the time catches up. The password change for that user is in the future.

Forcing a time jump during startup with a custom service resolves the issue, but it's unusual nothing else has had any problems with this. I thought I remember Yocto defaulting the OS time to the image build time. Was I hallucinating that?

- Randolph