matchbox-wm: Remove x-session-manager handling

Windows manager should be independent on session manager, especially when we
have multiple session manager like mini-x and matchbox session.

This commit remove session-manager stuff in matchbox-wm, as matchbox-session
already has duplicated code. Also adjust alternative priority for mini-X to
make it higher priority over matchbox-session.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
index 84b966a743a1eb3dcc74f89cd58df16a0318c6d4..26283266ae3fe348723832b3bc310ead7cdde8c9 100644 (file)
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
@@ -2,7 +2,7 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPLv2.0+"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
            file://configure_fix.patch \
@@ -11,7 +11,7 @@ SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/match
 
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
-inherit autotools pkgconfig update-alternatives
+inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/* \
               ${datadir}/matchbox \
@@ -20,11 +20,6 @@ FILES_${PN} = "${bindir}/* \
               ${datadir}/themes/Default/matchbox \
               ${datadir}/themes/MBOpus/matchbox"
 
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "10"
-
 EXTRA_OECONF = " --enable-startup-notification \
                  --disable-xrm \
                  --enable-expat \

diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
index 5550dc2b89c9fa3c52d9eb7ad4c3da7e7f560948..ef9cf761f7e2f703a8f99d1d3d962f22bf425b70 100644 (file)
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification ex
 
 SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3"
 PV = "1.2+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
            file://configure_fix.patch;maxrev=1818 \
@@ -20,12 +20,7 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig update-alternatives
-
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "10"
+inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/* \
                ${datadir}/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 3818d16a3dabebdd3a46dde53c557f693801d4db..981865090b34902e1022a53243ef18f0d852b6ce 100644 (file)
--- 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
@@ -16,7 +16,7 @@ inherit update-alternatives
 ALTERNATIVE_NAME = "x-session-manager"
 ALTERNATIVE_LINK = "${bindir}/x-session-manager"
 ALTERNATIVE_PATH = "${bindir}/mini-x-session"
-ALTERNATIVE_PRIORITY = "10"
+ALTERNATIVE_PRIORITY = "50"
 
 do_install() {
        install -d ${D}/${bindir}