diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez4/audio.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez4/audio.conf deleted file mode 100644 index da00eec70..000000000 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez4/audio.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Configuration file for the audio service - -# This section contains options which are not specific to any -# particular interface -[General] - -# Switch to master role for incoming connections (defaults to true) -#Master=true - -# If we want to disable support for specific services -# Defaults to supporting all implemented services -#Disable=Gateway,Source,Socket -Enable=Source,Sink,Headset,Gateway,Control,Socket,Media - -# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA) -# Defaults to HCI -#SCORouting=PCM - -# Automatically connect both A2DP and HFP/HSP profiles for incoming -# connections. Some headsets that support both profiles will only connect the -# other one automatically so the default setting of true is usually a good -# idea. -#AutoConnect=true - -# Headset interface specific options (i.e. options which affect how the audio -# service interacts with remote headset devices) -[Headset] - -# Set to true to support HFP, false means only HSP is supported -# Defaults to true -HFP=true - -# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1 -MaxConnected=1 - -# Set to true to enable use of fast connectable mode (faster page scanning) -# for HFP when incoming call starts. Default settings are restored after -# call is answered or rejected. Page scan interval is much shorter and page -# scan type changed to interlaced. Such allows faster connection initiated -# by a headset. -FastConnectable=false - -# Just an example of potential config options for the other interfaces -#[A2DP] -#SBCSources=1 -#MPEG12Sources=0 diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez4/bluez-init b/meta-digi-dey/recipes-connectivity/bluez/bluez4/bluez-init deleted file mode 100755 index e2c4b9815..000000000 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez4/bluez-init +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh -#=============================================================================== -# -# bluez -# -# Copyright (C) 2015 by Digi International Inc. -# All rights reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 as published by -# the Free Software Foundation. -# -# -# !Description: Configure Bluetooth -# -#=============================================================================== - -set -e - -if [ "${1}" != "start" ]; then - exit 0 -fi - -SCRIPTNAME="$(basename "${0}")" -MACHINENAME="$(cat /proc/device-tree/digi,machine,name 2>/dev/null)" - -bt_init() { - if [ "${MACHINENAME}" = "ccimx6sbc" ]; then - BT_PWR_GPIO_NR="244" - fi - - # Use a sub-shell here to change to firmware directory - ( - cd /lib/firmware/ar3k/1020200 - - # Get MAC address from device tree or NVRAM. Use a default value it it has not been set. - if [ -f "/proc/device-tree/bluetooth/mac-address" ]; then - BTADDR="$(hexdump -ve '1/1 "%02X" ":"' /proc/device-tree/bluetooth/mac-address | sed 's/:$//g')" - else - BTADDR="$(sed -ne 's,^.*btaddr1=\([^[:blank:]]\+\)[:blank:]*.*,\1,g;T;p' /proc/cmdline)" - fi - if [ -z "${BTADDR}" ] || [ "${BTADDR}" = "00:00:00:00:00:00" ]; then - BTADDR="00:04:F3:FF:FF:BB" - fi - - # Update the MAC address file only if it has changed. - FW_MAC="ar3kbdaddr.pst" - [ -f "${FW_MAC}" ] && [ "$(cat ${FW_MAC})" = "${BTADDR}" ] || echo ${BTADDR} > ${FW_MAC} - - JPN_REGCODE="0x2" - REGCODE="$(cat /proc/device-tree/digi,hwid,cert 2>/dev/null)" - BT_CLASS_LINK="PS_ASIC.pst" - BT_CLASS_FILE="PS_ASIC_class_1.pst" - if [ -n "${REGCODE}" ] && [ "${JPN_REGCODE}" = "${REGCODE}" ]; then - BT_CLASS_FILE="PS_ASIC_class_2.pst" - fi - - # Replace the configuration file if different - if ! cmp -s ${BT_CLASS_FILE} ${BT_CLASS_LINK}; then - ln -sf ${BT_CLASS_FILE} ${BT_CLASS_LINK} - fi - # Remove not used configuration and readme files - # -- Do not quote the subcommand to avoid leading/trailing whitespace - # -- being part of the file name. - rm -f $(echo PS_ASIC_class_?.pst | sed -e "s,${BT_CLASS_FILE},,g") readme.txt - ) - - # Start the Bluetooth driver and daemon (D-BUS must already be running) - RETRIES="5" - while [ "${RETRIES}" -gt "0" ]; do - hciattach ttyBt ath3k 4000000 1>/dev/null && break - # - # If hciattach fails try to recover it by toggling the GPIO - # - BT_PWR_L="/sys/class/gpio/gpio${BT_PWR_GPIO_NR}" - [ -d "${BT_PWR_L}" ] || printf "%s" ${BT_PWR_GPIO_NR} > /sys/class/gpio/export - printf out > ${BT_PWR_L}/direction && sleep .2 - printf 0 > ${BT_PWR_L}/value && sleep .2 - printf 1 > ${BT_PWR_L}/value && sleep .2 - [ -d "${BT_PWR_L}" ] && printf "%s" ${BT_PWR_GPIO_NR} > /sys/class/gpio/unexport - RETRIES="$((RETRIES - 1))" - done - if [ "${RETRIES}" -eq "0" ]; then - echo "${SCRIPTNAME}: FAILED (hciattach)" - exit - fi - if hciconfig hci0 up; then - : # No-op - else - echo "${SCRIPTNAME}: FAILED" - exit - fi -} - -echo "Starting bluetooth services." -bluetoothd - -# Check if this hardware does support Bluetooth -[ -d "/proc/device-tree/bluetooth" ] && bt_init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez4/use-legacy-pygobject-instead-ofgobject-introspection.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez4/use-legacy-pygobject-instead-ofgobject-introspection.patch deleted file mode 100644 index bc3d2c5bb..000000000 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez4/use-legacy-pygobject-instead-ofgobject-introspection.patch +++ /dev/null @@ -1,96 +0,0 @@ -From: Javier Viguera -Date: Thu, 18 Sep 2014 17:22:23 +0200 -Subject: [PATCH] Use legacy pygobject instead of gobject introspection - -Signed-off-by: Javier Viguera ---- - test/simple-agent | 4 ++-- - test/test-device | 4 ++-- - test/test-discovery | 4 ++-- - test/test-manager | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/test/simple-agent b/test/simple-agent -index a25eaf07374b..a089cbc5a87d 100755 ---- a/test/simple-agent -+++ b/test/simple-agent -@@ -2,7 +2,7 @@ - - from __future__ import absolute_import, print_function, unicode_literals - --from gi.repository import GObject -+import gobject - - import sys - import dbus -@@ -122,7 +122,7 @@ if __name__ == '__main__': - path = "/test/agent" - agent = Agent(bus, path) - -- mainloop = GObject.MainLoop() -+ mainloop = gobject.MainLoop() - - if len(args) > 1: - if len(args) > 2: -diff --git a/test/test-device b/test/test-device -index 81a44f8ab703..32bcfbaed2dd 100755 ---- a/test/test-device -+++ b/test/test-device -@@ -2,7 +2,7 @@ - - from __future__ import absolute_import, print_function, unicode_literals - --from gi.repository import GObject -+import gobject - - import sys - import dbus -@@ -12,7 +12,7 @@ from optparse import OptionParser, make_option - - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) - bus = dbus.SystemBus() --mainloop = GObject.MainLoop() -+mainloop = gobject.MainLoop() - - manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager") - -diff --git a/test/test-discovery b/test/test-discovery -index 269c51c0d9b4..43ee072cb0c7 100755 ---- a/test/test-discovery -+++ b/test/test-discovery -@@ -2,7 +2,7 @@ - - from __future__ import absolute_import, print_function, unicode_literals - --from gi.repository import GObject -+import gobject - - import dbus - import dbus.mainloop.glib -@@ -59,5 +59,5 @@ if __name__ == '__main__': - - adapter.StartDiscovery() - -- mainloop = GObject.MainLoop() -+ mainloop = gobject.MainLoop() - mainloop.run() -diff --git a/test/test-manager b/test/test-manager -index 8a7e2f6aac1a..321adf892855 100755 ---- a/test/test-manager -+++ b/test/test-manager -@@ -2,7 +2,7 @@ - - from __future__ import absolute_import, print_function, unicode_literals - --from gi.repository import GObject -+import gobject - - import dbus - import dbus.mainloop.glib -@@ -36,5 +36,5 @@ if __name__ == "__main__": - except: - pass - -- mainloop = GObject.MainLoop() -+ mainloop = gobject.MainLoop() - mainloop.run() diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez4_%.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez4_%.bbappend deleted file mode 100644 index da5598ce5..000000000 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez4_%.bbappend +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2013 Digi International. - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -EXTRA_OECONF_append = " --enable-health --enable-static" - -# Adding '--enable-static' to the config builds static versions of -# libasound_module_ctl and libasound_module_pcm. Those files are not -# packaged, so it fails with "installed but not shipped". -# -# We do not really need those static libs so just disable the QA test -# -INSANE_SKIP_${PN} = "installed-vs-shipped" - -inherit update-rc.d - -SRC_URI += " \ - file://audio.conf \ - file://bluez-init \ -" - -do_install_append() { - install -m 0644 ${WORKDIR}/audio.conf ${D}/${sysconfdir}/bluetooth/ - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/bluez-init ${D}${sysconfdir}/init.d/bluez -} - -INITSCRIPT_NAME = "bluez" -INITSCRIPT_PARAMS = "start 10 5 ."