Patchwork [15/19] matchbox-wm-2: use new update-alternatives

login
register
mail settings
Submitter Morgan Little
Date Aug. 1, 2012, 2:12 p.m.
Message ID <1343830340-25351-16-git-send-email-morgan.little@windriver.com>
Download mbox | patch
Permalink /patch/33559/
State New
Headers show

Comments

Morgan Little - Aug. 1, 2012, 2:12 p.m.
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
 .../matchbox-wm-2/matchbox-wm-2_git.bb             |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

 	file://fix_makefile.patch \
@@ -20,9 +20,9 @@
 inherit autotools pkgconfig update-alternatives
 # Change this to x-session-manager->matchbox-session and put in
 # matchbox-session, then change this to x-window-manager to
 # matchbox-window-manager-2.
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/matchbox-window-manager"
+ALTERNATIVE_LINK_NAME[x-window-manager] = "${bindir}/x-window-manager"
 ALTERNATIVE_PRIORITY = "10"
 
 PACKAGES =+ "libmatchbox2"

Patch

diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
index 8b162be..73dcce6 100644
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
@@ -7,7 +7,7 @@ 
 DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pa
 
 SRCREV = "01fa5465743c9ee43d040350f4405d35293e4869"
 PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;protocol=git \