package/bluez_utils: add missing host-pkgconf dependency

PATCH New Romain Naour 5 participants 15 messages May 13, 2017 – May 15, 2017

lore

Share & tools

lore

Romain Naour

author

2017-05-13 17:10 UTC #0 lore raw

PATCH 1/3 package/bluez_utils: add missing host-pkgconf dependency

The configure script use pkg-config.

Signed-off-by Romain Naour <[email protected]>

Cc Yegor Yefremov <[email protected]>

---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/bluez_utils/bluez_utils.mk +1 -1

index b396886..526804a 100644
@@ -8,7 +8,7 @@ BLUEZ_UTILS_VERSION = 4.101
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
-BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
+BLUEZ_UTILS_DEPENDENCIES = host-pkgconf dbus libglib2
 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
 BLUEZ_UTILS_AUTORECONF = YES
 BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+

Signature · 1 line

2.9.3

Romain Naour

author

2017-05-13 17:10 UTC #1 lore raw

PATCH 2/3 bluez_utils: add missing check dependency for test program

Tests are enabled since this has been introduced [1], so keep them for now.

bluez_utils needs check tool and check if it's available [2].

[1] 06c3e2159686a886e52b2522a47e60c300cfb7f7
[2] https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/configure.ac?h=4.101#n51

Signed-off-by Romain Naour <[email protected]>

Cc Yegor Yefremov <[email protected]>

---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/bluez_utils/bluez_utils.mk +1 -1

index 526804a..256f012 100644
@@ -8,7 +8,7 @@ BLUEZ_UTILS_VERSION = 4.101
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
-BLUEZ_UTILS_DEPENDENCIES = host-pkgconf dbus libglib2
+BLUEZ_UTILS_DEPENDENCIES = host-pkgconf check dbus libglib2
 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
 BLUEZ_UTILS_AUTORECONF = YES
 BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+

Signature · 1 line

2.9.3

Yann E. MORIN

2017-05-13 20:28 UTC #2 lore raw

PATCH 2/3 bluez_utils: add missing check dependency for test program

Romain, All,

On 2017-05-13 19:10 +0200, Romain Naour spake thusly:

Quoted 2 lines

Tests are enabled since this has been introduced [1], so keep them for now.

Why don't you want to simply disable tests altogehter, especially since there is an option for that:

--disable-test

And if we disable tests, then we do not need patch 3/3.

Regards,
Yann E. MORIN.

Quoted 31 lines

bluez_utils needs check tool and check if it's available [2].
[1] 06c3e2159686a886e52b2522a47e60c300cfb7f7
[2] https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/configure.ac?h=4.101#n51
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/bluez_utils/bluez_utils.mk +1 -1
index 526804a..256f012 100644
@@ -8,7 +8,7 @@ BLUEZ_UTILS_VERSION = 4.101
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
-BLUEZ_UTILS_DEPENDENCIES = host-pkgconf dbus libglib2
+BLUEZ_UTILS_DEPENDENCIES = host-pkgconf check dbus libglib2
 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
 BLUEZ_UTILS_AUTORECONF = YES
 BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
Signature · 6 lines
2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Romain Naour

author

2017-05-13 21:08 UTC #3 lore raw

PATCH 2/3 bluez_utils: add missing check dependency for test program

Hi Yann, Yegor,

Le 13/05/2017 ? 22:28, Yann E. MORIN a ?crit :

Quoted 6 lines

Romain, All,
On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
Quoted 2 lines
Tests are enabled since this has been introduced [1], so keep them for now.

Quoted 6 lines

Why don't you want to simply disable tests altogehter, especially since there is an option for that:
--disable-test
And if we disable tests, then we do not need patch 3/3.

Indeed, I hesitated to do so because tests are explicitly enabled for some reason. Yegor, do you think that tests can be safely disabled ?

Best regards,
Romain

Quoted 36 lines

Regards,
Yann E. MORIN.
Quoted 31 lines
bluez_utils needs check tool and check if it's available [2].
[1] 06c3e2159686a886e52b2522a47e60c300cfb7f7
[2] https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/configure.ac?h=4.101#n51
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/bluez_utils/bluez_utils.mk +1 -1
index 526804a..256f012 100644
@@ -8,7 +8,7 @@ BLUEZ_UTILS_VERSION = 4.101
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
-BLUEZ_UTILS_DEPENDENCIES = host-pkgconf dbus libglib2
+BLUEZ_UTILS_DEPENDENCIES = host-pkgconf check dbus libglib2
 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
 BLUEZ_UTILS_AUTORECONF = YES
 BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
