Skip to contentSkip to conversation

bluez5: add patches to fix 8.56 cli issues

PATCH New Leonardo Costa 1 participant 1 message Apr 23

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bluez5: add patches to fix 8.56 cli issues

From: Leonardo Costa <[email protected]>

On bluez5 5.86, the bluetoothctl cli interface does not work outside of the dedicated shell to list controllers and devices [1]. These patches fix the issue while version 5.87 is not published.

[1] https://github.com/bluez/bluez/issues/1896

Upstream-Status: Backport [https://github.com/bluez/bluez/commit/b33e923b55e4d0e9d78a83cfcb541fd1f687ef54,

                           https://github.com/bluez/bluez/commit/21e13976f2e375d701b8b7032ba5c1b2e56c305f]
---
 meta/recipes-connectivity/bluez5/bluez5.inc   |  2 +
 ...ell-Don-t-init-input-for-non-interac.patch | 42 +++++++++++++++++++
 ...d-broken-stdin-handling-in-home-made.patch | 36 ++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-Revert-shared-shell-Don-t-init-input-for-non-interac.patch
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-tools-Work-around-broken-stdin-handling-in-home-made.patch
meta/recipes-connectivity/bluez5/bluez5.inc +2 -0
index dd20583015..843e36b78d 100644
@@ -68,6 +68,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
            file://init \
            file://run-ptest \
            file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
+           file://0001-Revert-shared-shell-Don-t-init-input-for-non-interac.patch \
+           file://0001-tools-Work-around-broken-stdin-handling-in-home-made.patch \
            "
 S = "${UNPACKDIR}/bluez-${PV}"
 
meta/recipes-connectivity/bluez5/bluez5/0001-Revert-shared-shell-Don-t-init-input-for-non-interac.patch new file +42 -0

42 lines not on this page · raw message

meta/recipes-connectivity/bluez5/bluez5/0001-tools-Work-around-broken-stdin-handling-in-home-made.patch new file +36 -0
new file mode 100644
index 0000000000..c362936bc2
@@ -0,0 +1,36 @@
+From 21e13976f2e375d701b8b7032ba5c1b2e56c305f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <[email protected]>
+Date: Fri, 27 Feb 2026 12:27:18 +0100
+Subject: [PATCH] tools: Work-around broken stdin handling in home-made
+ mainloop
+
+bluetoothd has 3 mainloop implementations, one relying on ell, one
+relying on glib, and another home-made.
+
+The home-made mainloop handler use epoll() without any fallbacks, and
+will hang if one tries to epoll() an stdin that redirects from
+/dev/null.
+
+Closes: https://github.com/bluez/bluez/issues/700
+
+Upstream-Status: Backport [https://github.com/bluez/bluez/commit/b33e923b55e4d0e9d78a83cfcb541fd1f687ef54]
+Signed-off-by: Leonardo Costa <[email protected]>
+---
+ Makefile.tools | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.tools b/Makefile.tools
+index 589f7c94f..7c52e053f 100644
+--- a/Makefile.tools
++++ b/Makefile.tools
+@@ -531,8 +531,8 @@ tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
+ 
+ tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c \
+ 			client/mgmt.c
+-tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \
+-				-lreadline
++tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-glib.la \
++				$(GLIB_LIBS) -lreadline
+ if DEPRECATED
+ noinst_PROGRAMS += attrib/gatttool
+