summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/dbus/dbus.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a2525676f..588209fb80 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X
10DEPENDS_virtclass-native = "expat-native virtual/libintl-native" 10DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
11DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" 11DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11"
12 12
13INC_PR = "r1" 13INC_PR = "r2"
14 14
15SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 15SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
16 file://tmpdir.patch; \ 16 file://tmpdir.patch; \
@@ -91,6 +91,9 @@ do_install() {
91 # Remove Red Hat initscript 91 # Remove Red Hat initscript
92 rm -rf ${D}${sysconfdir}/rc.d 92 rm -rf ${D}${sysconfdir}/rc.d
93 93
94 # Remove empty testexec directory as we don't build tests
95 rm -rf ${D}${libdir}/dbus-1.0/test
96
94 # disable dbus-1 sysv script on systemd installs 97 # disable dbus-1 sysv script on systemd installs
95 # nearly all distros call the initscript plain 'dbus', but OE-core is different 98 # nearly all distros call the initscript plain 'dbus', but OE-core is different
96 ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service 99 ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service