From: Randolph Sapp <[email protected]>

The x-session-manager alternative link has been removed. Instead a
distro should choose what the default session is by using the
DEFAULT_SESSION variable of xserver-nodm-init.

If the default session cannot be found the user will be presented with a
menu to pick the session themselves. This relies on the xsessions
desktop entries.

Add a an xsessions entry for the openbox-session.

Signed-off-by: Randolph Sapp <[email protected]>
---
 .../openbox/files/openbox.desktop                 |  6 ++++++
 meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/openbox/files/openbox.desktop

diff --git a/meta-oe/recipes-graphics/openbox/files/openbox.desktop 
b/meta-oe/recipes-graphics/openbox/files/openbox.desktop
new file mode 100644
index 0000000000..62d1d85b43
--- /dev/null
+++ b/meta-oe/recipes-graphics/openbox/files/openbox.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Openbox Session
+Comment=Very simple session manager for Openbox
+Type=Application
+Exec=openbox-session
+DesktopNames=Openbox
diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb 
b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
index 5b62b9b2a7..5dfe0eec5c 100644
--- a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
+++ b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
@@ -9,6 +9,7 @@ SRC_URI = " \
     file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \
     file://0001-openbox-xdg-autostart-convert-to-python3.patch \
     file://0001-Fix-list-traversal-issue-in-client_calc_layer.patch \
+    file://openbox.desktop \
 "
 
 SRC_URI[sha256sum] = 
"8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7"
@@ -20,11 +21,9 @@ inherit autotools gettext update-alternatives pkgconfig 
features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-ALTERNATIVE:${PN}-core = "x-window-manager x-session-manager"
+ALTERNATIVE:${PN}-core = "x-window-manager"
 ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox"
 ALTERNATIVE_PRIORITY[x-window-manager] = "10"
-ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/openbox-session"
-ALTERNATIVE_PRIORITY[x-session-manager] = "100"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2"
@@ -43,7 +42,15 @@ python populate_packages:prepend() {
     do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', 
extra_depends='', allow_dirs=True)
 }
 
-FILES:${PN}-core = "${bindir}/openbox ${bindir}/openbox-session 
${libdir}/*${SOLIBS}"
+do_install:append() {
+    install -d "${D}${datadir}/xsessions"
+    install -m 0644 "${UNPACKDIR}/openbox.desktop" "${D}${datadir}/xsessions"
+}
+
+FILES:${PN}-core = "${bindir}/openbox \
+                    ${bindir}/openbox-session \
+                    ${datadir}/xsessions/openbox.desktop \
+                    ${libdir}/*${SOLIBS}"
 
 FILES:${PN}-lxde += "${datadir}/lxde/ \
                      ${datadir}/lxpanel \
-- 
2.53.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#125042): 
https://lists.openembedded.org/g/openembedded-devel/message/125042
Mute This Topic: https://lists.openembedded.org/mt/118250070/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to