From patchwork Fri Feb 27 18:31:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 82152 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D23AFEFB7C for ; Fri, 27 Feb 2026 18:31:54 +0000 (UTC) Received: from CY7PR03CU001.outbound.protection.outlook.com (CY7PR03CU001.outbound.protection.outlook.com [52.102.133.19]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.103219.1772217111621792133 for ; Fri, 27 Feb 2026 10:31:51 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ti.com header.s=selector1 header.b=BKezi4ub; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: ti.com, ip: 52.102.133.19, mailfrom: rs@ti.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HOtaJRDpt1UhsNeqyeBnq18YNqKGE3uMP4C2uun+XbX7JiImlMqVrJkSPfwgpHNxv+bbeAlXRYOMYugcOchM4o6mMcrm+ywa9TeAhhaYYgAZ50rKxSw0nBj+k+9uWl2mp9gjUTaNGXCpmAHnEdNYg6geC1DoBC1lwEdInruVemKsvmwNEB+sk5C9q2K7kJsJvOaK0+pljdGeKWULJrIo6WnSxY2VOQQyTabmB2x/uorjtVvIQdHCK69yWPOzQHvUtzx0FDp6xxqTT8G/QSFrSn3Y/XBu1FvIGV5CeFiM7YlVfIOnUS7qrqd3GSAO6W1iCFQWVhRaPZtyyD19OnZ65A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ORj1OKed6eQISQGUv/hgENlu+ixRx/hkQ1prKRk9YQA=; b=BxuJoiQ972SWZNfmBG65PXF/D0vYI5/NPt95QgYd883ODDWpFPwkWO4EHjWIc0spkesmI43zpCA4cQNd9enP4SLeLMU3hLN6wx0NKNU4BmwWNfIUbTKWjggTMh6I1XuxsvOtRxusU4cTm9epOLsFsKmjBoouLLwrO2UdMZbkDtYYHb8oxrkY+W0+zfYmzE0jOu28jcLZeIGyQaSU1r2iIqhD8ijZYx8lZ3TvIltCFxHDXu2n6JL/fHO3lgiduVvnfpMSTR58QbTprjUz7sp4sReZXfPq9OYqftzF0aAp7l122nywV/S7SPAsR2xdRRSd/5pDdiSwQWdH0jcmRHHPBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.195) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=ti.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=ti.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ORj1OKed6eQISQGUv/hgENlu+ixRx/hkQ1prKRk9YQA=; b=BKezi4ubqg/gD/GAgm6PxT4f7yT5DIvlH8NdO+nHOcrgnnotqrnv9ArUk4/Q26L4on5GbOU2gPrjuFIDA8uiO4Csqlatow7B1Y8eiFtBdyxeqrfp3YWUp9IvSBeOMmtQiX3aNrpXdzZzNpUZG/QkSy+YoF5oenBjZ3pKs2gmzx4= Received: from SA0PR11CA0161.namprd11.prod.outlook.com (2603:10b6:806:1bb::16) by SA1PR10MB7661.namprd10.prod.outlook.com (2603:10b6:806:386::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.14; Fri, 27 Feb 2026 18:31:46 +0000 Received: from SA2PEPF00003F61.namprd04.prod.outlook.com (2603:10b6:806:1bb:cafe::4a) by SA0PR11CA0161.outlook.office365.com (2603:10b6:806:1bb::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9632.27 via Frontend Transport; Fri, 27 Feb 2026 18:31:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.23.195) smtp.mailfrom=ti.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ti.com; Received-SPF: Pass (protection.outlook.com: domain of ti.com designates 198.47.23.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.23.195; helo=lewvzet201.ext.ti.com; pr=C Received: from lewvzet201.ext.ti.com (198.47.23.195) by SA2PEPF00003F61.mail.protection.outlook.com (10.167.248.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.16 via Frontend Transport; Fri, 27 Feb 2026 18:31:46 +0000 Received: from DLEE212.ent.ti.com (157.170.170.114) by lewvzet201.ext.ti.com (10.4.14.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Fri, 27 Feb 2026 12:31:41 -0600 Received: from DLEE205.ent.ti.com (157.170.170.85) by DLEE212.ent.ti.com (157.170.170.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Fri, 27 Feb 2026 12:31:41 -0600 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE205.ent.ti.com (157.170.170.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Fri, 27 Feb 2026 12:31:41 -0600 Received: from rs-desk.dhcp.ti.com (rs-desk.dhcp.ti.com [128.247.81.144]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 61RIVeRb012242; Fri, 27 Feb 2026 12:31:41 -0600 From: To: , , , , , CC: , , , , , Subject: [oe-core][PATCHv16 6/6] xsessions: add unique desktop entries Date: Fri, 27 Feb 2026 12:31:35 -0600 Message-ID: <20260227183135.64544-7-rs@ti.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260227183135.64544-1-rs@ti.com> References: <20260227183135.64544-1-rs@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003F61:EE_|SA1PR10MB7661:EE_ X-MS-Office365-Filtering-Correlation-Id: f714ab3f-805d-4a54-6d4f-08de762e76b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|34020700016|36860700013|12100799066; X-Microsoft-Antispam-Message-Info: /J2jajxEKSMdRFlSRPtnA18ImfbCDCb/4fLkB1BDj2J9nmq/Dta5gzW/gl503BG3qSfWAruY34kwHHjVlyyiibWck9IJamJm4eDZ8aOA8WoiKj1ghwKEpGirK8O8MIKZbzqY+NtvMNJrat0+1Rvyt5NRSEvJyqR5JLbtmkuNL8D+tztHz8B5qQJQcXSQDAHMrz8IGYvJDqBRIRv0kh+/nHgDwuBoJ8xmp6TA8Cdu2DANwPQi+P3mQ43BmmkkfnGpeWpeI/DkOf2vlfAnyZsPGMUqkyANsI3t8kLUM+AWrjsS9UVfgqJ2oWTe+Yg+W+gN2ZCmTbPccFsMBkduuF0NYwbRNl6PzylQmnwVMYPWuXAimAd6ZOdOtC37rjcjDbyYAMoNqLoQpa6vZIBagSJkGm62KCZnmXyVDnKjbE5vHTjd/EBmfs6y4Dwk9A1sa3TpEezqrGykIyiZea6C1DAQRQ9Ppj/DRPcg+YGmxxT1llvDuWr7bFn1H/m4oW2mWJVgfnJRdGQ3T2Q4SdNXJxZyxW3bDovcQzpK4tg2rZHFpTPj2rWAf6dw2FYMpCnMfqRzVTXjmj4YmXqliP+6AVCle2unlrxTMSy1L1XoP9PcSRiGn1VJg5wayPdFLWSAX2e7OZcgpRqvd3Q+ArqvBXiLz83hJAWwfZ/ZmXlTS6YxTfFnJKVlSD3adrVWnDVyE/aLEI3omsGiFC7mwIdU9riYVshwHVR6t6Kn8gn94uINtEkguF2QkkJ4pquBC73nCTuOxDx02m1icXdq2uawQTddUoANckWqZNcrY4w6Ib441UiYBOe8JpDvdSGSdYUQqMJlSel17JwfDsxx682OCBB24w== X-Forefront-Antispam-Report: CIP:198.47.23.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:lewvzet201.ext.ti.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(34020700016)(36860700013)(12100799066);DIR:OUT;SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Kr+r/BjXce7b2GvnZ0SqOj7dWmGSyql5HiL0ult23cEMxSIRXDwattFyGPG+UbFqI+E+A53kHDAbPTYxm7bzi1KnQqRvQa/Ku49cW/XW+hHtM6o3VeE5JWpLP/Tqmvbqy63lfzN9YErqKDiup5HvLwIxKXvzVkGVArIKNzNqtJQcBEQropVkJ81XEtRNdVFEZp7Rzcallbt/FcYP8+7YV7jKWFMajULet13lDpfTGY7hta7+UGN1FFWUQuUBCCwmJtTZA725JC50QKMa4mW4jxj+drhC70kgXSQWF1+qqO2yIiuDHL6y8jN5+DKNzrOCVDyv7Lx1FY14eB3lA6kWCmN/x7xmVGytc6CnKF5O9sRRZZV7ImfnL4VrcOodtdXUr8gvLCcG9140mYIwisyeYx5h//1ZPOY0HLj/omkptN7PdIrcOeb3hIYKj9VRJhBp X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2026 18:31:46.4690 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f714ab3f-805d-4a54-6d4f-08de762e76b7 X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.23.195];Helo=[lewvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003F61.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7661 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 27 Feb 2026 18:31:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/232108 From: Randolph Sapp Now that we have a display manager, users can have the option to choose a session manager with the default emptty configuration. Currently this could be either mini-x-session or matchbox-session. Previously, only one was selectable via update-alternatives logic switching out the x-session-manager link that xserver-nodm-init would unconditionally use. From my testing this normally resulted in matchbox-session being chosen. Now xserver-nodm-init will use a DEFAULT_SESSION variable to configure the automatic login session, and both of these session managers will provide unique desktop entries for their respective sessions. The loose default for DEFAULT_SESSION will be matchbox-session to keep in line with the existing behavior. Signed-off-by: Randolph Sapp --- .../matchbox-session/matchbox-session.desktop | 6 ++++++ .../matchbox-session/matchbox-session_0.1.bb | 13 ++++++------- .../mini-x-session/files/mini-x-session.desktop | 6 ++++++ .../mini-x-session/mini-x-session_0.1.bb | 13 ++++++------- .../x11-common/xserver-nodm-init/default.desktop | 5 ----- .../x11-common/xserver-nodm-init/emptty.conf.in | 2 +- .../x11-common/xserver-nodm-init_3.0.bb | 7 ++++--- 7 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session.desktop create mode 100644 meta/recipes-graphics/mini-x-session/files/mini-x-session.desktop delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session.desktop b/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session.desktop new file mode 100644 index 0000000000..f496fd860f --- /dev/null +++ b/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Matchbox Session +Comment=Very simple session manager for matchbox tools +Type=Application +Exec=matchbox-session +DesktopNames=matchbox diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb index d8be3417cc..bee18ad617 100644 --- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb +++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb @@ -9,17 +9,16 @@ LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c3 SECTION = "x11" RCONFLICTS:${PN} = "matchbox-common" -SRC_URI = "file://matchbox-session" +SRC_URI = "file://matchbox-session \ + file://matchbox-session.desktop" S = "${UNPACKDIR}" -inherit update-alternatives - -ALTERNATIVE:${PN} = "x-session-manager" -ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "100" - do_install() { install -d ${D}/${bindir} install -m 0755 ${S}/matchbox-session ${D}/${bindir} + install -d ${D}${datadir}/xsessions + install -m 0644 ${S}/matchbox-session.desktop ${D}${datadir}/xsessions } + +FILES:${PN} += "${datadir}/xsessions" diff --git a/meta/recipes-graphics/mini-x-session/files/mini-x-session.desktop b/meta/recipes-graphics/mini-x-session/files/mini-x-session.desktop new file mode 100644 index 0000000000..d7afed9cfd --- /dev/null +++ b/meta/recipes-graphics/mini-x-session/files/mini-x-session.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Mini X Session +Comment=Very simple session manager for X +Type=Application +Exec=mini-x-session +DesktopNames=matchbox diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb index e90786df44..b223c38c9e 100644 --- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb +++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb @@ -9,19 +9,18 @@ LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938 SECTION = "x11" RCONFLICTS:${PN} = "matchbox-common" -SRC_URI = "file://mini-x-session" +SRC_URI = "file://mini-x-session \ + file://mini-x-session.desktop" S = "${UNPACKDIR}" RDEPENDS:${PN} = "sudo" -inherit update-alternatives - -ALTERNATIVE:${PN} = "x-session-manager" -ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/mini-x-session" -ALTERNATIVE_PRIORITY = "50" - do_install() { install -d ${D}/${bindir} install -m 0755 ${S}/mini-x-session ${D}/${bindir} + install -d ${D}${datadir}/xsessions + install -m 0644 ${S}/mini-x-session.desktop ${D}${datadir}/xsessions } + +FILES:${PN} += "${datadir}/xsessions" diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop b/meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop deleted file mode 100644 index 3357cd9a7f..0000000000 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/default.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Default X11 Desktop -Exec=x-session-manager diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in b/meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in index bdb3bec782..fbe106d9b6 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/emptty.conf.in @@ -17,7 +17,7 @@ DEFAULT_USER=xuser AUTOLOGIN=true # The default session used, if Autologin is enabled. If session is not found in list of session, it proceeds to manual selection. -AUTOLOGIN_SESSION=Default X11 Desktop +AUTOLOGIN_SESSION=@DEFAULT_SESSION@ # If Autologin is enabled and session does not start correctly, the number of retries in short period is kept to eventually stop the infinite loop of restarts. -1 is for infinite retries, 0 is for no retry. # AUTOLOGIN_MAX_RETRY=2 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 0e9fe1e65a..a4b4a11d1b 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 @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SECTION = "x11" SRC_URI = "file://emptty.conf.in \ - file://default.desktop \ file://system-xuser.conf" S = "${UNPACKDIR}" @@ -18,21 +17,23 @@ PACKAGECONFIG ??= "blank" PACKAGECONFIG[blank] = "" PACKAGECONFIG[nocursor] = "" +# matchbox-session seems to be the current preferred session provider +DEFAULT_SESSION ??= "matchbox-session" + do_install() { install -D -p -m0644 ${S}/emptty.conf.in ${D}${sysconfdir}/emptty/conf - install -D -p -m0644 ${S}/default.desktop ${D}${datadir}/xsessions/default.desktop BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}" NO_CURSOR_ARG="${@bb.utils.contains('PACKAGECONFIG', 'nocursor', '-nocursor', '', d)}" sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/emptty/conf sed -i "s:@BLANK_ARGS@:${BLANK_ARGS}:" ${D}${sysconfdir}/emptty/conf + sed -i "s:@DEFAULT_SESSION@:${DEFAULT_SESSION}:" ${D}${sysconfdir}/emptty/conf install -D -m 0644 ${S}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf } FILES:${PN} = "${sysconfdir}/emptty/conf \ - ${datadir}/xsessions/default.desktop \ ${sysconfdir}/dbus-1/system.d/system-xuser.conf" USERADD_PACKAGES = "${PN}"