* [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency
@ 2017-05-13 17:10 Romain Naour
2017-05-13 17:10 ` [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program Romain Naour
` (4 more replies)
0 siblings, 5 replies; 15+ messages in thread
From: Romain Naour @ 2017-05-13 17:10 UTC (permalink / raw)
To: buildroot
The configure script use pkg-config.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
---
package/bluez_utils/bluez_utils.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index b396886..526804a 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -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+
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program
2017-05-13 17:10 [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Romain Naour
@ 2017-05-13 17:10 ` Romain Naour
2017-05-13 20:28 ` Yann E. MORIN
` (2 more replies)
2017-05-13 17:10 ` [Buildroot] [PATCH 3/3] package/bluez_utils: fix test build issues with musl Romain Naour
` (3 subsequent siblings)
4 siblings, 3 replies; 15+ messages in thread
From: Romain Naour @ 2017-05-13 17:10 UTC (permalink / raw)
To: buildroot
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 <romain.naour@gmail.com>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
---
package/bluez_utils/bluez_utils.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 526804a..256f012 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -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+
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 3/3] package/bluez_utils: fix test build issues with musl
2017-05-13 17:10 [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Romain Naour
2017-05-13 17:10 ` [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program Romain Naour
@ 2017-05-13 17:10 ` Romain Naour
2017-05-14 14:07 ` Thomas Petazzoni
2017-05-15 12:46 ` Peter Korsgaard
2017-05-13 20:29 ` [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Yann E. MORIN
` (2 subsequent siblings)
4 siblings, 2 replies; 15+ messages in thread
From: Romain Naour @ 2017-05-13 17:10 UTC (permalink / raw)
To: buildroot
Add one missing header and avoid encrypt redefinition.
Fixes:
http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
---
.../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
diff --git a/package/bluez_utils/0004-test-add-missing-header.patch b/package/bluez_utils/0004-test-add-missing-header.patch
new file mode 100644
index 0000000..78d84aa
--- /dev/null
+++ b/package/bluez_utils/0004-test-add-missing-header.patch
@@ -0,0 +1,34 @@
+From d3c098c2fde55ddf0c7d56eae56925103d35da73 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+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 <romain.naour@gmail.com>
+---
+ 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
+
diff --git a/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch b/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch
new file mode 100644
index 0000000..51ab0c1
--- /dev/null
+++ b/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch
@@ -0,0 +1,107 @@
+From d8056252d0c99bfb2482f0a420dcf9a36019ddf8 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sat, 13 May 2017 18:58:51 +0200
+Subject: [PATCH 5/5] test: avoid conflict with encrypt function
+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);
+ ^
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ test/l2test.c | 8 ++++----
+ test/rctest.c | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/test/l2test.c b/test/l2test.c
+index f66486d..9ef6faf 100644
+--- a/test/l2test.c
++++ b/test/l2test.c
+@@ -107,7 +107,7 @@ static char *filename = NULL;
+ static int rfcmode = 0;
+ static int master = 0;
+ static int auth = 0;
+-static int encrypt = 0;
++static int _encrypt = 0;
+ static int secure = 0;
+ static int socktype = SOCK_SEQPACKET;
+ static int linger = 0;
+@@ -340,7 +340,7 @@ static int do_connect(char *svr)
+ opt |= L2CAP_LM_MASTER;
+ if (auth)
+ opt |= L2CAP_LM_AUTH;
+- if (encrypt)
++ if (_encrypt)
+ opt |= L2CAP_LM_ENCRYPT;
+ if (secure)
+ opt |= L2CAP_LM_SECURE;
+@@ -475,7 +475,7 @@ static void do_listen(void (*handler)(int sk))
+ opt |= L2CAP_LM_MASTER;
+ if (auth)
+ opt |= L2CAP_LM_AUTH;
+- if (encrypt)
++ if (_encrypt)
+ opt |= L2CAP_LM_ENCRYPT;
+ if (secure)
+ opt |= L2CAP_LM_SECURE;
+@@ -1407,7 +1407,7 @@ int main(int argc, char *argv[])
+ break;
+
+ case 'E':
+- encrypt = 1;
++ _encrypt = 1;
+ break;
+
+ case 'S':
+diff --git a/test/rctest.c b/test/rctest.c
+index 4d7c90a..7ad5a0b 100644
+--- a/test/rctest.c
++++ b/test/rctest.c
+@@ -79,7 +79,7 @@ static char *filename = NULL;
+
+ static int master = 0;
+ static int auth = 0;
+-static int encrypt = 0;
++static int _encrypt = 0;
+ static int secure = 0;
+ static int socktype = SOCK_STREAM;
+ static int linger = 0;
+@@ -200,7 +200,7 @@ static int do_connect(const char *svr)
+ opt |= RFCOMM_LM_MASTER;
+ if (auth)
+ opt |= RFCOMM_LM_AUTH;
+- if (encrypt)
++ if (_encrypt)
+ opt |= RFCOMM_LM_ENCRYPT;
+ if (secure)
+ opt |= RFCOMM_LM_SECURE;
+@@ -291,7 +291,7 @@ static void do_listen(void (*handler)(int sk))
+ opt |= RFCOMM_LM_MASTER;
+ if (auth)
+ opt |= RFCOMM_LM_AUTH;
+- if (encrypt)
++ if (_encrypt)
+ opt |= RFCOMM_LM_ENCRYPT;
+ if (secure)
+ opt |= RFCOMM_LM_SECURE;
+@@ -701,7 +701,7 @@ int main(int argc, char *argv[])
+ break;
+
+ case 'E':
+- encrypt = 1;
++ _encrypt = 1;
+ break;
+
+ case 'S':
+--
+2.9.3
+
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program
2017-05-13 17:10 ` [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program Romain Naour
@ 2017-05-13 20:28 ` Yann E. MORIN
2017-05-13 21:08 ` Romain Naour
2017-05-14 14:05 ` Thomas Petazzoni
2017-05-14 14:04 ` Thomas Petazzoni
2017-05-15 12:45 ` Peter Korsgaard
2 siblings, 2 replies; 15+ messages in thread
From: Yann E. MORIN @ 2017-05-13 20:28 UTC (permalink / raw)
To: buildroot
Romain, All,
On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
> 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.
> 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 <romain.naour@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> package/bluez_utils/bluez_utils.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
> index 526804a..256f012 100644
> --- a/package/bluez_utils/bluez_utils.mk
> +++ b/package/bluez_utils/bluez_utils.mk
> @@ -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+
> --
> 2.9.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency
2017-05-13 17:10 [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Romain Naour
2017-05-13 17:10 ` [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program Romain Naour
2017-05-13 17:10 ` [Buildroot] [PATCH 3/3] package/bluez_utils: fix test build issues with musl Romain Naour
@ 2017-05-13 20:29 ` Yann E. MORIN
2017-05-14 13:58 ` Thomas Petazzoni
2017-05-15 12:12 ` Peter Korsgaard
4 siblings, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2017-05-13 20:29 UTC (permalink / raw)
To: buildroot
Romain, All,
On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
> The configure script use pkg-config.
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/bluez_utils/bluez_utils.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
> index b396886..526804a 100644
> --- a/package/bluez_utils/bluez_utils.mk
> +++ b/package/bluez_utils/bluez_utils.mk
> @@ -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+
> --
> 2.9.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program
2017-05-13 20:28 ` Yann E. MORIN
@ 2017-05-13 21:08 ` Romain Naour
2017-05-14 14:05 ` Thomas Petazzoni
1 sibling, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-05-13 21:08 UTC (permalink / raw)
To: buildroot
Hi Yann, Yegor,
Le 13/05/2017 ? 22:28, Yann E. MORIN a ?crit :
> Romain, All,
>
> On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
>> 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.
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
>
> Regards,
> Yann E. MORIN.
>
>> 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 <romain.naour@gmail.com>
>> Cc: Yegor Yefremov <yegorslists@googlemail.com>
>> ---
>> package/bluez_utils/bluez_utils.mk | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
>> index 526804a..256f012 100644
>> --- a/package/bluez_utils/bluez_utils.mk
>> +++ b/package/bluez_utils/bluez_utils.mk
>> @@ -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+
>> --
>> 2.9.3
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency
2017-05-13 17:10 [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Romain Naour
` (2 preceding siblings ...)
2017-05-13 20:29 ` [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Yann E. MORIN
@ 2017-05-14 13:58 ` Thomas Petazzoni
2017-05-15 12:12 ` Peter Korsgaard
4 siblings, 0 replies; 15+ messages in thread
From: Thomas Petazzoni @ 2017-05-14 13:58 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 13 May 2017 19:10:07 +0200, Romain Naour wrote:
> The configure script use pkg-config.
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> package/bluez_utils/bluez_utils.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program
2017-05-13 17:10 ` [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program Romain Naour
2017-05-13 20:28 ` Yann E. MORIN
@ 2017-05-14 14:04 ` Thomas Petazzoni
2017-05-15 12:45 ` Peter Korsgaard
2 siblings, 0 replies; 15+ messages in thread
From: Thomas Petazzoni @ 2017-05-14 14:04 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 13 May 2017 19:10:08 +0200, Romain Naour wrote:
> 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 <romain.naour@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> package/bluez_utils/bluez_utils.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program
2017-05-13 20:28 ` Yann E. MORIN
2017-05-13 21:08 ` Romain Naour
@ 2017-05-14 14:05 ` Thomas Petazzoni
2017-05-14 14:59 ` Yegor Yefremov
2017-05-15 12:43 ` Peter Korsgaard
1 sibling, 2 replies; 15+ messages in thread
From: Thomas Petazzoni @ 2017-05-14 14:05 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 13 May 2017 22:28:45 +0200, Yann E. MORIN wrote:
> On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
> > 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 3/3] package/bluez_utils: fix test build issues with musl
2017-05-13 17:10 ` [Buildroot] [PATCH 3/3] package/bluez_utils: fix test build issues with musl Romain Naour
@ 2017-05-14 14:07 ` Thomas Petazzoni
2017-05-15 12:46 ` Peter Korsgaard
1 sibling, 0 replies; 15+ messages in thread
From: Thomas Petazzoni @ 2017-05-14 14:07 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 13 May 2017 19:10:09 +0200, Romain Naour wrote:
> Add one missing header and avoid encrypt redefinition.
>
> Fixes:
> http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
I've applied. See a few comments below though.
> diff --git a/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch b/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch
> new file mode 100644
> index 0000000..51ab0c1
> --- /dev/null
> +++ b/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch
> @@ -0,0 +1,107 @@
> +From d8056252d0c99bfb2482f0a420dcf9a36019ddf8 Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@gmail.com>
> +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!
> +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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program
2017-05-14 14:05 ` Thomas Petazzoni
@ 2017-05-14 14:59 ` Yegor Yefremov
2017-05-15 12:43 ` Peter Korsgaard
1 sibling, 0 replies; 15+ messages in thread
From: Yegor Yefremov @ 2017-05-14 14:59 UTC (permalink / raw)
To: buildroot
On Sun, May 14, 2017 at 4:05 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Sat, 13 May 2017 22:28:45 +0200, Yann E. MORIN wrote:
>
>> On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
>> > 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.
I'll have to take a closer look at this. Haven't used bluez_utils for ages.
Yegor
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency
2017-05-13 17:10 [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Romain Naour
` (3 preceding siblings ...)
2017-05-14 13:58 ` Thomas Petazzoni
@ 2017-05-15 12:12 ` Peter Korsgaard
4 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2017-05-15 12:12 UTC (permalink / raw)
To: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> The configure script use pkg-config.
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program
2017-05-14 14:05 ` Thomas Petazzoni
2017-05-14 14:59 ` Yegor Yefremov
@ 2017-05-15 12:43 ` Peter Korsgaard
1 sibling, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2017-05-15 12:43 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> Hello,
> On Sat, 13 May 2017 22:28:45 +0200, Yann E. MORIN wrote:
>> On 2017-05-13 19:10 +0200, Romain Naour spake thusly:
>> > 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.
:/
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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program
2017-05-13 17:10 ` [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program Romain Naour
2017-05-13 20:28 ` Yann E. MORIN
2017-05-14 14:04 ` Thomas Petazzoni
@ 2017-05-15 12:45 ` Peter Korsgaard
2 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2017-05-15 12:45 UTC (permalink / raw)
To: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> 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 <romain.naour@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 3/3] package/bluez_utils: fix test build issues with musl
2017-05-13 17:10 ` [Buildroot] [PATCH 3/3] package/bluez_utils: fix test build issues with musl Romain Naour
2017-05-14 14:07 ` Thomas Petazzoni
@ 2017-05-15 12:46 ` Peter Korsgaard
1 sibling, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2017-05-15 12:46 UTC (permalink / raw)
To: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> Add one missing header and avoid encrypt redefinition.
> Fixes:
> http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-05-15 12:46 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-13 17:10 [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Romain Naour
2017-05-13 17:10 ` [Buildroot] [PATCH 2/3] bluez_utils: add missing check dependency for test program Romain Naour
2017-05-13 20:28 ` Yann E. MORIN
2017-05-13 21:08 ` Romain Naour
2017-05-14 14:05 ` Thomas Petazzoni
2017-05-14 14:59 ` Yegor Yefremov
2017-05-15 12:43 ` Peter Korsgaard
2017-05-14 14:04 ` Thomas Petazzoni
2017-05-15 12:45 ` Peter Korsgaard
2017-05-13 17:10 ` [Buildroot] [PATCH 3/3] package/bluez_utils: fix test build issues with musl Romain Naour
2017-05-14 14:07 ` Thomas Petazzoni
2017-05-15 12:46 ` Peter Korsgaard
2017-05-13 20:29 ` [Buildroot] [PATCH 1/3] package/bluez_utils: add missing host-pkgconf dependency Yann E. MORIN
2017-05-14 13:58 ` Thomas Petazzoni
2017-05-15 12:12 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox