diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-05-31 10:27:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-01 18:34:36 +0100 |
commit | 01cfae0d8adf45c62ab5ea6a8b62580258d7bbf6 (patch) | |
tree | c894efecdd94e58a44ae055ed185716957b64be8 /meta/recipes-core/dbus/dbus.inc | |
parent | 817a98d74aef5726799af6ba78814dd633ebd699 (diff) | |
download | poky-01cfae0d8adf45c62ab5ea6a8b62580258d7bbf6.tar.gz |
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 <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus/dbus.inc')
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 4 |
1 files changed, 4 insertions, 0 deletions
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() { | |||
89 | 89 | ||
90 | install -d ${D}${sysconfdir}/init.d | 90 | install -d ${D}${sysconfdir}/init.d |
91 | install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 | 91 | install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 |
92 | |||
93 | # disable dbus-1 sysv script on systemd installs | ||
94 | # nearly all distros call the initscript plain 'dbus', but OE-core is different | ||
95 | ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service | ||
92 | } | 96 | } |
93 | 97 | ||
94 | do_install_virtclass-native() { | 98 | do_install_virtclass-native() { |