From c226ccb90624c6234c2a37a7d2c1adfeb2e98f51 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Wed, 4 Jan 2012 22:30:51 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb') 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 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 \ -- cgit v1.2.3-54-g00ecf