Skip to contentSkip to conversation

bluez5_utils: update and fix

PATCH New Thomas Petazzoni 2 participants 4 messages Dec 29, 2014 – Dec 30, 2014

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

cover bluez5_utils: update and fix

Hello,

This set of two patches bump bluez5_utils to the latest upstream version, and fixes a build issue reported by the autobuilders.

Thomas

Thomas Petazzoni (2):
bluez5_utils: bump to version 5.27
bluez5_utils: fix missing link against librt

 .../bluez5_utils/0001-Link-mcaptest-with-lrt.patch | 37 ++++++++++++++++++++++
 package/bluez5_utils/bluez5_utils.hash             |  2 +-
 package/bluez5_utils/bluez5_utils.mk               |  5 ++-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 package/bluez5_utils/0001-Link-mcaptest-with-lrt.patch
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH 1/2 bluez5_utils: bump to version 5.27

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/bluez5_utils/bluez5_utils.hash | 2 +-
 package/bluez5_utils/bluez5_utils.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/bluez5_utils/bluez5_utils.hash +1 -1
index 664072f..8bddb71 100644
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
-sha256  5ca62f3f45e2638a0f7a81658d6c8813ee01487436ae8e53e9fe395e23d1fd30    bluez-5.25.tar.xz
+sha256  fbf33cebc76f8c81f28f0d67c71a8a1ec4b04b087460ec7353f7e0c207a1f981    bluez-5.27.tar.xz
package/bluez5_utils/bluez5_utils.mk +1 -1
index 21f792c..b1a1724 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BLUEZ5_UTILS_VERSION = 5.25
+BLUEZ5_UTILS_VERSION = 5.27
 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
 BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ5_UTILS_INSTALL_STAGING = YES
Signature · 1 line
2.1.0
author
#2 lore raw

PATCH 2/2 bluez5_utils: fix missing link against librt

In reply to Thomas Petazzoni

Add a patch to bluez5_utils to make sure that the mcaptest tool gets linked against librt, since it uses clock_getres().

Fixes:

http://autobuild.buildroot.org/results/2b1/2b1e521422d9af2b13133323c6534c49fbb0e177/

Signed-off-by Thomas Petazzoni <[email protected]>
---
 .../bluez5_utils/0001-Link-mcaptest-with-lrt.patch | 37 ++++++++++++++++++++++
 package/bluez5_utils/bluez5_utils.mk               |  3 ++
 2 files changed, 40 insertions(+)
 create mode 100644 package/bluez5_utils/0001-Link-mcaptest-with-lrt.patch
package/bluez5_utils/0001-Link-mcaptest-with-lrt.patch new file +37 -0
new file mode 100644
index 0000000..9933a08
@@ -0,0 +1,37 @@
+From 2d965dce71df18221e625efbfe380b54e6441d64 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Mon, 29 Dec 2014 12:23:41 +0100
+Subject: [PATCH] Link mcaptest with -lrt
+
+The mcaptest tool uses the profiles/health/mcap.c source file, which
+calls clock_getres(). This function is defined in librt, so mcaptest
+should be linked against librt, otherwise one gets link failures such
+as:
+
+ld: profiles/health/mcap.o: undefined reference to symbol 'clock_getres@@GLIBC_2.2.5'
+ld: note: 'clock_getres@@GLIBC_2.2.5' is defined in DSO [...]/sysroot/lib64/librt.so.1 so try adding it to the linker command line
+[...]/sysroot/lib64/librt.so.1: could not read symbols: Invalid operation
+collect2: error: ld returned 1 exit status
+Makefile:4184: recipe for target 'tools/mcaptest' failed
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ Makefile.tools | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.tools b/Makefile.tools
+index bc827fe..178b773 100644
+--- a/Makefile.tools
++++ b/Makefile.tools
+@@ -195,7 +195,7 @@ tools_mcaptest_SOURCES = tools/mcaptest.c \
+ 				btio/btio.h btio/btio.c \
+ 				src/log.c src/log.h \
+ 				profiles/health/mcap.h profiles/health/mcap.c
+-tools_mcaptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
++tools_mcaptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@ -lrt
+ 
+ dist_man_MANS += tools/hciattach.1 tools/hciconfig.1 \
+ 			tools/hcitool.1 tools/hcidump.1 \
+-- 
+2.1.0
+
package/bluez5_utils/bluez5_utils.mk +3 -0
index b1a1724..a1adbe1 100644
@@ -12,6 +12,9 @@ BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
 BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
 BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
 
+# 0001-Link-mcaptest-with-lrt.patch
+BLUEZ5_UTILS_AUTORECONF = YES
+
 BLUEZ5_UTILS_CONF_OPTS = 	\
 	--enable-tools 		\
 	--enable-library 	\
Signature · 1 line
2.1.0
#3 lore raw

cover bluez5_utils: update and fix

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:

Hello,
This set of two patches bump bluez5_utils to the latest upstream version, and fixes a build issue reported by the autobuilders.

Thomas

Thomas Petazzoni (2):
bluez5_utils: bump to version 5.27
bluez5_utils: fix missing link against librt

Committed series, thanks.

Signature · 1 line
Bye, Peter Korsgaard