diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 3db7e25c7..06c275fd8 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -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 diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0001-bluetooth.service-add-Digi-customizations.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0001-bluetooth.service-add-Digi-customizations.patch similarity index 88% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0001-bluetooth.service-add-Digi-customizations.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0001-bluetooth.service-add-Digi-customizations.patch index 3ed1499c3..25ed7f1de 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0001-bluetooth.service-add-Digi-customizations.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0001-bluetooth.service-add-Digi-customizations.patch @@ -12,10 +12,10 @@ Signed-off-by: Gabriel Valcazar 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] diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0002-hcitool-do-not-show-unsupported-refresh-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0002-hcitool-do-not-show-unsupported-refresh-option.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0002-hcitool-do-not-show-unsupported-refresh-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0002-hcitool-do-not-show-unsupported-refresh-option.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0003-hcitool-increase-the-shown-connection-limit-to-20.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0003-hcitool-increase-the-shown-connection-limit-to-20.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0003-hcitool-increase-the-shown-connection-limit-to-20.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0003-hcitool-increase-the-shown-connection-limit-to-20.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0004-port-test-discovery-to-python3.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0004-port-test-discovery-to-python3.patch similarity index 73% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0004-port-test-discovery-to-python3.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0004-port-test-discovery-to-python3.patch index e37e97b50..e296ba356 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0004-port-test-discovery-to-python3.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0004-port-test-discovery-to-python3.patch @@ -5,11 +5,11 @@ Subject: [PATCH] port test-discovery to python3 Signed-off-by: Isaac Hermida Signed-off-by: Arturo Buzarra --- - 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 = "" +@@ -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"] - diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch similarity index 99% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch index 7c89aa14c..5ac22eb57 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch @@ -19,10 +19,10 @@ Signed-off-by: Jose Diaz de Grenu 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 \ diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0008-hciattach-Add-verbosity-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0008-hciattach-Add-verbosity-option.patch similarity index 99% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0008-hciattach-Add-verbosity-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0008-hciattach-Add-verbosity-option.patch index a9f58ef37..3d6e5c199 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0008-hciattach-Add-verbosity-option.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0008-hciattach-Add-verbosity-option.patch @@ -13,12 +13,12 @@ Signed-off-by: Jose Diaz de Grenu 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);} diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.64.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.65.bbappend similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5_5.64.bbappend rename to meta-digi-dey/recipes-connectivity/bluez/bluez5_5.65.bbappend