summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-02-17 17:53:09 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-19 16:47:36 (GMT)
commit0f8d6f8143ebad040550b0c97671eb3e1a5c4b9b (patch)
tree7fc7e7782b33dc2d5f8e1adc011742e205b7f907
parent1dc9e9c3c5d841502ff4b2e42832c201e58d7ebf (diff)
downloadpoky-0f8d6f8143ebad040550b0c97671eb3e1a5c4b9b.tar.gz
dbus: Drop x11 support from nativesdk
This avoid a libx11 dependency for nativesdk as it is not intended to be run in the toolchain. We also remove the dbus-launch as without x11 support it might case trouble for user (From OE-Core rev: 2dcb6bf9205a5b2144ccb7f2912bf3e13211ae88) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 292ab29..4897fd3 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
8X11DEPENDS = "virtual/libx11 libsm" 8X11DEPENDS = "virtual/libx11 libsm"
9DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 9DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
10DEPENDS_class-native = "expat-native virtual/libintl-native" 10DEPENDS_class-native = "expat-native virtual/libintl-native"
11DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" 11DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl"
12RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}" 12RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}"
13RDEPENDS_class-native = "" 13RDEPENDS_class-native = ""
14 14
15INC_PR = "r5" 15INC_PR = "r6"
16 16
17SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 17SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
18 file://tmpdir.patch; \ 18 file://tmpdir.patch; \
@@ -126,5 +126,9 @@ do_install_class-native() {
126 126
127do_install_class-nativesdk() { 127do_install_class-nativesdk() {
128 autotools_do_install 128 autotools_do_install
129
130 # dbus-launch has no X support so lets not install it in case the host
131 # has a more featured and useful version
132 rm -f ${D}${bindir}/dbus-launch
129} 133}
130BBCLASSEXTEND = "native nativesdk" 134BBCLASSEXTEND = "native nativesdk"