From patchwork Thu Oct 27 22:06:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED,PULL,11/18] dbus: remove unused initscript Date: Thu, 27 Oct 2011 22:06:31 -0000 From: Saul Wold X-Patchwork-Id: 13943 Message-Id: <19f2690bd7fc9b4841f53b0efc7739439693d1e2.1319753141.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Paul Eggleton 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 --- meta/recipes-core/dbus/dbus.inc | 3 +++ meta/recipes-core/dbus/dbus_1.4.12.bb | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 2a97c02..4c7d87a 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 ada53c9..9324af7 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"