[oe-commits] Tom Rini : bluez4: Move the update-rc.d bits to 4.42 only

[git version control]

Module: openembedded.git
Branch: master
Commit: e557584a06b312e19811e07fdf75d1a7f123ed91
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e557584a06b312e19811e07fdf75d1a7f123ed91

Author: Tom Rini <tom_rini at mentor.com>
Date:   Tue Apr 26 07:17:07 2011 -0700

bluez4: Move the update-rc.d bits to 4.42 only

Noted by Martin Jansa, taken from what he did in oe-core/meta-oe.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/bluez/bluez4.inc     |    5 +----
 recipes/bluez/bluez4_4.42.bb |    4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc
index d9e2636..22d3852 100644
--- a/recipes/bluez/bluez4.inc
+++ b/recipes/bluez/bluez4.inc
@@ -18,7 +18,7 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/bluez-${PV}"
 
-inherit autotools update-rc.d
+inherit autotools
 
 EXTRA_OECONF = "\
   --enable-gstreamer \
@@ -48,9 +48,6 @@ do_install_append() {
         install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
 }
 
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
 PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
 
 FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
diff --git a/recipes/bluez/bluez4_4.42.bb b/recipes/bluez/bluez4_4.42.bb
index 09c38c5..48f793e 100644
--- a/recipes/bluez/bluez4_4.42.bb
+++ b/recipes/bluez/bluez4_4.42.bb
@@ -5,6 +5,10 @@ SRC_URI += "file://sbc-thumb.patch"
 DEPENDS += "libsndfile1"
 PR = "${INC_PR}.1"
 
+inherit update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
 
 SRC_URI[md5sum] = "d24dfd3ca42847123e29f58b29af6948"
 SRC_URI[sha256sum] = "ed7631a6d22b456eb26b881bdbe46ea47f93d2f192da420408bad4bbc245f796"