From 54bf7a00596146c2611766b3e72af882233d487c Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 8 Mar 2017 18:58:49 +0100
Subject: [PATCH] meta-digi-dey: fix bluetooth interface initialization

With the upgrade to Morty, there is a new bootscript that is provided
by Poky. This bootscript is just launching the generic bluetooth daemon,
but it's not doing any hardware initialization.

The fix is to split the hardware initialization to a different
bootscript 'bluetooth-init' and launch it also on boot.

https://jira.digi.com/browse/DEL-3855

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../bluez/bluez5-5.41/{bluez-init => bluetooth-init} |  9 ++-------
 .../recipes-connectivity/bluez/bluez5_5.41.bbappend  | 12 ++++++++----
 .../packagegroups/packagegroup-dey-bluetooth.bb      | 11 +++++++----
 3 files changed, 17 insertions(+), 15 deletions(-)
 rename meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/{bluez-init => bluetooth-init} (96%)
 mode change 100755 => 100644

diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluez-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluetooth-init
old mode 100755
new mode 100644
similarity index 96%
rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluez-init
rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluetooth-init
index 96cf5a697..a2f2443bd
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluez-init
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluetooth-init
@@ -1,9 +1,7 @@
 #!/bin/sh
 #===============================================================================
 #
-#  bluez
-#
-#  Copyright (C) 2012-2014 by Digi International Inc.
+#  Copyright (C) 2012-2017 by Digi International Inc.
 #  All rights reserved.
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -11,7 +9,7 @@
 #  the Free Software Foundation.
 #
 #
-#  !Description: Configure Bluetooth
+#  !Description: Initialize bluetooth hardware
 #
 #===============================================================================
 
@@ -176,6 +174,3 @@ if [ -d "/proc/device-tree/bluetooth" ]; then
 		bt_init_ar3k
 	fi
 fi
-
-echo "Starting bluetooth services."
-start-stop-daemon -S --background --exec /usr/lib/bluez5/bluetooth/bluetoothd
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
index 289cb66b7..6c249511f 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
@@ -3,7 +3,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
 
 SRC_URI += " \
-    file://bluez-init \
+    file://bluetooth-init \
     file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \
     file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \
 "
@@ -37,10 +37,14 @@ PACKAGECONFIG_append = " experimental"
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/bluez-init ${D}${sysconfdir}/init.d/bluez
+	install -m 0755 ${WORKDIR}/bluetooth-init ${D}${sysconfdir}/init.d/bluetooth-init
 }
 
-INITSCRIPT_NAME = "bluez"
-INITSCRIPT_PARAMS = "start 10 5 ."
+PACKAGES =+ "${PN}-init"
+
+FILES_${PN}-init = "${sysconfdir}/init.d/bluetooth-init"
+
+INITSCRIPT_PACKAGES += "${PN}-init"
+INITSCRIPT_NAME_${PN}-init = "bluetooth-init"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb
index e07386caf..a6d140c23 100644
--- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb
+++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb
@@ -6,9 +6,12 @@ SUMMARY = "Bluetooth packagegroup for DEY image"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup bluetooth
 
+MACHINE_BLUETOOTH_EXTRA_INSTALL ?= "${@bb.utils.contains('BLUEZ', 'bluez5', 'bluez5-init', '', d)}"
+
 RDEPENDS_${PN} = " \
-	${BLUEZ} \
-	${BLUEZ}-testtools \
-	${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "libasound-module-bluez", "", d)} \
-	${@bb.utils.contains("BLUEZ", "bluez5", "bluez5-noinst-tools bluez5-obex", "", d)} \
+    ${BLUEZ} \
+    ${BLUEZ}-testtools \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'libasound-module-bluez', '', d)} \
+    ${@bb.utils.contains('BLUEZ', 'bluez5', 'bluez5-noinst-tools bluez5-obex', '', d)} \
+    ${MACHINE_BLUETOOTH_EXTRA_INSTALL} \
 "