bluez: update bbappend and patches to version 5.65
Poky just updated to that version, so we need to do the same. Otherwise the build fails. Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
parent
8a81dd87f8
commit
8fd10837e6
|
|
@ -47,8 +47,8 @@ FEATURE_PACKAGES_dey-wireless = "packagegroup-dey-wireless"
|
|||
|
||||
# Our layer only provides version 5.41, which we want to keep because
|
||||
# it was used for Bluetooth certification. However by default the newer
|
||||
# 5.64 version should be used, which is provided by the poky layer.
|
||||
PREFERRED_VERSION_bluez5 ?= "5.64"
|
||||
# 5.65 version should be used, which is provided by the poky layer.
|
||||
PREFERRED_VERSION_bluez5 ?= "5.65"
|
||||
|
||||
# Set the PREFERRED_PROVIDER for jpeg functionality based on the MACHINE
|
||||
# architecture. For armv7a devices libjpeg-turbo should be used to take
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
|
||||
index 4d39ad49d5bf..495ce39f133b 100644
|
||||
index beb98ce0c887..16abe9b08881 100644
|
||||
--- a/src/bluetooth.service.in
|
||||
+++ b/src/bluetooth.service.in
|
||||
@@ -32,5 +32,5 @@ NoNewPrivileges=true
|
||||
@@ -34,5 +34,5 @@ NoNewPrivileges=true
|
||||
RestrictRealtime=true
|
||||
|
||||
[Install]
|
||||
|
|
@ -5,11 +5,11 @@ Subject: [PATCH] port test-discovery to python3
|
|||
Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
|
||||
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
|
||||
---
|
||||
test/test-discovery | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
test/test-discovery | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/test/test-discovery b/test/test-discovery
|
||||
index eccc7c7e31f0..9aeace414ada 100755
|
||||
index 54fc51403a8a..9aeace414ada 100755
|
||||
--- a/test/test-discovery
|
||||
+++ b/test/test-discovery
|
||||
@@ -1,4 +1,4 @@
|
||||
|
|
@ -18,12 +18,9 @@ index eccc7c7e31f0..9aeace414ada 100755
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
from __future__ import absolute_import, print_function, unicode_literals
|
||||
@@ -19,9 +19,9 @@ def print_compact(address, properties):
|
||||
name = ""
|
||||
address = "<unknown>"
|
||||
@@ -21,7 +21,7 @@ def print_compact(address, properties):
|
||||
|
||||
- for key, value in properties.iteritems():
|
||||
+ for key, value in properties.items():
|
||||
for key, value in properties.items():
|
||||
if type(value) is dbus.String:
|
||||
- value = unicode(value).encode('ascii', 'replace')
|
||||
+ value = str(value)
|
||||
|
|
@ -66,12 +63,3 @@ index eccc7c7e31f0..9aeace414ada 100755
|
|||
else:
|
||||
devices[path] = changed
|
||||
|
||||
@@ -153,7 +155,7 @@ if __name__ == '__main__':
|
||||
om = dbus.Interface(bus.get_object("org.bluez", "/"),
|
||||
"org.freedesktop.DBus.ObjectManager")
|
||||
objects = om.GetManagedObjects()
|
||||
- for path, interfaces in objects.iteritems():
|
||||
+ for path, interfaces in objects.items():
|
||||
if "org.bluez.Device1" in interfaces:
|
||||
devices[path] = interfaces["org.bluez.Device1"]
|
||||
|
||||
|
|
@ -19,10 +19,10 @@ Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
|
|||
create mode 100644 tools/hciattach_rome.h
|
||||
|
||||
diff --git a/Makefile.tools b/Makefile.tools
|
||||
index bd902fd834aa..e6d9f48781e2 100644
|
||||
index 9412aed36ef2..09993bc3e4cf 100644
|
||||
--- a/Makefile.tools
|
||||
+++ b/Makefile.tools
|
||||
@@ -373,7 +373,8 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
|
||||
@@ -389,7 +389,8 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
|
||||
tools/hciattach_ath3k.c \
|
||||
tools/hciattach_qualcomm.c \
|
||||
tools/hciattach_intel.c \
|
||||
|
|
@ -13,12 +13,12 @@ Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
|
|||
3 files changed, 132 insertions(+), 128 deletions(-)
|
||||
|
||||
diff --git a/lib/bluetooth.h b/lib/bluetooth.h
|
||||
index 0fcf412c6c6b..b15702bdcb4c 100644
|
||||
index af5fbcfbc3df..609eee3f0356 100644
|
||||
--- a/lib/bluetooth.h
|
||||
+++ b/lib/bluetooth.h
|
||||
@@ -171,6 +171,9 @@ enum {
|
||||
BT_CLOSED
|
||||
};
|
||||
@@ -207,6 +207,9 @@ enum {
|
||||
|
||||
#define BT_ISO_BASE 20
|
||||
|
||||
+extern int verbose_on;
|
||||
+#define hciprintf(fd, arg...) if (verbose_on) { fprintf(fd, ##arg);} else { do {} while (0);}
|
||||
Loading…
Reference in New Issue