From: Randolph Sapp <[email protected]> Merge the xuser-account recipe with xserver-nodm-init, since:
- This is the only recipe dependent on it - This matches the current behavior in weston-init - Running x11 as root is no longer a supported path in xserver-nodm-init - The display manager configuration and user account name are heavily connected - The existing method of integration ignored this connection Signed-off-by: Randolph Sapp <[email protected]> --- meta/conf/distro/include/maintainers.inc | 1 - .../xserver-nodm-init}/system-xuser.conf | 0 .../x11-common/xserver-nodm-init_3.0.bb | 20 +++++++++--- .../user-creation/xuser-account_0.1.bb | 31 ------------------- 4 files changed, 15 insertions(+), 37 deletions(-) rename meta/{recipes-support/user-creation/files => recipes-graphics/x11-common/xserver-nodm-init}/system-xuser.conf (100%) delete mode 100644 meta/recipes-support/user-creation/xuser-account_0.1.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index a7425f7020..ec0a128901 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -935,7 +935,6 @@ RECIPE_MAINTAINER:pn-xserver-xf86-config = "Unassigned <unassigned@yoctoproject. RECIPE_MAINTAINER:pn-xserver-xorg = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xset = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xtrans = "Unassigned <[email protected]>" -RECIPE_MAINTAINER:pn-xuser-account = "Randolph Sapp <[email protected]>" RECIPE_MAINTAINER:pn-xvinfo = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xwayland = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-xwininfo = "Unassigned <[email protected]>" diff --git a/meta/recipes-support/user-creation/files/system-xuser.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/system-xuser.conf similarity index 100% rename from meta/recipes-support/user-creation/files/system-xuser.conf rename to meta/recipes-graphics/x11-common/xserver-nodm-init/system-xuser.conf 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 ed056df72f..0e9fe1e65a 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,14 +1,15 @@ -SUMMARY = "Simple Xserver Init Script (no dm)" +SUMMARY = "Simple Xserver Init Script and user account" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SECTION = "x11" SRC_URI = "file://emptty.conf.in \ - file://default.desktop" + file://default.desktop \ + file://system-xuser.conf" S = "${UNPACKDIR}" -inherit features_check +inherit features_check useradd REQUIRED_DISTRO_FEATURES = "x11" @@ -26,10 +27,19 @@ do_install() { sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/emptty/conf sed -i "s:@BLANK_ARGS@:${BLANK_ARGS}:" ${D}${sysconfdir}/emptty/conf + + install -D -m 0644 ${S}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf } FILES:${PN} = "${sysconfdir}/emptty/conf \ - ${datadir}/xsessions/default.desktop" + ${datadir}/xsessions/default.desktop \ + ${sysconfdir}/dbus-1/system.d/system-xuser.conf" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--create-home \ + --groups video,tty,audio,input,shutdown,disk,nopasswdlogin \ + --user-group xuser" +GROUPADD_PARAM:${PN} = "-r nopasswdlogin" -RDEPENDS:${PN} = "emptty xuser-account" +RDEPENDS:${PN} = "emptty" RPROVIDES:${PN} += "virtual-emptty-conf" diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb deleted file mode 100644 index f1e4cb674f..0000000000 --- a/meta/recipes-support/user-creation/xuser-account_0.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Creates an 'xuser' account used for running X11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "file://system-xuser.conf" - -inherit allarch useradd - -S = "${UNPACKDIR}" - -do_configure() { - : -} - -do_compile() { - : -} - -do_install() { - install -D -m 0644 ${UNPACKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf -} - -FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--create-home \ - --groups video,tty,audio,input,shutdown,disk,nopasswdlogin \ - --user-group xuser" -GROUPADD_PARAM:${PN} = "-r nopasswdlogin" - -ALLOW_EMPTY:${PN} = "1" -- 2.52.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#230168): https://lists.openembedded.org/g/openembedded-core/message/230168 Mute This Topic: https://lists.openembedded.org/mt/117536054/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
