summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-05-31 08:27:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-01 17:34:36 (GMT)
commit01cfae0d8adf45c62ab5ea6a8b62580258d7bbf6 (patch)
treec894efecdd94e58a44ae055ed185716957b64be8 /meta
parent817a98d74aef5726799af6ba78814dd633ebd699 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/dbus/dbus.inc4
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.1.bb2
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 22514e9..fb2f6d4 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
94do_install_virtclass-native() { 98do_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 f65ef35..252d160 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 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac" 5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd" 6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"