From 2113fdf82bf7963d899c8bf23819c22ae1b6bc0f Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 21 Oct 2011 14:39:12 +0100 Subject: 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. (From OE-Core rev: 48dfa47b0e65ad1207c6ae81ba495ef2e39134aa) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus.inc | 3 +++ meta/recipes-core/dbus/dbus_1.4.12.bb | 3 +++ 2 files changed, 6 insertions(+) (limited to 'meta/recipes-core/dbus') diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 2a97c028e6..4c7d87a91d 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 ada53c9a21..9324af7f0a 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" -- cgit v1.2.3-54-g00ecf