Signature · 6 lines
2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Thomas Petazzoni

2017-05-14 14:05 UTC #4 lore raw

PATCH 2/3 bluez_utils: add missing check dependency for test program

In reply to Yann E. MORIN

Hello,

Quoted 10 lines · Yann E. MORIN

On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
Quoted 2 lines
Tests are enabled since this has been introduced [1], so keep them for now.
Why don't you want to simply disable tests altogehter, especially since there is an option for that:
--disable-test
And if we disable tests, then we do not need patch 3/3.

In bluez_utils, "tests" apparently a good number of tools that are not really tests, and might be needed on the target. I'll let Yegor answer on this though, but in the mean time, I believe it's better to fix things rather than changing the set of available tools on the target, which is why I've applied Romain's patch.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Yegor Yefremov

2017-05-14 14:59 UTC #5 lore raw

PATCH 2/3 bluez_utils: add missing check dependency for test program

Quoted 13 lines · Thomas Petazzoni

Hello,
Quoted 9 lines · Yann E. MORIN
On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
Quoted 2 lines
Tests are enabled since this has been introduced [1], so keep them for now.
Why don't you want to simply disable tests altogehter, especially since there is an option for that:
--disable-test

Quoted 7 lines

Quoted 1 line
And if we disable tests, then we do not need patch 3/3.
In bluez_utils, "tests" apparently a good number of tools that are not really tests, and might be needed on the target. I'll let Yegor answer on this though, but in the mean time, I believe it's better to fix things rather than changing the set of available tools on the target, which is why I've applied Romain's patch.

I'll have to take a closer look at this. Haven't used bluez_utils for ages.

Yegor

Peter Korsgaard

2017-05-15 12:43 UTC #6 lore raw

PATCH 2/3 bluez_utils: add missing check dependency for test program

In reply to Thomas Petazzoni

Quoted 14 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Hello,
Quoted 9 lines · Yann E. MORIN
On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
Quoted 2 lines
Tests are enabled since this has been introduced [1], so keep them for now.
Why don't you want to simply disable tests altogehter, especially since there is an option for that:
--disable-test

Quoted 7 lines

Quoted 1 line
And if we disable tests, then we do not need patch 3/3.
In bluez_utils, "tests" apparently a good number of tools that are not really tests, and might be needed on the target. I'll let Yegor answer on this though, but in the mean time, I believe it's better to fix things rather than changing the set of available tools on the target, which is why I've applied Romain's patch.

It looks to be a bit of a mess. The only thing that gets linked with libcheck (check is a library, not a program) is unit/test-eir, which doesn't even get installed.

But oh well, it is indeed safer to keep it enabled.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

Applied

2017-05-14 14:04 UTC #7 lore raw

PATCH 2/3 bluez_utils: add missing check dependency for test program

In reply to Romain Naour

Hello,

Quoted 5 lines · Romain Naour

Tests are enabled since this has been introduced [1], so keep them for now.
bluez_utils needs check tool and check if it's available [2].

Quoted 8 lines

[1] 06c3e2159686a886e52b2522a47e60c300cfb7f7
[2] https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/configure.ac?h=4.101#n51
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Korsgaard

2017-05-15 12:45 UTC #8 lore raw

PATCH 2/3 bluez_utils: add missing check dependency for test program

In reply to Romain Naour

Quoted 5 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Tests are enabled since this has been introduced [1], so keep them for now.

Quoted 7 lines

bluez_utils needs check tool and check if it's available [2].
[1] 06c3e2159686a886e52b2522a47e60c300cfb7f7
[2] https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/configure.ac?h=4.101#n51
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Romain Naour

author

2017-05-13 17:10 UTC #9 lore raw

PATCH 3/3 package/bluez_utils: fix test build issues with musl

In reply to Romain Naour

Add one missing header and avoid encrypt redefinition.

Fixes:
http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/

Signed-off-by Romain Naour <[email protected]>

Cc Yegor Yefremov <[email protected]>

---
 .../bluez_utils/0004-test-add-missing-header.patch |  34 +++++++
 ...test-avoid-conflict-with-encrypt-function.patch | 107 +++++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 package/bluez_utils/0004-test-add-missing-header.patch
 create mode 100644 package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch

