From 01cfae0d8adf45c62ab5ea6a8b62580258d7bbf6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 May 2011 10:27:59 +0200 Subject: 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. (From OE-Core rev: 42ee84c9a8be494943488ebb0bf2048f3abd7abc) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus.inc | 4 ++++ meta/recipes-core/dbus/dbus_1.4.1.bb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/dbus') diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 22514e9e00..fb2f6d49bd 100644 --- 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 f65ef35b90..252d160b8a 100644 --- 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" -- cgit v1.2.3-54-g00ecf