summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes-connectivity/bluez/bluez5_%.bbappend25
1 files changed, 8 insertions, 17 deletions
diff --git a/recipes-connectivity/bluez/bluez5_%.bbappend b/recipes-connectivity/bluez/bluez5_%.bbappend
index da25ee7..e5094c3 100644
--- a/recipes-connectivity/bluez/bluez5_%.bbappend
+++ b/recipes-connectivity/bluez/bluez5_%.bbappend
@@ -12,6 +12,7 @@ RDEPENDS_bluez5 += "bash"
SRC_URI += "\
file://init \
+ file://default \
file://main.conf \
file://bt-pan/init \
file://bt-pan/default \
@@ -21,7 +22,7 @@ SRC_URI += "\
file://rfcomm/default \
file://BT-Name \
"
-PACKAGES =+ "${PN}-bt-name libasound-module-bluez ${PN}-pand ${PN}-rfcomm"
+PACKAGES =+ "${PN}-mlinit ${PN}-bt-name libasound-module-bluez ${PN}-pand ${PN}-rfcomm"
DBTEXEC = "${D}${libexecdir}/bluetooth/"
@@ -33,41 +34,31 @@ do_install_append() {
install -d ${DBTEXEC}
install -m 0755 ${WORKDIR}/bt-pan/bt-pan ${DBTEXEC}
install -m 0755 ${WORKDIR}/rfcomm/rfcomm.py ${DBTEXEC}/rfcomm
- echo ls ${WORKDIR}
- ls ${WORKDIR}
- echo ls ${WORKDIR}/bt-pan
- ls ${WORKDIR}/bt-pan
install -d ${D}${sysconfdir}/default
+
+ install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/bluetooth
install -m 0644 ${WORKDIR}/bt-pan/default ${D}${sysconfdir}/default/bt-pan
install -m 0644 ${WORKDIR}/rfcomm/default ${D}${sysconfdir}/default/rfcomm
install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
install -d ${D}/usr/share/bluez5
install -m 0444 ${WORKDIR}/BT-Name ${D}/usr/share/bluez5/BT-Name.patch
- echo "Before init.d/bluetooth test"
+
if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
fi
- echo "JAK: sysconfdir is ${D}${sysconfdir}"
- set -x
- install -d ${D}${sysconfdir}/default
-
- echo ls -d ${WORKDIR}/bt-pan/default
- ls -d ${WORKDIR}/bt-pan/default
-
- install -m 0644 ${WORKDIR}/bt-pan/default ${D}${sysconfdir}/default/bt-pan
- install -m 0644 ${WORKDIR}/rfcomm/default ${D}${sysconfdir}/default/rfcomm
- install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
install -d ${D}/usr/share/bluez5
install -m 0444 ${WORKDIR}/BT-Name ${D}/usr/share/bluez5/BT-Name.patch
}
-CONFFILES_${PN} += "${sysconfdir}/default/bluetooth ${sysconfdir}/bluetooth/main.conf ${sysconfdir}/bluetooth/input.conf ${sysconfdir}/bluetooth/network.conf"
+CONFFILES_${PN} += "${sysconfdir}/bluetooth/main.conf ${sysconfdir}/bluetooth/input.conf ${sysconfdir}/bluetooth/network.conf"
FILES_${PN}-pand = "${libexecdir}/bluetooth/bt-pan ${sysconfdir}/default/bt-pan ${sysconfdir}/init.d/bt-pan"
FILES_${PN}-rfcomm = "${libexecdir}/bluetooth/rfcomm ${sysconfdir}/default/rfcomm ${sysconfdir}/init.d/rfcomm"
FILES_${PN}-bt-name = "/usr/share/bluez5/*"
+CONFFILES_${PN}-mlinit += "${sysconfdir}/default/bluetooth"
+FILES_${PN}-mlinit = "${sysconfdir}/init.d/bluetooth ${sysconfdir}/default/bluetooth"
CONFFILES_${PN}-pand = "${sysconfdir}/default/bt-pan"
CONFFILES_${PN}-rfcomm = "${sysconfdir}/default/rfcomm"