From 8de191d64aa7fa3a6c3e3fde2acca5949f36c95e Mon Sep 17 00:00:00 2001 From: Xiaofeng Yan Date: Thu, 8 Dec 2011 17:33:59 +0800 Subject: qemu-config: Disable dbus-x11 when no x11 in DISTRO_FEATURES dbus-x11 could be not needed by an image without x11. So I modified this bb file to enable dbus-x11 when x11 is in DISTRO_FEATURES and disable \ dbus-x11 without x11 feature. [YOCTO #1674] (From OE-Core rev: f78cb9fbc90f6e40cd20c59ba544389662d87659) Signed-off-by: Xiaofeng Yan Signed-off-by: Richard Purdie --- meta/recipes-bsp/qemu-config/qemu-config.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb index ebf957a06a..62f47008fb 100644 --- a/meta/recipes-bsp/qemu-config/qemu-config.bb +++ b/meta/recipes-bsp/qemu-config/qemu-config.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" -PR = "r22" +PR = "r23" SRC_URI = "file://distcc.sh \ file://anjuta-remote-run \ @@ -37,7 +37,7 @@ pkg_postinst_${PN} () { sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' } -RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash" +RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} task-core-nfs-server oprofileui-server rsync bash" inherit update-rc.d allarch -- cgit v1.2.3-54-g00ecf