bluez5: add patch to modify bluetooth.service's properties

These changes are needed in order to achieve a behavior similar to our
bluetooth initscripts'.

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

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2019-02-07 15:33:38 +01:00
parent ae1dfa5901
commit d0b99c14fc
4 changed files with 76 additions and 0 deletions

View File

@ -0,0 +1,37 @@
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Thu, 7 Feb 2019 13:15:43 +0100
Subject: [PATCH] bluetooth.service: add Digi customizations
These changes include:
* Adding the bluetooth-init service as a dependency
* Changing the path condition so the service only starts on bluetooth-capable
boards
* Changing the service's target so it starts on boot
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
src/bluetooth.service.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
index f799f65..ced1055 100644
--- a/src/bluetooth.service.in
+++ b/src/bluetooth.service.in
@@ -1,7 +1,9 @@
[Unit]
Description=Bluetooth service
Documentation=man:bluetoothd(8)
-ConditionPathIsDirectory=/sys/class/bluetooth
+ConditionPathIsDirectory=/proc/device-tree/bluetooth
+Requires=bluetooth-init.service
+After=bluetooth-init.service
[Service]
Type=dbus
@@ -16,5 +18,5 @@ ProtectHome=true
ProtectSystem=full
[Install]
-WantedBy=bluetooth.target
+WantedBy=multi-user.target
Alias=dbus-org.bluez.service

View File

@ -0,0 +1,37 @@
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Thu, 7 Feb 2019 13:15:43 +0100
Subject: [PATCH] bluetooth.service: add Digi customizations
These changes include:
* Adding the bluetooth-init service as a dependency
* Changing the path condition so the service only starts on bluetooth-capable
boards
* Changing the service's target so it starts on boot
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
src/bluetooth.service.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
index f799f65..ced1055 100644
--- a/src/bluetooth.service.in
+++ b/src/bluetooth.service.in
@@ -1,7 +1,9 @@
[Unit]
Description=Bluetooth service
Documentation=man:bluetoothd(8)
-ConditionPathIsDirectory=/sys/class/bluetooth
+ConditionPathIsDirectory=/proc/device-tree/bluetooth
+Requires=bluetooth-init.service
+After=bluetooth-init.service
[Service]
Type=dbus
@@ -16,5 +18,5 @@ ProtectHome=true
ProtectSystem=full
[Install]
-WantedBy=bluetooth.target
+WantedBy=multi-user.target
Alias=dbus-org.bluez.service

View File

@ -5,6 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
SRC_URI += " \ SRC_URI += " \
file://bluetooth-init \ file://bluetooth-init \
file://bluetooth-init.service \ file://bluetooth-init.service \
file://bluetooth.service-add-customizations.patch \
file://main.conf \ file://main.conf \
file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \ file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \
file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \ file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \

View File

@ -5,6 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
SRC_URI += " \ SRC_URI += " \
file://bluetooth-init \ file://bluetooth-init \
file://bluetooth-init.service \ file://bluetooth-init.service \
file://bluetooth.service-add-customizations.patch \
file://main.conf \ file://main.conf \
file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \ file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \
file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \ file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \