From da2f6a60fe6b06ebffe92c3d99564711071981c9 Mon Sep 17 00:00:00 2001
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Date: Thu, 8 Dec 2011 17:34:02 +0800
Subject: 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]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'meta')
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index cdc7a3502..9d327fce8 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"
DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
-PR = "r2"
+PR = "r3"
inherit gnomebase
@@ -37,7 +37,9 @@ do_install_append() {
rm ${D}${libdir}/gio/*/*.*a
}
-RDEPENDS_${PN} += "dbus-x11"
+# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
+RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
+
FILES_${PN} += "${libdir}/GConf/* \
${libdir}/gio/*/*.so \
${datadir}/polkit* \
--
cgit v1.2.3