diff options
author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-12-08 17:33:59 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-08 22:15:43 +0000 |
commit | 8de191d64aa7fa3a6c3e3fde2acca5949f36c95e (patch) | |
tree | 9809d7c1df9171e6ddecd561db631b20ca0716bb | |
parent | 30301333f8277228ad4d9213cb801a8ac75f6373 (diff) | |
download | poky-8de191d64aa7fa3a6c3e3fde2acca5949f36c95e.tar.gz |
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 <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/qemu-config/qemu-config.bb | 4 |
1 files 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 | |||
5 | 5 | ||
6 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" | 6 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" |
7 | 7 | ||
8 | PR = "r22" | 8 | PR = "r23" |
9 | 9 | ||
10 | SRC_URI = "file://distcc.sh \ | 10 | SRC_URI = "file://distcc.sh \ |
11 | file://anjuta-remote-run \ | 11 | file://anjuta-remote-run \ |
@@ -37,7 +37,7 @@ pkg_postinst_${PN} () { | |||
37 | sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' | 37 | sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' |
38 | } | 38 | } |
39 | 39 | ||
40 | RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash" | 40 | RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} task-core-nfs-server oprofileui-server rsync bash" |
41 | 41 | ||
42 | inherit update-rc.d allarch | 42 | inherit update-rc.d allarch |
43 | 43 | ||