diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 3743e73f3..ceed65683 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -50,8 +50,8 @@ GCCVERSION ?= "7.%" # 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.48 version should be used, which is provided by the poky layer. -PREFERRED_VERSION_bluez5 ?= "5.48" +# 5.50 version should be used, which is provided by the poky layer. +PREFERRED_VERSION_bluez5 ?= "5.50" # 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.48/0001-hcitool-do-not-show-unsupported-refresh-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0001-hcitool-do-not-show-unsupported-refresh-option.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0001-hcitool-do-not-show-unsupported-refresh-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0001-hcitool-do-not-show-unsupported-refresh-option.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0002-hcitool-increase-the-shown-connection-limit-to-20.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0002-hcitool-increase-the-shown-connection-limit-to-20.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0002-hcitool-increase-the-shown-connection-limit-to-20.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0002-hcitool-increase-the-shown-connection-limit-to-20.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0003-port-test-discovery-to-python3.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0003-port-test-discovery-to-python3.patch similarity index 68% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0003-port-test-discovery-to-python3.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0003-port-test-discovery-to-python3.patch index 25cc37ccf..78e199647 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0003-port-test-discovery-to-python3.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0003-port-test-discovery-to-python3.patch @@ -1,49 +1,27 @@ -From: Isaac Hermida -Date: Thu, 3 Aug 2017 14:10:43 +0200 +From: Arturo Buzarra +Date: Mon, 21 Jan 2019 12:15:06 +0100 Subject: [PATCH] port test-discovery to python3 Signed-off-by: Isaac Hermida +Signed-off-by: Arturo Buzarra --- - test/bluezutils.py | 4 ++-- test/test-discovery | 16 +++++++++------- - 2 files changed, 11 insertions(+), 9 deletions(-) + 1 file changed, 9 insertions(+), 7 deletions(-) -diff --git a/test/bluezutils.py b/test/bluezutils.py -index de08cbdcb712..cd8964082450 100644 ---- a/test/bluezutils.py -+++ b/test/bluezutils.py -@@ -15,7 +15,7 @@ def find_adapter(pattern=None): - - def find_adapter_in_objects(objects, pattern=None): - bus = dbus.SystemBus() -- for path, ifaces in objects.iteritems(): -+ for path, ifaces in objects.items(): - adapter = ifaces.get(ADAPTER_INTERFACE) - if adapter is None: - continue -@@ -35,7 +35,7 @@ def find_device_in_objects(objects, device_address, adapter_pattern=None): - if adapter_pattern: - adapter = find_adapter_in_objects(objects, adapter_pattern) - path_prefix = adapter.object_path -- for path, ifaces in objects.iteritems(): -+ for path, ifaces in objects.items(): - device = ifaces.get(DEVICE_INTERFACE) - if device is None: - continue diff --git a/test/test-discovery b/test/test-discovery -index cea77683d726..852611c862ea 100755 +index cea77683d..852611c86 100755 --- a/test/test-discovery +++ b/test/test-discovery @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 - + from __future__ import absolute_import, print_function, unicode_literals - + @@ -18,9 +18,9 @@ def print_compact(address, properties): name = "" address = "" - + - for key, value in properties.iteritems(): + for key, value in properties.items(): if type(value) is dbus.String: @@ -63,7 +41,7 @@ index cea77683d726..852611c862ea 100755 else: @@ -61,6 +61,8 @@ def skip_dev(old_dev, new_dev): return False - + def interfaces_added(path, interfaces): + if "org.bluez.Device1" not in interfaces.keys(): + return @@ -71,23 +49,23 @@ index cea77683d726..852611c862ea 100755 if not properties: return @@ -70,7 +72,7 @@ def interfaces_added(path, interfaces): - + if compact and skip_dev(dev, properties): return - devices[path] = dict(devices[path].items() + properties.items()) + devices[path] = dict(list(devices[path].items()) + list(properties.items())) else: devices[path] = properties - + @@ -93,7 +95,7 @@ def properties_changed(interface, changed, invalidated, path): - + if compact and skip_dev(dev, changed): return - devices[path] = dict(devices[path].items() + changed.items()) + devices[path] = dict(list(devices[path].items()) + list(changed.items())) else: devices[path] = changed - + @@ -152,7 +154,7 @@ if __name__ == '__main__': om = dbus.Interface(bus.get_object("org.bluez", "/"), "org.freedesktop.DBus.ObjectManager") diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0004-QCA_bluetooth_chip_support.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0004-QCA_bluetooth_chip_support.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0004-QCA_bluetooth_chip_support.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0004-QCA_bluetooth_chip_support.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0007-hciattach-Add-verbosity-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0007-hciattach-Add-verbosity-option.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/0007-hciattach-Add-verbosity-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0007-hciattach-Add-verbosity-option.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6qpsbc/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6qpsbc/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6qpsbc/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6qpsbc/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6qpsbc/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6qpsbc/main.conf similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6qpsbc/main.conf rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6qpsbc/main.conf diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6sbc/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6sbc/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6sbc/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6sbc/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6sbc/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6sbc/main.conf similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6sbc/main.conf rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6sbc/main.conf diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6ul/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6ul/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6ul/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6ul/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6ul/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6ul/main.conf similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx6ul/main.conf rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6ul/main.conf diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx8x/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx8x/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx8x/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/main.conf similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/ccimx8x/main.conf rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/main.conf diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/use-mainline-bsp/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/use-mainline-bsp/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.48/use-mainline-bsp/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/use-mainline-bsp/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.48.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5_5.48.bbappend rename to meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend