bluez5_utils: add patch to fix readline issue

PATCH New Thomas Petazzoni 2 participants 3 messages Apr 20, 2018 – May 1, 2018

Share & tools

Thomas Petazzoni

author

2018-04-20 14:07 UTC #0 lore raw

PATCH 1/1 bluez5_utils: add patch to fix readline issue

Since bluez5_utils 5.49, some code using readline was compiled even if readline was not available. After this issue was reported upstream, a patch was proposed by an upstream developer to address the issue. This commit integrates this patch (under review upstream), which fixes the problem.

Fixes:

http://autobuild.buildroot.net/results/3e266a79acab8b8eb33360f7afbc1cd6db46f7cb/

Signed-off-by Thomas Petazzoni <[email protected]>

---
 ...Is-shall-only-be-build-if-readline-is-pre.patch | 32 ++++++++++++++++++++++
 package/bluez5_utils/bluez5_utils.mk               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 package/bluez5_utils/0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch

package/bluez5_utils/0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch new file +32 -0

new file mode 100644
index 0000000000..394742b680
@@ -0,0 +1,32 @@
+From 654444dd8faf02b46f41d81f3d9c623d57bdd399 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <[email protected]>
+Date: Fri, 20 Apr 2018 16:04:17 +0200
+Subject: [PATCH] bt_shell APIs shall only be build if readline is present on
+ the system since it currently depend on it.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+Upstream-status: https://marc.info/?l=linux-bluetooth&m=152422938306592&w=2
+---
+ Makefile.am | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index daf34b6ca..9c3c17139 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -119,7 +119,11 @@ shared_sources = src/shared/io.h src/shared/timeout.h \
+ 			src/shared/gatt-server.h src/shared/gatt-server.c \
+ 			src/shared/gatt-db.h src/shared/gatt-db.c \
+ 			src/shared/gap.h src/shared/gap.c \
+-			src/shared/tty.h src/shared/shell.c src/shared/shell.h
++			src/shared/tty.h
++
++if READLINE
++shared_sources += src/shared/shell.c src/shared/shell.h
++endif
+ 
+ src_libshared_glib_la_SOURCES = $(shared_sources) \
+ 				src/shared/io-glib.c \
+-- 
+2.14.3
+

package/bluez5_utils/bluez5_utils.mk +2 -0

index e1c67bd622..3189855624 100644
@@ -11,6 +11,8 @@ BLUEZ5_UTILS_INSTALL_STAGING = YES
 BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
 BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
 BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
+# 0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch
+BLUEZ5_UTILS_AUTORECONF = YES
 
 BLUEZ5_UTILS_CONF_OPTS = \
 	--enable-tools \

Signature · 1 line

2.14.3

Thomas Petazzoni

author Applied

2018-04-21 12:53 UTC #1 lore raw

PATCH 1/1 bluez5_utils: add patch to fix readline issue

Hello,

Quoted 8 lines · Thomas Petazzoni

Since bluez5_utils 5.49, some code using readline was compiled even if readline was not available. After this issue was reported upstream, a patch was proposed by an upstream developer to address the issue. This commit integrates this patch (under review upstream), which fixes the problem.
Fixes:

Quoted 8 lines

http://autobuild.buildroot.net/results/3e266a79acab8b8eb33360f7afbc1cd6db46f7cb/
Signed-off-by Thomas Petazzoni <[email protected]>
---
 ...Is-shall-only-be-build-if-readline-is-pre.patch | 32 ++++++++++++++++++++++
 package/bluez5_utils/bluez5_utils.mk               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 package/bluez5_utils/0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Peter Korsgaard

2018-05-01 07:57 UTC #2 lore raw

PATCH 1/1 bluez5_utils: add patch to fix readline issue

In reply to Thomas Petazzoni

Quoted 11 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Since bluez5_utils 5.49, some code using readline was compiled even if readline was not available. After this issue was reported upstream, a patch was proposed by an upstream developer to address the issue. This commit integrates this patch (under review upstream), which fixes the problem.
Fixes:
http://autobuild.buildroot.net/results/3e266a79acab8b8eb33360f7afbc1cd6db46f7cb/

We also have this problem on 2018.02.x which uses bluez5_utils 5.48.1 (and had it with 5.48 as well), so this applies since 5.49.

Committed to 2018.02.x with the version number refernce fixed, thanks.

Signature · 1 line

Bye, Peter Korsgaard