| Message ID | 20251223220114.2259233-2-rs@ti.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Display manager proposal for x11 and wayland | expand |
On Tue Dec 23, 2025 at 11:01 PM CET, rs wrote: > 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> > --- Hi Randolph, Thanks for your patch, it got way better. It looks like the last error is some reproducibility issues: AssertionError: The following deb packages are different and not in exclusion list: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-conf-dbg_1.0-r0_amd64.deb /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-conf-dev_1.0-r0_amd64.deb /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-conf_1.0-r0_amd64.deb /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-dbg_0.15.0-r0_amd64.deb /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-dev_0.15.0-r0_amd64.deb /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-doc_0.15.0-r0_amd64.deb /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-src_0.15.0-r0_amd64.deb /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty_0.15.0-r0_amd64.deb https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3100 Diffoscope output can be found here: https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20251226-g95kquv4/packages/diff-html/ Can you have a look at this? Thanks, Mathieu
On Fri Dec 26, 2025 at 10:37 AM CST, Mathieu Dubois-Briand wrote: > On Tue Dec 23, 2025 at 11:01 PM CET, rs wrote: >> 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> >> --- > > Hi Randolph, > > Thanks for your patch, it got way better. > > It looks like the last error is some reproducibility issues: > > AssertionError: The following deb packages are different and not in exclusion list: > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-conf-dbg_1.0-r0_amd64.deb > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-conf-dev_1.0-r0_amd64.deb > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-conf_1.0-r0_amd64.deb > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-dbg_0.15.0-r0_amd64.deb > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-dev_0.15.0-r0_amd64.deb > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-doc_0.15.0-r0_amd64.deb > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty-src_0.15.0-r0_amd64.deb > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/emptty_0.15.0-r0_amd64.deb > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3100 > > Diffoscope output can be found here: > https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20251226-g95kquv4/packages/diff-html/ > > Can you have a look at this? > > Thanks, > Mathieu Well, it appears to be an issue with cgo applications as a whole. Bug raised upstream. https://github.com/golang/go/issues/77218 - Randolph
diff --git a/meta-selftest/files/static-group b/meta-selftest/files/static-group index 252fdac67d..a197216165 100644 --- a/meta-selftest/files/static-group +++ b/meta-selftest/files/static-group @@ -29,3 +29,4 @@ ptest:x:529: xuser:x:530: seat:x:531: audio:x:532: +nopasswdlogin:x:533: diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 3f113543cd..820a5d1342 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -69,3 +69,4 @@ PREFERRED_PROVIDER_virtual/nativesdk-libsdl2 ?= "nativesdk-libsdl2" PREFERRED_RPROVIDER_virtual-libegl-icd ?= "mesa" PREFERRED_RPROVIDER_virtual-libglx-icd ?= "mesa" PREFERRED_RPROVIDER_virtual-x-terminal-emulator ?= "rxvt-unicode" +PREFERRED_RPROVIDER_virtual-emptty-conf ?= "emptty-conf" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 523ac09b53..cc28ca5af2 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -170,6 +170,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 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-ell = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER:pn-emptty = "Randolph Sapp <rs@ti.com>" +RECIPE_MAINTAINER:pn-emptty-conf = "Randolph Sapp <rs@ti.com>" RECIPE_MAINTAINER:pn-enchant2 = "Unassigned <unassigned@yoctoproject.org>" 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..0b98e2e13e --- /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} = "${sysconfdir}/emptty/conf" +CONFFILES:${PN} = "${sysconfdir}/emptty/conf" +RPROVIDES:${PN} += "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..cfe9ebf154 --- /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 = "bb203ad0a224731a7a2ff50deeb342ab79c4af09" +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.15.0.bb b/meta/recipes-graphics/emptty/emptty_0.15.0.bb new file mode 100644 index 0000000000..524ef08128 --- /dev/null +++ b/meta/recipes-graphics/emptty/emptty_0.15.0.bb @@ -0,0 +1,59 @@ +require emptty.inc + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam x11', d)}" +PACKAGECONFIG[pam] = ",,libpam,pam-plugin-succeed-if" +PACKAGECONFIG[x11] = ",,virtual/libx11,util-linux-mcookie" + +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 + + # systemd init service + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)} + then + oe_runmake -C ${S}/src/${GO_IMPORT} DESTDIR=${D} install-systemd + fi + + # legacy inittab entry + install -Dm644 ${S}/emptty.tab ${D}${sysconfdir}/inittab.d/emptty.tab +} + +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 + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "-r nopasswdlogin" + +inherit useradd