mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 16:27:27 +00:00
Code Issues Projects Releases Wiki Activity

openbox: Improve handling of openbox-session / gnome-openbox-session

Browse Source 
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 <schnitzeltony@googlemail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Tom Rini
2018-03-06 17:58:47 -05:00
committed by Armin Kuster
parent 806cad5df9
commit 4598769a96
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
+5 -2
View File
@@ -16,9 +16,11 @@ inherit autotools gettext update-alternatives pkgconfig distro_features_check
# depends on virtual/libx11 # depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11" 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_TARGET[x-window-manager] = "${bindir}/openbox"
ALTERNATIVE_PRIORITY[x-window-manager] = "10" ALTERNATIVE_PRIORITY[x-window-manager] = "10"
ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/openbox-session"
ALTERNATIVE_PRIORITY[x-session-manager] = "100"
PACKAGECONFIG ??= "" PACKAGECONFIG ??= ""
PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2"
@@ -38,7 +40,7 @@ python populate_packages_prepend() {
} }
RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks" 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/ \ FILES_${PN}-lxde += "${datadir}/lxde/ \
${datadir}/lxpanel \ ${datadir}/lxpanel \
@@ -46,6 +48,7 @@ FILES_${PN}-lxde += "${datadir}/lxde/ \
${datadir}/icons" ${datadir}/icons"
FILES_${PN}-gnome += " \ FILES_${PN}-gnome += " \
${bindir}/openbox-gnome-session \
${datadir}/gnome \ ${datadir}/gnome \
${datadir}/gnome-session \ ${datadir}/gnome-session \
" "