[oe-commits] org.oe.dev bluez: fix problems with CONFFILES, rfcomm.conf goes into -compat

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b37f72d1478531633d3d67b32766318f3904017a
ViewMTN: http://monotone.openembedded.org/revision/info/b37f72d1478531633d3d67b32766318f3904017a
Files:
1
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.18.bb
packages/bluez/bluez-utils_3.19.bb
Diffs:

#
# mt diff -r994032a8e47f2490d414cd449885b6d0c16271f6 -rb37f72d1478531633d3d67b32766318f3904017a
#
# 
# 
# patch "packages/bluez/bluez-utils3.inc"
#  from [4cf020b7c86ff55af20fb6a730f55fb32a810135]
#    to [57a5ef74c55de81a92629f96194e3390e75484af]
# 
# patch "packages/bluez/bluez-utils_3.18.bb"
#  from [6eab1b4ae54ca017408988788320c718efedc784]
#    to [585b498ec4a54ca79531aca3aabb3569a3dd6476]
# 
# patch "packages/bluez/bluez-utils_3.19.bb"
#  from [6eab1b4ae54ca017408988788320c718efedc784]
#    to [585b498ec4a54ca79531aca3aabb3569a3dd6476]
# 
============================================================
--- packages/bluez/bluez-utils3.inc	4cf020b7c86ff55af20fb6a730f55fb32a810135
+++ packages/bluez/bluez-utils3.inc	57a5ef74c55de81a92629f96194e3390e75484af
@@ -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,15 +87,7 @@ PACKAGES =+ "${PN}-compat"
 
 PACKAGES =+ "${PN}-compat"
 
-CONFFILES_${PN} = " \
-                   ${sysconfdir}/bluetooth/hcid.conf \
-                   ${sysconfdir}/default/bluetooth \
-                  "
 
-CONFFILES_${PN}-compat = " \
-                          ${sysconfdir}/bluetooth/rfcomm.conf \
-			 " 
-
 FILES_${PN} = " \
                ${base_sbindir}/hcid \
                ${libdir}/bluetooth \
============================================================
--- packages/bluez/bluez-utils_3.18.bb	6eab1b4ae54ca017408988788320c718efedc784
+++ packages/bluez/bluez-utils_3.18.bb	585b498ec4a54ca79531aca3aabb3569a3dd6476
@@ -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"
============================================================
--- packages/bluez/bluez-utils_3.19.bb	6eab1b4ae54ca017408988788320c718efedc784
+++ packages/bluez/bluez-utils_3.19.bb	585b498ec4a54ca79531aca3aabb3569a3dd6476
@@ -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"