summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-12-08 09:34:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-08 22:15:44 (GMT)
commit12aba2fc899f730d07e70535c0eacda9c57c7f26 (patch)
tree944d7691ad897b8ec6385ed2b393b9bbdceec86d /meta/recipes-gnome
parent8de191d64aa7fa3a6c3e3fde2acca5949f36c95e (diff)
downloadpoky-12aba2fc899f730d07e70535c0eacda9c57c7f26.tar.gz
gconf: Disable dbus-x11 when x11 isn't in DISTRO_FEATURES
If x11 isn't in DISTRO_FEATURES, then an error information "no providers ..." will \ arise. I modified this bb file to disable "dbus-x11" when no x11 in DISTRO_FEATURES. [YOCTO #1674] (From OE-Core rev: da2f6a60fe6b06ebffe92c3d99564711071981c9) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index cdc7a35..9d327fc 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
6DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit" 6DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
7DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" 7DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
8 8
9PR = "r2" 9PR = "r3"
10 10
11inherit gnomebase 11inherit gnomebase
12 12
@@ -37,7 +37,9 @@ do_install_append() {
37 rm ${D}${libdir}/gio/*/*.*a 37 rm ${D}${libdir}/gio/*/*.*a
38} 38}
39 39
40RDEPENDS_${PN} += "dbus-x11" 40# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
41RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
42
41FILES_${PN} += "${libdir}/GConf/* \ 43FILES_${PN} += "${libdir}/GConf/* \
42 ${libdir}/gio/*/*.so \ 44 ${libdir}/gio/*/*.so \
43 ${datadir}/polkit* \ 45 ${datadir}/polkit* \