diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2012-01-04 22:30:51 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-05 22:19:22 +0000 |
commit | c226ccb90624c6234c2a37a7d2c1adfeb2e98f51 (patch) | |
tree | aa0c29b35749d0d3519f74bf870c8f1d4bf1f219 /meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb | |
parent | 198f2ac06e60245750a2c6561b8c8e2eaa93f6be (diff) | |
download | poky-c226ccb90624c6234c2a37a7d2c1adfeb2e98f51.tar.gz |
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.
(From OE-Core rev: c3400040fdce8c049b51a8acb06eb2e92f9426d1)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb')
-rw-r--r-- | meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb index 5550dc2b89..ef9cf761f7 100644 --- 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 | |||
12 | 12 | ||
13 | SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3" | 13 | SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3" |
14 | PV = "1.2+git${SRCPV}" | 14 | PV = "1.2+git${SRCPV}" |
15 | PR = "r0" | 15 | PR = "r1" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \ | 17 | SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \ |
18 | file://configure_fix.patch;maxrev=1818 \ | 18 | file://configure_fix.patch;maxrev=1818 \ |
@@ -20,12 +20,7 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \ | |||
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | inherit autotools pkgconfig update-alternatives | 23 | inherit autotools pkgconfig |
24 | |||
25 | ALTERNATIVE_NAME = "x-session-manager" | ||
26 | ALTERNATIVE_LINK = "${bindir}/x-session-manager" | ||
27 | ALTERNATIVE_PATH = "${bindir}/matchbox-session" | ||
28 | ALTERNATIVE_PRIORITY = "10" | ||
29 | 24 | ||
30 | FILES_${PN} = "${bindir}/* \ | 25 | FILES_${PN} = "${bindir}/* \ |
31 | ${datadir}/matchbox \ | 26 | ${datadir}/matchbox \ |