Patchwork [1/3] dbus: remove unused initscript

login
register
mail settings
Submitter Paul Eggleton
Date Oct. 23, 2011, 3:07 p.m.
Message ID <385ddc74283a32019ca44a28c2f75404257f22d0.1319382376.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/13745/
State New, archived
Headers show

Comments

Paul Eggleton - Oct. 23, 2011, 3:07 p.m.
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>
---
 meta/recipes-core/dbus/dbus.inc       |    3 +++
 meta/recipes-core/dbus/dbus_1.4.12.bb |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index a8ecda8..339bedf 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -92,6 +92,9 @@  do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
 
+	# 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"