bt-pan daemon for bluetooth pan

1 files changed, 26 insertions, 8 deletions

diff --git a/recipes-connectivity/bluez/bluez5.inc b/recipes-connectivity/bluez/bluez5.inc
index c1fed4e..b7ca007 100644
--- a/recipes-connectivity/bluez/bluez5.inc
+++ b/recipes-connectivity/bluez/bluez5.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Linux Bluetooth Stack Userland V5"
-PR = "m1"
+PR = "m2"
 DESCRIPTION = "Linux Bluetooth stack V5 userland components.  These include a system configurations, daemons, tools and system libraries."
 HOMEPAGE = "http://www.bluez.org"
 SECTION = "libs"
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
                     file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e"
 DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
+RDEPENDS_${PN}-pand += "bash"
+DEPENDS_${PN}-pand += "python-dbus python-logging python-syslog"
 PROVIDES += "bluez-hcidump"
 RPROVIDES_${PN} += "bluez-hcidump"
 
@@ -25,7 +27,10 @@ SRC_URI = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
     file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
     file://default \
-    file://CVE-2017-1000250.patch \
+    file://main.conf \
+    file://bt-pan/init \
+    file://bt-pan/default \
+    file://bt-pan/bt-pan \
 "
 S = "${WORKDIR}/bluez-${PV}"
 
@@ -51,10 +56,14 @@ NOINST_TOOLS = " \
     ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \
 "
 
+DBTEXEC = "${D}${libexecdir}/bluetooth/"
+
 do_install_append() {
 	install -d ${D}${INIT_D_DIR}
 	install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
-
+	install -m 0755 ${WORKDIR}/bt-pan/init ${D}${INIT_D_DIR}/bt-pan
+	install -d ${DBTEXEC}
+	install -m 0755 ${WORKDIR}/bt-pan/bt-pan ${DBTEXEC}
 
 	install -d ${D}${sysconfdir}/bluetooth/
 	if [ -f ${S}/profiles/audio/audio.conf ]; then
@@ -67,9 +76,9 @@ do_install_append() {
 	    install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
 	fi
 
-  if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
-    sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
-  fi
+        if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
+            sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
+        fi
 
 	# Install desired tools that upstream leaves in build area
         for f in ${NOINST_TOOLS} ; do
@@ -82,13 +91,16 @@ do_install_append() {
         
         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}/main.conf ${D}${sysconfdir}/bluetooth/
 }
 
 ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
+PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools ${PN}-pand"
 
 FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
 FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1"
+CONFFILES_${PN} += "${sysconfdir}/default/bluetooth ${sysconfdir}/bluetooth/main.conf ${sysconfdir}/bluetooth/input.conf ${sysconfdir}/bluetooth/network.conf"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
   ${libdir}/alsa-lib/*.la \
@@ -98,6 +110,9 @@ FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
                     ${exec_prefix}/lib/systemd/user/obex.service \
                     ${datadir}/dbus-1/services/org.bluez.obex.service \
                    "
+
+FILES_${PN}-pand = "${libexecdir}/bluetooth/bluetooth/bt-pan ${sysconfdir}/default/bt-pan ${sysconfdir}/init.d/bt-pan"
+CONFFILES_${PN}-pand = "${sysconfdir}/default/bt-pan"
 SYSTEMD_SERVICE_${PN}-obex = "obex.service"
 
 FILES_${PN}-testtools = "${libdir}/bluez/test/*"
@@ -115,8 +130,11 @@ FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TO
 RDEPENDS_${PN}-testtools += "python3 python3-dbus python3-pygobject"
 
 SYSTEMD_SERVICE_${PN} = "bluetooth.service"
-INITSCRIPT_PACKAGES = "${PN}"
+INITSCRIPT_PACKAGES = "${PN} ${PN}-pand"
 INITSCRIPT_NAME_${PN} = "bluetooth"
+INITSCRIPT_NAME_${PN}-pand = "bt-pan"
+INITSCRIPT_PARAMS_${PN} = "defaults 20 20"
+INITSCRIPT_PARAMS_${PN}-pand = "defaults 22 22"
 
 EXCLUDE_FROM_WORLD = "1"