dbus 1.4.1: disable sysv script properly when using systemd

OE-core uses 'dbus-1' as initscript name, which no other distribution(-buildsys) does, so we have to take special measures.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 22514e9e00ac16d1446ad4a12c851bf7625fc5cb..fb2f6d49bdcea06cf71c7fccd90119ca836a4f5e 100644 (file)
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -89,6 +89,10 @@ do_install() {
 
        install -d ${D}${sysconfdir}/init.d
        install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+
+       # disable dbus-1 sysv script on systemd installs
+       # nearly all distros call the initscript plain 'dbus', but OE-core is different
+       ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
 }
 
 do_install_virtclass-native() {

diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index f65ef35b9032ea1fbf9f76d6530aefdb9fc700de..252d160b8ae0998b9ad42bea15757d7a5986e586 100644 (file)
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
@@ -1,6 +1,6 @@
 include dbus.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
 SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"