From d653862bd7e91e0b47b0f57e937f7344955df99f Mon Sep 17 00:00:00 2001 From: Johnny Vogels <35307256+jmv2009@users.noreply.github.com> Date: Tue, 2 Mar 2021 21:00:58 +0100 Subject: [PATCH 1/2] Bluez: Update to 5.55 Signed-off-by: Johnny Vogels <35307256+jmv2009@users.noreply.github.com> --- utils/bluez/Makefile | 4 ++-- utils/bluez/patches/201-readline.patch | 10 +++++----- .../205-refresh_adv_manager_for_non-LE_devices.patch | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/bluez/Makefile b/utils/bluez/Makefile index ee6d1a725..c1305d9f0 100644 --- a/utils/bluez/Makefile +++ b/utils/bluez/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bluez -PKG_VERSION:=5.54 +PKG_VERSION:=5.55 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/ -PKG_HASH:=68cdab9e63e8832b130d5979dc8c96fdb087b31278f342874d992af3e56656dc +PKG_HASH:=8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/utils/bluez/patches/201-readline.patch b/utils/bluez/patches/201-readline.patch index e0dc08c76..9d32c4b6b 100644 --- a/utils/bluez/patches/201-readline.patch +++ b/utils/bluez/patches/201-readline.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -3214,7 +3214,7 @@ unit_tests = $(am__append_54) unit/test- +@@ -3212,7 +3212,7 @@ unit_tests = $(am__append_54) unit/test- @CLIENT_TRUE@ client/gatt.h client/gatt.c @CLIENT_TRUE@client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ @@ -9,7 +9,7 @@ @ZSH_COMPLETIONS_TRUE@zshcompletiondir = $(ZSH_COMPLETIONDIR) @ZSH_COMPLETIONS_TRUE@dist_zshcompletion_DATA = completion/zsh/_bluetoothctl -@@ -3452,7 +3452,7 @@ unit_tests = $(am__append_54) unit/test- +@@ -3450,7 +3450,7 @@ unit_tests = $(am__append_54) unit/test- @MESH_TRUE@@TOOLS_TRUE@tools_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ @MESH_TRUE@@TOOLS_TRUE@ lib/libbluetooth-internal.la \ @@ -18,7 +18,7 @@ @MESH_TRUE@@TOOLS_TRUE@tools_mesh_cfgclient_SOURCES = tools/mesh-cfgclient.c \ @MESH_TRUE@@TOOLS_TRUE@ tools/mesh/model.h tools/mesh/config-model.h \ -@@ -3520,7 +3520,7 @@ unit_tests = $(am__append_54) unit/test- +@@ -3517,7 +3517,7 @@ unit_tests = $(am__append_54) unit/test- @READLINE_TRUE@ tools/obex-client-tool.c @READLINE_TRUE@tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ @@ -27,7 +27,7 @@ @READLINE_TRUE@tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ @READLINE_TRUE@ tools/obex-server-tool.c -@@ -3529,15 +3529,15 @@ unit_tests = $(am__append_54) unit/test- +@@ -3526,15 +3526,15 @@ unit_tests = $(am__append_54) unit/test- @READLINE_TRUE@tools_bluetooth_player_SOURCES = tools/bluetooth-player.c @READLINE_TRUE@tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ @READLINE_TRUE@ src/libshared-glib.la \ @@ -46,7 +46,7 @@ @DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \ @DEPRECATED_TRUE@@READLINE_TRUE@ attrib/gattrib.c btio/btio.c \ -@@ -3546,7 +3546,7 @@ unit_tests = $(am__append_54) unit/test- +@@ -3543,7 +3543,7 @@ unit_tests = $(am__append_54) unit/test- @DEPRECATED_TRUE@@READLINE_TRUE@ client/display.h @DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \ diff --git a/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch b/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch index ed45f98cd..bee1422b1 100644 --- a/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch +++ b/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch @@ -34,7 +34,7 @@ This commit prevents the call to btd_adv_manager_refresh for non-LE devices. --- a/src/adapter.c +++ b/src/adapter.c -@@ -567,7 +567,8 @@ static void settings_changed(struct btd_ +@@ -573,7 +573,8 @@ static void settings_changed(struct btd_ g_dbus_emit_property_changed(dbus_conn, adapter->path, ADAPTER_INTERFACE, "Discoverable"); store_adapter_info(adapter); From 7299ba0517bc0b8fedcf9bcaac687614b04cafa1 Mon Sep 17 00:00:00 2001 From: Johnny Vogels <35307256+jmv2009@users.noreply.github.com> Date: Wed, 3 Mar 2021 18:25:05 +0100 Subject: [PATCH 2/2] Bluez: Update to 5.56 Signed-off-by: Johnny Vogels <35307256+jmv2009@users.noreply.github.com> --- utils/bluez/Makefile | 6 +++--- .../001-bcm43xx-Add-bcm43xx-3wire-variant.patch | 2 +- ...-The-UART-speed-must-be-reset-after-the-firmw.patch | 4 ++-- .../003-Increase-firmware-load-timeout-to-30s.patch | 2 +- .../004-Move-the-43xx-firmware-into-lib-firmware.patch | 2 +- utils/bluez/patches/201-readline.patch | 10 +++++----- utils/bluez/patches/202-fix-endianness.patch | 4 ++-- utils/bluez/patches/203-obexd_without_systemd.patch | 2 +- .../205-refresh_adv_manager_for_non-LE_devices.patch | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/utils/bluez/Makefile b/utils/bluez/Makefile index c1305d9f0..3e3c89b73 100644 --- a/utils/bluez/Makefile +++ b/utils/bluez/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bluez -PKG_VERSION:=5.55 +PKG_VERSION:=5.56 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/ -PKG_HASH:=8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88 +PKG_HASH:=59c4dba9fc8aae2a6a5f8f12f19bc1b0c2dc27355c7ca3123eed3fe6bd7d0b9d PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING @@ -111,7 +111,7 @@ endef define Package/bluez-utils/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/bdaddr $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/bccmd $(1)/usr/bin/ +# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/bccmd $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/bluemoon $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/btattach $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/btmon $(1)/usr/bin/ diff --git a/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch b/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch index 2a3510b6f..9465ddc70 100644 --- a/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch +++ b/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch @@ -9,7 +9,7 @@ Subject: [PATCH 1/4] bcm43xx: Add bcm43xx-3wire variant --- a/tools/hciattach.c +++ b/tools/hciattach.c -@@ -1091,6 +1091,9 @@ struct uart_t uart[] = { +@@ -1078,6 +1078,9 @@ struct uart_t uart[] = { { "bcm43xx", 0x0000, 0x0000, HCI_UART_H4, 115200, 3000000, FLOW_CTL, DISABLE_PM, NULL, bcm43xx, NULL }, diff --git a/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch b/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch index 4b68f07bb..3df634110 100644 --- a/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch +++ b/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch @@ -10,7 +10,7 @@ Subject: [PATCH 2/4] bcm43xx: The UART speed must be reset after the firmware --- a/tools/hciattach_bcm43xx.c +++ b/tools/hciattach_bcm43xx.c -@@ -367,11 +367,8 @@ int bcm43xx_init(int fd, int def_speed, +@@ -354,11 +354,8 @@ int bcm43xx_init(int fd, int def_speed, return -1; if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) { @@ -23,7 +23,7 @@ Subject: [PATCH 2/4] bcm43xx: The UART speed must be reset after the firmware if (bcm43xx_load_firmware(fd, fw_path)) return -1; -@@ -381,6 +378,7 @@ int bcm43xx_init(int fd, int def_speed, +@@ -368,6 +365,7 @@ int bcm43xx_init(int fd, int def_speed, return -1; } diff --git a/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch b/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch index b99976643..ec13dd7f2 100644 --- a/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch +++ b/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch @@ -9,7 +9,7 @@ Subject: [PATCH 3/4] Increase firmware load timeout to 30s --- a/tools/hciattach.c +++ b/tools/hciattach.c -@@ -1240,7 +1240,7 @@ int main(int argc, char *argv[]) +@@ -1227,7 +1227,7 @@ int main(int argc, char *argv[]) { struct uart_t *u = NULL; int detach, printpid, raw, opt, i, n, ld, err; diff --git a/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch b/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch index 355f17b6d..670d4304c 100644 --- a/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch +++ b/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch @@ -9,7 +9,7 @@ Subject: [PATCH 4/4] Move the 43xx firmware into /lib/firmware --- a/tools/hciattach_bcm43xx.c +++ b/tools/hciattach_bcm43xx.c -@@ -44,7 +44,7 @@ +@@ -31,7 +31,7 @@ #include "hciattach.h" #ifndef FIRMWARE_DIR diff --git a/utils/bluez/patches/201-readline.patch b/utils/bluez/patches/201-readline.patch index 9d32c4b6b..0a2f20eb3 100644 --- a/utils/bluez/patches/201-readline.patch +++ b/utils/bluez/patches/201-readline.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -3212,7 +3212,7 @@ unit_tests = $(am__append_54) unit/test- +@@ -3225,7 +3225,7 @@ unit_tests = $(am__append_54) unit/test- @CLIENT_TRUE@ client/gatt.h client/gatt.c @CLIENT_TRUE@client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ @@ -9,7 +9,7 @@ @ZSH_COMPLETIONS_TRUE@zshcompletiondir = $(ZSH_COMPLETIONDIR) @ZSH_COMPLETIONS_TRUE@dist_zshcompletion_DATA = completion/zsh/_bluetoothctl -@@ -3450,7 +3450,7 @@ unit_tests = $(am__append_54) unit/test- +@@ -3457,7 +3457,7 @@ unit_tests = $(am__append_54) unit/test- @MESH_TRUE@@TOOLS_TRUE@tools_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ @MESH_TRUE@@TOOLS_TRUE@ lib/libbluetooth-internal.la \ @@ -18,7 +18,7 @@ @MESH_TRUE@@TOOLS_TRUE@tools_mesh_cfgclient_SOURCES = tools/mesh-cfgclient.c \ @MESH_TRUE@@TOOLS_TRUE@ tools/mesh/model.h tools/mesh/config-model.h \ -@@ -3517,7 +3517,7 @@ unit_tests = $(am__append_54) unit/test- +@@ -3524,7 +3524,7 @@ unit_tests = $(am__append_54) unit/test- @READLINE_TRUE@ tools/obex-client-tool.c @READLINE_TRUE@tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ @@ -27,7 +27,7 @@ @READLINE_TRUE@tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ @READLINE_TRUE@ tools/obex-server-tool.c -@@ -3526,15 +3526,15 @@ unit_tests = $(am__append_54) unit/test- +@@ -3533,15 +3533,15 @@ unit_tests = $(am__append_54) unit/test- @READLINE_TRUE@tools_bluetooth_player_SOURCES = tools/bluetooth-player.c @READLINE_TRUE@tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ @READLINE_TRUE@ src/libshared-glib.la \ @@ -46,7 +46,7 @@ @DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \ @DEPRECATED_TRUE@@READLINE_TRUE@ attrib/gattrib.c btio/btio.c \ -@@ -3543,7 +3543,7 @@ unit_tests = $(am__append_54) unit/test- +@@ -3550,7 +3550,7 @@ unit_tests = $(am__append_54) unit/test- @DEPRECATED_TRUE@@READLINE_TRUE@ client/display.h @DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \ diff --git a/utils/bluez/patches/202-fix-endianness.patch b/utils/bluez/patches/202-fix-endianness.patch index a92cdd04a..f1d9042e7 100644 --- a/utils/bluez/patches/202-fix-endianness.patch +++ b/utils/bluez/patches/202-fix-endianness.patch @@ -1,10 +1,10 @@ --- a/src/shared/util.h +++ b/src/shared/util.h -@@ -26,6 +26,7 @@ +@@ -14,6 +14,7 @@ #include #include #include +#include #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - + #define BIT(n) (1 << (n)) diff --git a/utils/bluez/patches/203-obexd_without_systemd.patch b/utils/bluez/patches/203-obexd_without_systemd.patch index c79ce3e77..c2f23c141 100644 --- a/utils/bluez/patches/203-obexd_without_systemd.patch +++ b/utils/bluez/patches/203-obexd_without_systemd.patch @@ -18,7 +18,7 @@ directly, and to do so it needs the full path of the daemon. --- a/Makefile.obexd +++ b/Makefile.obexd -@@ -1,12 +1,12 @@ +@@ -2,12 +2,12 @@ if SYSTEMD systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service diff --git a/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch b/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch index bee1422b1..005684add 100644 --- a/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch +++ b/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch @@ -34,7 +34,7 @@ This commit prevents the call to btd_adv_manager_refresh for non-LE devices. --- a/src/adapter.c +++ b/src/adapter.c -@@ -573,7 +573,8 @@ static void settings_changed(struct btd_ +@@ -557,7 +557,8 @@ static void settings_changed(struct btd_ g_dbus_emit_property_changed(dbus_conn, adapter->path, ADAPTER_INTERFACE, "Discoverable"); store_adapter_info(adapter);