From: Koen Kooi <koen@openembedded.org>
Date: Wed, 19 Sep 2007 07:59:01 +0000 (+0000)
Subject: bluez: fix problems with CONFFILES, rfcomm.conf goes into -compat
X-Git-Tag: Release-2010-05/1~8625^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fd31ec742200fbd289817eea89af27a7907b374;p=openembedded.git

bluez: fix problems with CONFFILES, rfcomm.conf goes into -compat
---

diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc
index ddf90a2248..8f787292ba 100644
--- a/packages/bluez/bluez-utils3.inc
+++ b/packages/bluez/bluez-utils3.inc
@@ -76,6 +76,7 @@ do_install_append() {
 	rmdir ${D}${bindir} ${D}${sbindir}
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
+        install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/
         install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/
 }
 
@@ -86,14 +87,6 @@ INITSCRIPT_PARAMS = "defaults 23 19"
 
 PACKAGES =+ "${PN}-compat"
 
-CONFFILES_${PN} = " \
-                   ${sysconfdir}/bluetooth/hcid.conf \
-                   ${sysconfdir}/default/bluetooth \
-                  "
-
-CONFFILES_${PN}-compat = " \
-                          ${sysconfdir}/bluetooth/rfcomm.conf \
-			 " 
 
 FILES_${PN} = " \
                ${base_sbindir}/hcid \
diff --git a/packages/bluez/bluez-utils_3.18.bb b/packages/bluez/bluez-utils_3.18.bb
index c0a4f460ba..48f147aa69 100644
--- a/packages/bluez/bluez-utils_3.18.bb
+++ b/packages/bluez/bluez-utils_3.18.bb
@@ -18,6 +18,12 @@ EXTRA_OECONF = " \
 		 --enable-test \
 		" 
 
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+                         "
 
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
-	${sysconfdir}/default/bluetooth"
\ No newline at end of file
diff --git a/packages/bluez/bluez-utils_3.19.bb b/packages/bluez/bluez-utils_3.19.bb
index c0a4f460ba..48f147aa69 100644
--- a/packages/bluez/bluez-utils_3.19.bb
+++ b/packages/bluez/bluez-utils_3.19.bb
@@ -18,6 +18,12 @@ EXTRA_OECONF = " \
 		 --enable-test \
 		" 
 
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+                         "
 
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
-	${sysconfdir}/default/bluetooth"
\ No newline at end of file