package/bluez_utils/0004-test-add-missing-header.patch new file +34 -0

new file mode 100644
index 0000000..78d84aa
@@ -0,0 +1,34 @@
+From d3c098c2fde55ddf0c7d56eae56925103d35da73 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sat, 13 May 2017 18:56:51 +0200
+Subject: [PATCH 4/5] test: add missing header
+
+test/attest.c: In function 'at_command':
+test/attest.c:43:2: error: unknown type name 'fd_set'
+  fd_set rfds;
+  ^
+
+Fixes:
+http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ test/attest.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/attest.c b/test/attest.c
+index 12ba682..2626cf1 100644
+--- a/test/attest.c
++++ b/test/attest.c
+@@ -35,6 +35,8 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ 
++#include <sys/select.h>
++
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
+ 
+-- 
+2.9.3
+

package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch new file +107 -0

107 lines not on this page · raw message

Signature · 1 line

2.9.3

Thomas Petazzoni

2017-05-14 14:07 UTC #10 lore raw

PATCH 3/3 package/bluez_utils: fix test build issues with musl

Hello,

Quoted 7 lines · Romain Naour

Add one missing header and avoid encrypt redefinition.
Fixes:
http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>

I've applied. See a few comments below though.

package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch line 4

Quoted 10 lines

package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch new file +4 -0

new file mode 100644
index 0000000..51ab0c1
@@ -0,0 +1,107 @@
+From d8056252d0c99bfb2482f0a420dcf9a36019ddf8 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sat, 13 May 2017 18:58:51 +0200
+Subject: [PATCH 5/5] test: avoid conflict with encrypt function

Please generate patches with 'git format-patch -N' to avoid the sequence number in the patch itself. Thanks!

package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch line 16

Quoted 12 lines

package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch new file +12 -0

+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With a musl based toolchain:
+
+test/l2test.c:110:12: error: ?encrypt? redeclared as different kind of symbol
+ static int encrypt = 0;
+            ^
+In file included from test/l2test.c:34:0:
+[...]/sysroot/usr/include/unistd.h:145:6: note: previous declaration of ?encrypt? was here
+ void encrypt(char *, int);

This encrypt thing is a bit messy, because the same issue for another part of bluez_utils is solved in a different way in 0003-fix-compilation-issues-with-musl.patch.

Anyway the existing patches are already a bit messy. Perhaps we should start thinking about phasing out bluez_utils? Is there a good reason to still have bluez_utils? Are there some features or hardware devices that work with bluez_utils and not bluez5_utils? Or does bluez5_utils requires a recent kernel version?

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Peter Korsgaard

2017-05-15 12:46 UTC #11 lore raw

PATCH 3/3 package/bluez_utils: fix test build issues with musl

In reply to Romain Naour

Quoted 8 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Add one missing header and avoid encrypt redefinition. Fixes:
http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Yann E. MORIN

2017-05-13 20:29 UTC #12 lore raw

PATCH 1/3 package/bluez_utils: add missing host-pkgconf dependency

In reply to Romain Naour

Romain, All,

On 2017-05-13 19:10 +0200, Romain Naour spake thusly:

Quoted 4 lines

The configure script use pkg-config.
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>

Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 24 lines

---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/bluez_utils/bluez_utils.mk +1 -1

index b396886..526804a 100644
@@ -8,7 +8,7 @@ BLUEZ_UTILS_VERSION = 4.101
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
-BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
+BLUEZ_UTILS_DEPENDENCIES = host-pkgconf dbus libglib2
 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
 BLUEZ_UTILS_AUTORECONF = YES
 BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+

Signature · 6 lines

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Thomas Petazzoni

Applied

2017-05-14 13:58 UTC #13 lore raw

PATCH 1/3 package/bluez_utils: add missing host-pkgconf dependency

In reply to Romain Naour

Hello,

Quoted 7 lines · Romain Naour

The configure script use pkg-config.
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Korsgaard

2017-05-15 12:12 UTC #14 lore raw

PATCH 1/3 package/bluez_utils: add missing host-pkgconf dependency

In reply to Romain Naour

Quoted 5 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
The configure script use pkg-config.
Signed-off-by Romain Naour <[email protected]>
Cc Yegor Yefremov <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard