Patchwork [2/9] gconf: Disable dbus-x11 when x11 isn't in DISTRO_FEATURES

login
register
mail settings
Submitter Xiaofeng Yan
Date Nov. 24, 2011, 3:06 a.m.
Message ID <a79efe4b5d981c64a4d394af91c7f50298740adb.1322102636.git.xiaofeng.yan@windriver.com>
Download mbox | patch
Permalink /patch/15347/
State New
Headers show

Comments

Xiaofeng Yan - Nov. 24, 2011, 3:06 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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>
---
 meta/recipes-gnome/gnome/gconf_3.2.3.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index 3d3e65f..98c23b2 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -1,8 +1,11 @@ 
 DESCRIPTION = "GNOME configuration system"
 SECTION = "x11/gnome"
 LICENSE = "LGPLv2+"
+PR = "r1"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
+
 DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
 
 inherit gnomebase
@@ -30,7 +33,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* \