summaryrefslogtreecommitdiff
path: root/meta/recipes-core/dbus
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-10-21 14:39:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-31 22:02:40 +0000
commit48dfa47b0e65ad1207c6ae81ba495ef2e39134aa (patch)
treeb0a2fbc63a2e6ed0815c29b35d79da63aca1b58a /meta/recipes-core/dbus
parent42310761735062a3d0c6f68471790177459205a1 (diff)
downloadopenembedded-core-48dfa47b0e65ad1207c6ae81ba495ef2e39134aa.tar.gz
openembedded-core-48dfa47b0e65ad1207c6ae81ba495ef2e39134aa.tar.bz2
openembedded-core-48dfa47b0e65ad1207c6ae81ba495ef2e39134aa.tar.xz
openembedded-core-48dfa47b0e65ad1207c6ae81ba495ef2e39134aa.zip
dbus: remove unused initscript
We already install an appropriate init script to /etc/init.d, we do not need an additional one in /etc/init.d/rc.d as well. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dbus')
-rw-r--r--meta/recipes-core/dbus/dbus.inc3
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.12.bb3
2 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a97c028e..4c7d87a91 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -86,6 +86,9 @@ do_install() {
chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper
chmod 4754 ${D}${libexecdir}/dbus-daemon-launch-helper
+ # Remove Red Hat initscript
+ rm -rf ${D}${sysconfdir}/rc.d
+
# 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
diff --git a/meta/recipes-core/dbus/dbus_1.4.12.bb b/meta/recipes-core/dbus/dbus_1.4.12.bb
index ada53c9a2..9324af7f0 100644
--- a/meta/recipes-core/dbus/dbus_1.4.12.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.12.bb
@@ -1,4 +1,7 @@
include dbus.inc
+
+PR = "r1"
+
SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"