Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Javier Viguera 2017-03-08 18:58:49 +01:00
parent 4b6b4ecc5f
commit 54bf7a0059
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluez-init → meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluetooth-init Executable file → Normal file
View File

@ -1,9 +1,7 @@
#!/bin/sh #!/bin/sh
#=============================================================================== #===============================================================================
# #
# bluez # Copyright (C) 2012-2017 by Digi International Inc.
#
# Copyright (C) 2012-2014 by Digi International Inc.
# All rights reserved. # All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify it # This program is free software; you can redistribute it and/or modify it
@ -11,7 +9,7 @@
# the Free Software Foundation. # 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 bt_init_ar3k
fi fi
fi fi
echo "Starting bluetooth services."
start-stop-daemon -S --background --exec /usr/lib/bluez5/bluetooth/bluetoothd

12
meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
View File

@ -3,7 +3,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
SRC_URI += " \ SRC_URI += " \
file://bluez-init \ file://bluetooth-init \
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 \
" "
@ -37,10 +37,14 @@ PACKAGECONFIG_append = " experimental"
do_install_append() { do_install_append() {
install -d ${D}${sysconfdir}/init.d/ 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" PACKAGES =+ "${PN}-init"
INITSCRIPT_PARAMS = "start 10 5 ."
FILES_${PN}-init = "${sysconfdir}/init.d/bluetooth-init"
INITSCRIPT_PACKAGES += "${PN}-init"
INITSCRIPT_NAME_${PN}-init = "bluetooth-init"
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"

11
meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb
View File

@ -6,9 +6,12 @@ SUMMARY = "Bluetooth packagegroup for DEY image"
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup bluetooth inherit packagegroup bluetooth
MACHINE_BLUETOOTH_EXTRA_INSTALL ?= "${@bb.utils.contains('BLUEZ', 'bluez5', 'bluez5-init', '', d)}"
RDEPENDS_${PN} = " \ RDEPENDS_${PN} = " \
${BLUEZ} \ ${BLUEZ} \
${BLUEZ}-testtools \ ${BLUEZ}-testtools \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "libasound-module-bluez", "", d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'libasound-module-bluez', '', d)} \
${@bb.utils.contains("BLUEZ", "bluez5", "bluez5-noinst-tools bluez5-obex", "", d)} \ ${@bb.utils.contains('BLUEZ', 'bluez5', 'bluez5-noinst-tools bluez5-obex', '', d)} \
${MACHINE_BLUETOOTH_EXTRA_INSTALL} \
" "