diff options
author | Tom Rini <trini@konsulko.com> | 2018-03-06 17:58:47 -0500 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-16 19:27:54 -0700 |
commit | 4598769a96980b756b3489ac71ed46a075cfabd7 (patch) | |
tree | ecdae6f7a618de786a3bd9a62ddfcc1ccb73ad3a /meta-oe/recipes-graphics | |
parent | 806cad5df9482899ad11c5402748fb12569748ec (diff) | |
download | meta-openembedded-4598769a96980b756b3489ac71ed46a075cfabd7.tar.gz |
openbox: Improve handling of openbox-session / gnome-openbox-session
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>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | 7 |
1 files 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 b354ae7a1..c35a0c723 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 | |||
16 | # depends on virtual/libx11 | 16 | # depends on virtual/libx11 |
17 | REQUIRED_DISTRO_FEATURES = "x11" | 17 | REQUIRED_DISTRO_FEATURES = "x11" |
18 | 18 | ||
19 | ALTERNATIVE_${PN}-core = "x-window-manager" | 19 | ALTERNATIVE_${PN}-core = "x-window-manager x-session-manager" |
20 | ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox" | 20 | ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox" |
21 | ALTERNATIVE_PRIORITY[x-window-manager] = "10" | 21 | ALTERNATIVE_PRIORITY[x-window-manager] = "10" |
22 | ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/openbox-session" | ||
23 | ALTERNATIVE_PRIORITY[x-session-manager] = "100" | ||
22 | 24 | ||
23 | PACKAGECONFIG ??= "" | 25 | PACKAGECONFIG ??= "" |
24 | PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" | 26 | PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" |
@@ -38,7 +40,7 @@ python populate_packages_prepend() { | |||
38 | } | 40 | } |
39 | 41 | ||
40 | RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks" | 42 | RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks" |
41 | FILES_${PN}-core = "${bindir}/openbox ${libdir}/*${SOLIBS}" | 43 | FILES_${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" |
42 | 44 | ||
43 | FILES_${PN}-lxde += "${datadir}/lxde/ \ | 45 | FILES_${PN}-lxde += "${datadir}/lxde/ \ |
44 | ${datadir}/lxpanel \ | 46 | ${datadir}/lxpanel \ |
@@ -46,6 +48,7 @@ FILES_${PN}-lxde += "${datadir}/lxde/ \ | |||
46 | ${datadir}/icons" | 48 | ${datadir}/icons" |
47 | 49 | ||
48 | FILES_${PN}-gnome += " \ | 50 | FILES_${PN}-gnome += " \ |
51 | ${bindir}/openbox-gnome-session \ | ||
49 | ${datadir}/gnome \ | 52 | ${datadir}/gnome \ |
50 | ${datadir}/gnome-session \ | 53 | ${datadir}/gnome-session \ |
51 | " | 54 | " |