From 2ce36cd41af324f896a8aebdf51d4acf9dd19ef0 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 19 Feb 2021 18:31:40 +0100 Subject: [PATCH] gatesgarth migration: bluez5: upddate to support v5.55 https://jira.digi.com/browse/DEL-7508 Upstreamed patch was removed Signed-off-by: Arturo Buzarra --- ..._run_with_signal-instead-of-open-cod.patch | 84 ------------------- .../0003-port-test-discovery-to-python3.patch | 0 .../0004-QCA_bluetooth_chip_support.patch | 0 ...espect-the-user-indication-for-noflo.patch | 0 ...If-the-user-supplies-a-bdaddr-use-it.patch | 0 .../0007-hciattach-Add-verbosity-option.patch | 0 .../ccimx8m/bluetooth-init | 0 .../ccimx8x/bluetooth-init | 0 .../use-mainline-bsp/bluetooth-init | 0 ...ez5_5.50.bbappend => bluez5_5.55.bbappend} | 1 - 10 files changed, 85 deletions(-) delete mode 100644 meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0008-tools-Use-l_main_run_with_signal-instead-of-open-cod.patch rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.50 => bluez5-5.55}/0003-port-test-discovery-to-python3.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.50 => bluez5-5.55}/0004-QCA_bluetooth_chip_support.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.50 => bluez5-5.55}/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.50 => bluez5-5.55}/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.50 => bluez5-5.55}/0007-hciattach-Add-verbosity-option.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.50 => bluez5-5.55}/ccimx8m/bluetooth-init (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.50 => bluez5-5.55}/ccimx8x/bluetooth-init (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.50 => bluez5-5.55}/use-mainline-bsp/bluetooth-init (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5_5.50.bbappend => bluez5_5.55.bbappend} (97%) diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0008-tools-Use-l_main_run_with_signal-instead-of-open-cod.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0008-tools-Use-l_main_run_with_signal-instead-of-open-cod.patch deleted file mode 100644 index da4c6dce2..000000000 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0008-tools-Use-l_main_run_with_signal-instead-of-open-cod.patch +++ /dev/null @@ -1,84 +0,0 @@ -From: Marcel Holtmann -Date: Mon, 3 Dec 2018 19:48:08 +0100 -Subject: [PATCH] tools: Use l_main_run_with_signal instead of open coding it - ---- - tools/btpclient.c | 14 +++----------- - 1 file changed, 3 insertions(+), 11 deletions(-) - -diff --git a/tools/btpclient.c b/tools/btpclient.c -index b217df58f..3f958e65c 100644 ---- a/tools/btpclient.c -+++ b/tools/btpclient.c -@@ -27,10 +27,11 @@ - #include - #include - #include - #include - #include -+#include - - #include - - #include "lib/bluetooth.h" - #include "src/shared/btp.h" -@@ -2825,12 +2826,11 @@ static void register_core_service(void) - - btp_register(btp, BTP_CORE_SERVICE, BTP_OP_CORE_UNREGISTER, - btp_core_unregister, NULL, NULL); - } - --static void signal_handler(struct l_signal *signal, uint32_t signo, -- void *user_data) -+static void signal_handler(uint32_t signo, void *user_data) - { - switch (signo) { - case SIGINT: - case SIGTERM: - l_info("Terminating"); -@@ -3154,12 +3154,10 @@ static const struct option options[] = { - }; - - int main(int argc, char *argv[]) - { - struct l_dbus_client *client; -- struct l_signal *signal; -- sigset_t mask; - int opt; - - l_log_set_stderr(); - - while ((opt = getopt_long(argc, argv, "+hs:vq", options, NULL)) != -1) { -@@ -3192,15 +3190,10 @@ int main(int argc, char *argv[]) - return EXIT_FAILURE; - - - adapters = l_queue_new(); - -- sigemptyset(&mask); -- sigaddset(&mask, SIGINT); -- sigaddset(&mask, SIGTERM); -- signal = l_signal_create(&mask, signal_handler, NULL, NULL); -- - dbus = l_dbus_new_default(L_DBUS_SYSTEM_BUS); - l_dbus_set_ready_handler(dbus, ready_callback, NULL, NULL); - client = l_dbus_client_new(dbus, "org.bluez", "/org/bluez"); - - l_dbus_client_set_connect_handler(client, client_connected, NULL, NULL); -@@ -3210,15 +3203,14 @@ int main(int argc, char *argv[]) - l_dbus_client_set_proxy_handlers(client, proxy_added, proxy_removed, - property_changed, NULL, NULL); - - l_dbus_client_set_ready_handler(client, client_ready, NULL, NULL); - -- l_main_run(); -+ l_main_run_with_signal(signal_handler, NULL); - - l_dbus_client_destroy(client); - l_dbus_destroy(dbus); -- l_signal_remove(signal); - btp_cleanup(btp); - - l_queue_destroy(adapters, (l_queue_destroy_func_t)btp_adapter_free); - - l_free(socket_path); diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0003-port-test-discovery-to-python3.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0003-port-test-discovery-to-python3.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0003-port-test-discovery-to-python3.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0003-port-test-discovery-to-python3.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0004-QCA_bluetooth_chip_support.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0004-QCA_bluetooth_chip_support.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0004-QCA_bluetooth_chip_support.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0004-QCA_bluetooth_chip_support.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0005-hciattach_rome-Respect-the-user-indication-for-noflo.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0006-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0007-hciattach-Add-verbosity-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0007-hciattach-Add-verbosity-option.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/0007-hciattach-Add-verbosity-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/0007-hciattach-Add-verbosity-option.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8m/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/ccimx8m/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8m/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/ccimx8m/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/ccimx8x/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/ccimx8x/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/use-mainline-bsp/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/use-mainline-bsp/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/use-mainline-bsp/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.55/use-mainline-bsp/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.55.bbappend similarity index 97% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend rename to meta-digi-dey/recipes-connectivity/bluez/bluez5_5.55.bbappend index 595095d78..64f5d498f 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.50.bbappend +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.55.bbappend @@ -10,7 +10,6 @@ SRC_URI += " \ file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \ file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \ file://0003-port-test-discovery-to-python3.patch \ - file://0008-tools-Use-l_main_run_with_signal-instead-of-open-cod.patch \ " QCA65XX_COMMON_PATCHES = " \