summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 16:47:05 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:18:40 +0100
commitc54ae0c71580ae363569fdbcb4d096cc6ea405ed (patch)
treea32f058197f326ab76453fa8170d2ac8c2363ab3
parent443473a88dd94a5fe0d6bc7a5d14d45ea5bbdec5 (diff)
downloadopenembedded-core-c54ae0c71580ae363569fdbcb4d096cc6ea405ed.tar.gz
openembedded-core-c54ae0c71580ae363569fdbcb4d096cc6ea405ed.tar.bz2
openembedded-core-c54ae0c71580ae363569fdbcb4d096cc6ea405ed.zip
mutter: cleanup update-alternatives deprecated code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-graphics/mutter/mutter.inc5
-rw-r--r--meta/recipes-graphics/mutter/mutter_2.29.1.bb2
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index 4b73d97b53..27cf4130ec 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -5,9 +5,8 @@ DEPENDS = "startup-notification gtk+ gconf clutter-1.8 gdk-pixbuf-native intltoo
# gobject-introspection
inherit gnome update-alternatives
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/mutter"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/mutter"
ALTERNATIVE_PRIORITY = "11"
EXTRA_OECONF += "--disable-verbose \
diff --git a/meta/recipes-graphics/mutter/mutter_2.29.1.bb b/meta/recipes-graphics/mutter/mutter_2.29.1.bb
index 5d031f673c..aefd2c7f5a 100644
--- a/meta/recipes-graphics/mutter/mutter_2.29.1.bb
+++ b/meta/recipes-graphics/mutter/mutter_2.29.1.bb
@@ -1,6 +1,6 @@
require mutter.inc
-PR = "r0"
+PR = "r1"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"