diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 292ab296bc..4897fd3e57 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 \ | |||
8 | X11DEPENDS = "virtual/libx11 libsm" | 8 | X11DEPENDS = "virtual/libx11 libsm" |
9 | DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" | 9 | DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" |
10 | DEPENDS_class-native = "expat-native virtual/libintl-native" | 10 | DEPENDS_class-native = "expat-native virtual/libintl-native" |
11 | DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" | 11 | DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl" |
12 | RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}" | 12 | RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}" |
13 | RDEPENDS_class-native = "" | 13 | RDEPENDS_class-native = "" |
14 | 14 | ||
15 | INC_PR = "r5" | 15 | INC_PR = "r6" |
16 | 16 | ||
17 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | 17 | SRC_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 | ||
127 | do_install_class-nativesdk() { | 127 | do_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 | } |
130 | BBCLASSEXTEND = "native nativesdk" | 134 | BBCLASSEXTEND = "native nativesdk" |