summaryrefslogtreecommitdiffstats
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:26:31 +0100
commit1025e4ab0cba808a37a4ea218aab36851441b5b2 (patch)
tree168c466d7496e9f940be745bbc8c886d88aecd66
parent90bb29cc3162d75457ca6fd478b2a904eb2a1c78 (diff)
downloadpoky-1025e4ab0cba808a37a4ea218aab36851441b5b2.tar.gz
mutter: cleanup update-alternatives deprecated code
(From OE-Core rev: c54ae0c71580ae363569fdbcb4d096cc6ea405ed) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
5# gobject-introspection 5# gobject-introspection
6inherit gnome update-alternatives 6inherit gnome update-alternatives
7 7
8ALTERNATIVE_NAME = "x-window-manager" 8ALTERNATIVE_${PN} = "x-window-manager"
9ALTERNATIVE_LINK = "${bindir}/x-window-manager" 9ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/mutter"
10ALTERNATIVE_PATH = "${bindir}/mutter"
11ALTERNATIVE_PRIORITY = "11" 10ALTERNATIVE_PRIORITY = "11"
12 11
13EXTRA_OECONF += "--disable-verbose \ 12EXTRA_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 @@
1require mutter.inc 1require mutter.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6 6