From 4598769a96980b756b3489ac71ed46a075cfabd7 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 6 Mar 2018 17:58:47 -0500 Subject: openbox: Improve handling of openbox-session / gnome-openbox-session MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without providing an alternative for x-session-manager we cannot drop openbox into the standard x11 images and have openbox take over as the session manager. Add openbox-session to ${PN}-core as well as an ALTERNATIVE line for it. Set the priority based on how other session managers do this. As we also have openbox-gnome-session move this from the full package and in to ${PN}-gnome. Cc: Andreas Müller Signed-off-by: Tom Rini Signed-off-by: Armin Kuster --- meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 b354ae7a1b..c35a0c7238 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -16,9 +16,11 @@ inherit autotools gettext update-alternatives pkgconfig distro_features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -ALTERNATIVE_${PN}-core = "x-window-manager" +ALTERNATIVE_${PN}-core = "x-window-manager x-session-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" @@ -38,7 +40,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks" -FILES_${PN}-core = "${bindir}/openbox ${libdir}/*${SOLIBS}" +FILES_${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" FILES_${PN}-lxde += "${datadir}/lxde/ \ ${datadir}/lxpanel \ @@ -46,6 +48,7 @@ FILES_${PN}-lxde += "${datadir}/lxde/ \ ${datadir}/icons" FILES_${PN}-gnome += " \ + ${bindir}/openbox-gnome-session \ ${datadir}/gnome \ ${datadir}/gnome-session \ " -- cgit 1.2.3-korg