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>

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a97c028e6bdeb2700b2b837bb81e31f081fb52c..4c7d87a91df31aca36378c950a13a0df1643a5b1 100644 (file)
--- 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 ada53c9a213047b1f16135861e7061bcecd5f65c..9324af7f0ace982622753f0fa08f5b020441ec22 100644 (file)
--- 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"