* [Buildroot] [PATCH] bluez5_utils: new package
@ 2013-12-23 9:37 Alexandre Belloni
2013-12-23 9:50 ` Baruch Siach
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Alexandre Belloni @ 2013-12-23 9:37 UTC (permalink / raw)
To: buildroot
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
package/Config.in | 1 +
package/bluez5_utils/Config.in | 16 ++++
.../bluez5_utils-5.12-enable_cg2900.patch | 106 +++++++++++++++++++++
package/bluez5_utils/bluez5_utils.mk | 31 ++++++
package/bluez_utils/Config.in | 8 +-
5 files changed, 161 insertions(+), 1 deletion(-)
create mode 100644 package/bluez5_utils/Config.in
create mode 100644 package/bluez5_utils/bluez5_utils-5.12-enable_cg2900.patch
create mode 100644 package/bluez5_utils/bluez5_utils.mk
diff --git a/package/Config.in b/package/Config.in
index 490bef87a2eb..ff39f32b9b0b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -770,6 +770,7 @@ source "package/axel/Config.in"
source "package/bcusdk/Config.in"
source "package/bind/Config.in"
source "package/bluez_utils/Config.in"
+source "package/bluez5_utils/Config.in"
source "package/bmon/Config.in"
source "package/boa/Config.in"
source "package/bridge-utils/Config.in"
diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
new file mode 100644
index 000000000000..f0a71125e2ad
--- /dev/null
+++ b/package/bluez5_utils/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_BLUEZ5_UTILS
+ bool "bluez5-utils"
+ depends on !BR2_avr32
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
+ depends on BR2_USE_MMU # dbus, libglib2
+ select BR2_PACKAGE_DBUS
+ select BR2_PACKAGE_LIBGLIB2
+ help
+ bluez utils
+
+ http://www.kernel.org/pub/linux/bluetooth
+
+comment "bluez5-utils needs a toolchain w/ wchar, threads"
+ depends on !BR2_avr32 && BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bluez5_utils/bluez5_utils-5.12-enable_cg2900.patch b/package/bluez5_utils/bluez5_utils-5.12-enable_cg2900.patch
new file mode 100644
index 000000000000..e80af5fd9006
--- /dev/null
+++ b/package/bluez5_utils/bluez5_utils-5.12-enable_cg2900.patch
@@ -0,0 +1,106 @@
+From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Wed, 14 Nov 2012 14:27:02 +0100
+Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth
+ combo controller
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ tools/hciattach.c | 22 +++++++++++++++-------
+ tools/hciattach.h | 1 +
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/tools/hciattach.c b/tools/hciattach.c
+index e4d5aa1..7f08243 100644
+--- a/tools/hciattach.c
++++ b/tools/hciattach.c
+@@ -1066,6 +1066,11 @@ struct uart_t uart[] = {
+ { "texasalt", 0x0000, 0x0000, HCI_UART_LL, 115200, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL },
+
++ /* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */
++ { "cg2900", 0x0000, 0x0000, HCI_UART_STE, 115200, 115200,
++ FLOW_CTL, DISABLE_PM, NULL, NULL },
++
++
+ /* ST Microelectronics minikits based on STLC2410/STLC2415 */
+ { "st", 0x0000, 0x0000, HCI_UART_H4, 57600, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, st },
+@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type)
+ }
+
+ /* Initialize UART driver */
+-static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
++static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc)
+ {
+ struct termios ti;
+- int fd, i;
++ int fd;
+ unsigned long flags = 0;
+
+ if (raw)
+@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
+ }
+
+ /* Set TTY to N_HCI line discipline */
+- i = N_HCI;
+- if (ioctl(fd, TIOCSETD, &i) < 0) {
++ if (ioctl(fd, TIOCSETD, &line_disc) < 0) {
+ perror("Can't set line discipline");
+ return -1;
+ }
+@@ -1243,7 +1247,7 @@ static void usage(void)
+ {
+ printf("hciattach - HCI UART driver initialization utility\n");
+ printf("Usage:\n");
+- printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++ printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
+ printf("\thciattach -l\n");
+ }
+
+@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[])
+ struct uart_t *u = NULL;
+ int detach, printpid, raw, opt, i, n, ld, err;
+ int to = 10;
++ int line_disc = N_HCI;
+ int init_speed = 0;
+ int send_break = 0;
+ pid_t pid;
+@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[])
+ printpid = 0;
+ raw = 0;
+
+- while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) {
++ while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) {
+ switch(opt) {
++ case 'a':
++ line_disc = atoi(optarg);
++ break;
+ case 'b':
+ send_break = 1;
+ break;
+@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[])
+ alarm(to);
+ bcsp_max_retries = to;
+
+- n = init_uart(dev, u, send_break, raw);
++ n = init_uart(dev, u, send_break, raw, line_disc);
+ if (n < 0) {
+ perror("Can't initialize device");
+ exit(1);
+diff --git a/tools/hciattach.h b/tools/hciattach.h
+index fed0d11..09b534d 100644
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -39,6 +39,7 @@
+ #define HCI_UART_H4DS 3
+ #define HCI_UART_LL 4
+ #define HCI_UART_ATH3K 5
++#define HCI_UART_STE 6
+
+ #define HCI_UART_RAW_DEVICE 0
+
+--
+1.7.9.5
+
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
new file mode 100644
index 000000000000..23244221df80
--- /dev/null
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -0,0 +1,31 @@
+################################################################################
+#
+# bluez5_utils
+#
+################################################################################
+
+BLUEZ5_UTILS_VERSION = 5.12
+BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
+BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
+BLUEZ5_UTILS_INSTALL_STAGING = YES
+BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2 readline libical
+BLUEZ5_UTILS_CONF_OPT = --enable-test --enable-tools --disable-android
+BLUEZ5_UTILS_AUTORECONF = YES
+BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
+BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
+
+ifeq ($(BR2_PACKAGE_UDEV),y)
+BLUEZ5_UTILS_CONF_OPT += --enable-udev
+BLUEZ5_UTILS_DEPENDENCIES += udev
+else
+BLUEZ5_UTILS_CONF_OPT += --disable-udev
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+BLUEZ5_UTILS_CONF_OPT += --enable-systemd
+BLUEZ5_UTILS_DEPENDENCIES += systemd
+else
+BLUEZ5_UTILS_CONF_OPT += --disable-systemd
+endif
+
+$(eval $(autotools-package))
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 1315b9ef4166..a4ca3977d29d 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -1,11 +1,14 @@
config BR2_PACKAGE_BLUEZ_UTILS
bool "bluez-utils"
+ depends on !BR2_PACKAGE_BLUEZ5_UTILS
depends on !BR2_avr32
- depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_USE_WCHAR # libglib2, libical
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
depends on BR2_USE_MMU # dbus, libglib2
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_READLINE
+ select BR2_PACKAGE_LIBICAL
help
bluez utils
@@ -48,3 +51,6 @@ endif
comment "bluez-utils needs a toolchain w/ wchar, threads"
depends on !BR2_avr32 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "bluez 4.x is not compatible with bluez 5.x"
+ depends on BR2_PACKAGE_BLUEZ5_UTILS
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 9:37 [Buildroot] [PATCH] bluez5_utils: new package Alexandre Belloni
@ 2013-12-23 9:50 ` Baruch Siach
2013-12-23 9:54 ` Alexandre Belloni
2013-12-23 9:50 ` Thomas Petazzoni
2014-03-07 22:56 ` Thomas Petazzoni
2 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2013-12-23 9:50 UTC (permalink / raw)
To: buildroot
Hi Alexandre,
On Mon, Dec 23, 2013 at 10:37:24AM +0100, Alexandre Belloni wrote:
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
[...]
> diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
> new file mode 100644
> index 000000000000..f0a71125e2ad
> --- /dev/null
> +++ b/package/bluez5_utils/Config.in
> @@ -0,0 +1,16 @@
> +config BR2_PACKAGE_BLUEZ5_UTILS
> + bool "bluez5-utils"
> + depends on !BR2_avr32
> + depends on BR2_USE_WCHAR # libglib2
> + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
Why alsa-lib?
baruch
> + depends on BR2_USE_MMU # dbus, libglib2
> + select BR2_PACKAGE_DBUS
> + select BR2_PACKAGE_LIBGLIB2
> + help
> + bluez utils
> +
> + http://www.kernel.org/pub/linux/bluetooth
> +
> +comment "bluez5-utils needs a toolchain w/ wchar, threads"
> + depends on !BR2_avr32 && BR2_USE_MMU
> + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 14+ messages in thread* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 9:50 ` Baruch Siach
@ 2013-12-23 9:54 ` Alexandre Belloni
2013-12-23 9:57 ` Baruch Siach
0 siblings, 1 reply; 14+ messages in thread
From: Alexandre Belloni @ 2013-12-23 9:54 UTC (permalink / raw)
To: buildroot
On 23/12/2013 10:50, Baruch Siach wrote:
>
>> diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
>> new file mode 100644
>> index 000000000000..f0a71125e2ad
>> --- /dev/null
>> +++ b/package/bluez5_utils/Config.in
>> @@ -0,0 +1,16 @@
>> +config BR2_PACKAGE_BLUEZ5_UTILS
>> + bool "bluez5-utils"
>> + depends on !BR2_avr32
>> + depends on BR2_USE_WCHAR # libglib2
>> + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
> Why alsa-lib?
Hum, right, it got copied from bluez-utils, I'll remove it
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 9:54 ` Alexandre Belloni
@ 2013-12-23 9:57 ` Baruch Siach
2013-12-23 10:11 ` Thomas Petazzoni
0 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2013-12-23 9:57 UTC (permalink / raw)
To: buildroot
Hi Alexandre,
On Mon, Dec 23, 2013 at 10:54:07AM +0100, Alexandre Belloni wrote:
> On 23/12/2013 10:50, Baruch Siach wrote:
> >> diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
> >> new file mode 100644
> >> index 000000000000..f0a71125e2ad
> >> --- /dev/null
> >> +++ b/package/bluez5_utils/Config.in
> >> @@ -0,0 +1,16 @@
> >> +config BR2_PACKAGE_BLUEZ5_UTILS
> >> + bool "bluez5-utils"
> >> + depends on !BR2_avr32
> >> + depends on BR2_USE_WCHAR # libglib2
> >> + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
> > Why alsa-lib?
>
> Hum, right, it got copied from bluez-utils, I'll remove it
Also, it seems that libglib2 doesn't need threads, only wchar.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 14+ messages in thread* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 9:57 ` Baruch Siach
@ 2013-12-23 10:11 ` Thomas Petazzoni
2013-12-23 10:16 ` Alexandre Belloni
2013-12-23 10:17 ` Baruch Siach
0 siblings, 2 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2013-12-23 10:11 UTC (permalink / raw)
To: buildroot
Dear Baruch Siach,
On Mon, 23 Dec 2013 11:57:52 +0200, Baruch Siach wrote:
> > Hum, right, it got copied from bluez-utils, I'll remove it
>
> Also, it seems that libglib2 doesn't need threads, only wchar.
libglib2 does need thread support:
config BR2_PACKAGE_LIBGLIB2
bool "libglib2"
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_PCRE_UCP if BR2_PACKAGE_PCRE
select BR2_PACKAGE_ZLIB
depends on BR2_USE_WCHAR # gettext
depends on BR2_TOOLCHAIN_HAS_THREADS
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 10:11 ` Thomas Petazzoni
@ 2013-12-23 10:16 ` Alexandre Belloni
2013-12-23 10:17 ` Baruch Siach
1 sibling, 0 replies; 14+ messages in thread
From: Alexandre Belloni @ 2013-12-23 10:16 UTC (permalink / raw)
To: buildroot
On 23/12/2013 11:11, Thomas Petazzoni wrote:
> Dear Baruch Siach,
>
> On Mon, 23 Dec 2013 11:57:52 +0200, Baruch Siach wrote:
>
>>> Hum, right, it got copied from bluez-utils, I'll remove it
>> Also, it seems that libglib2 doesn't need threads, only wchar.
> libglib2 does need thread support:
>
> config BR2_PACKAGE_LIBGLIB2
> bool "libglib2"
> select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
> select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
> select BR2_PACKAGE_LIBFFI
> select BR2_PACKAGE_PCRE_UCP if BR2_PACKAGE_PCRE
> select BR2_PACKAGE_ZLIB
> depends on BR2_USE_WCHAR # gettext
> depends on BR2_TOOLCHAIN_HAS_THREADS
Yeah, anyway, my patch is doing less thant the one from Marcin last
month so maybe we should focus on getting his in and we can drop mine...
> Thomas
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 10:11 ` Thomas Petazzoni
2013-12-23 10:16 ` Alexandre Belloni
@ 2013-12-23 10:17 ` Baruch Siach
1 sibling, 0 replies; 14+ messages in thread
From: Baruch Siach @ 2013-12-23 10:17 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Mon, Dec 23, 2013 at 11:11:46AM +0100, Thomas Petazzoni wrote:
> On Mon, 23 Dec 2013 11:57:52 +0200, Baruch Siach wrote:
> > > Hum, right, it got copied from bluez-utils, I'll remove it
> >
> > Also, it seems that libglib2 doesn't need threads, only wchar.
>
> libglib2 does need thread support:
You're right. I looked in an old branch. Sorry for the noise.
baruch
> config BR2_PACKAGE_LIBGLIB2
> bool "libglib2"
> select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
> select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
> select BR2_PACKAGE_LIBFFI
> select BR2_PACKAGE_PCRE_UCP if BR2_PACKAGE_PCRE
> select BR2_PACKAGE_ZLIB
> depends on BR2_USE_WCHAR # gettext
> depends on BR2_TOOLCHAIN_HAS_THREADS
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 9:37 [Buildroot] [PATCH] bluez5_utils: new package Alexandre Belloni
2013-12-23 9:50 ` Baruch Siach
@ 2013-12-23 9:50 ` Thomas Petazzoni
2013-12-23 9:57 ` Thomas Petazzoni
2014-03-07 22:56 ` Thomas Petazzoni
2 siblings, 1 reply; 14+ messages in thread
From: Thomas Petazzoni @ 2013-12-23 9:50 UTC (permalink / raw)
To: buildroot
Dear Alexandre Belloni,
On Mon, 23 Dec 2013 10:37:24 +0100, Alexandre Belloni wrote:
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> package/Config.in | 1 +
> package/bluez5_utils/Config.in | 16 ++++
> .../bluez5_utils-5.12-enable_cg2900.patch | 106 +++++++++++++++++++++
> package/bluez5_utils/bluez5_utils.mk | 31 ++++++
> package/bluez_utils/Config.in | 8 +-
> 5 files changed, 161 insertions(+), 1 deletion(-)
> create mode 100644 package/bluez5_utils/Config.in
> create mode 100644 package/bluez5_utils/bluez5_utils-5.12-enable_cg2900.patch
> create mode 100644 package/bluez5_utils/bluez5_utils.mk
When you send a new version of a patch, please change the subject
prefix to add "PATCH v2", and also include a changelog in your patch so
that we know what changed between v1 and v2.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 9:50 ` Thomas Petazzoni
@ 2013-12-23 9:57 ` Thomas Petazzoni
0 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2013-12-23 9:57 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 23 Dec 2013 10:50:59 +0100, Thomas Petazzoni wrote:
> On Mon, 23 Dec 2013 10:37:24 +0100, Alexandre Belloni wrote:
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > ---
> > package/Config.in | 1 +
> > package/bluez5_utils/Config.in | 16 ++++
> > .../bluez5_utils-5.12-enable_cg2900.patch | 106 +++++++++++++++++++++
> > package/bluez5_utils/bluez5_utils.mk | 31 ++++++
> > package/bluez_utils/Config.in | 8 +-
> > 5 files changed, 161 insertions(+), 1 deletion(-)
> > create mode 100644 package/bluez5_utils/Config.in
> > create mode 100644 package/bluez5_utils/bluez5_utils-5.12-enable_cg2900.patch
> > create mode 100644 package/bluez5_utils/bluez5_utils.mk
>
> When you send a new version of a patch, please change the subject
> prefix to add "PATCH v2", and also include a changelog in your patch so
> that we know what changed between v1 and v2.
My bad. The previous version of this patch was not sent by you, but by
Marcin Bis, so your version is not really a v2.
Have you looked at Marcin Bis version to see if your version includes
all of what Marcin did, if applicable?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] bluez5_utils: new package
2013-12-23 9:37 [Buildroot] [PATCH] bluez5_utils: new package Alexandre Belloni
2013-12-23 9:50 ` Baruch Siach
2013-12-23 9:50 ` Thomas Petazzoni
@ 2014-03-07 22:56 ` Thomas Petazzoni
2014-03-07 23:03 ` Alexandre Belloni
2 siblings, 1 reply; 14+ messages in thread
From: Thomas Petazzoni @ 2014-03-07 22:56 UTC (permalink / raw)
To: buildroot
Dear Alexandre Belloni,
On Mon, 23 Dec 2013 10:37:24 +0100, Alexandre Belloni wrote:
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> package/Config.in | 1 +
> package/bluez5_utils/Config.in | 16 ++++
> .../bluez5_utils-5.12-enable_cg2900.patch | 106 +++++++++++++++++++++
> package/bluez5_utils/bluez5_utils.mk | 31 ++++++
> package/bluez_utils/Config.in | 8 +-
> 5 files changed, 161 insertions(+), 1 deletion(-)
> create mode 100644 package/bluez5_utils/Config.in
> create mode 100644 package/bluez5_utils/bluez5_utils-5.12-enable_cg2900.patch
> create mode 100644 package/bluez5_utils/bluez5_utils.mk
Can you resend an updated version of this patch, that takes into
account the review comments you have received? It would be great to
have bluez5_utils in Buildroot.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] bluez5_utils: new package
2014-03-07 22:56 ` Thomas Petazzoni
@ 2014-03-07 23:03 ` Alexandre Belloni
2014-03-07 23:09 ` Thomas Petazzoni
0 siblings, 1 reply; 14+ messages in thread
From: Alexandre Belloni @ 2014-03-07 23:03 UTC (permalink / raw)
To: buildroot
Hi,
On 07/03/2014 at 23:56:11 +0100, Thomas Petazzoni wrote :
> Dear Alexandre Belloni,
>
> On Mon, 23 Dec 2013 10:37:24 +0100, Alexandre Belloni wrote:
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > ---
> > package/Config.in | 1 +
> > package/bluez5_utils/Config.in | 16 ++++
> > .../bluez5_utils-5.12-enable_cg2900.patch | 106 +++++++++++++++++++++
> > package/bluez5_utils/bluez5_utils.mk | 31 ++++++
> > package/bluez_utils/Config.in | 8 +-
> > 5 files changed, 161 insertions(+), 1 deletion(-)
> > create mode 100644 package/bluez5_utils/Config.in
> > create mode 100644 package/bluez5_utils/bluez5_utils-5.12-enable_cg2900.patch
> > create mode 100644 package/bluez5_utils/bluez5_utils.mk
>
> Can you resend an updated version of this patch, that takes into
> account the review comments you have received? It would be great to
> have bluez5_utils in Buildroot.
>
It may make sense to take the patch from Marcin as it is almost the same
as mine Yann had a few comments on it this week:
http://lists.busybox.net/pipermail/buildroot/2014-March/091454.html
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] bluez5_utils: new package
@ 2013-11-04 12:59 Marcin Bis
2013-11-04 16:06 ` Thomas De Schampheleire
0 siblings, 1 reply; 14+ messages in thread
From: Marcin Bis @ 2013-11-04 12:59 UTC (permalink / raw)
To: buildroot
This patch adds support for BlueZ 5.x.
API is not backwards compatible with BlueZ 4. It uses kernel interface
introduces in 3.4 (3.5 for Low Energy).
BlueZ utils will use systemd and/or udev if enabled.
Signed-off-by: Marcin Bis <marcin@bis.org.pl>
---
package/Config.in | 1 +
package/bluez5_utils/Config.in | 36 +++++++++++++++++++++++++++++
package/bluez5_utils/bluez5_utils.mk | 42 ++++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+), 0 deletions(-)
create mode 100644 package/bluez5_utils/Config.in
create mode 100644 package/bluez5_utils/bluez5_utils.mk
diff --git a/package/Config.in b/package/Config.in
index 4c4da51..0e0fca9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -768,6 +768,7 @@ source "package/axel/Config.in"
source "package/bcusdk/Config.in"
source "package/bind/Config.in"
source "package/bluez_utils/Config.in"
+source "package/bluez5_utils/Config.in"
source "package/bmon/Config.in"
source "package/boa/Config.in"
source "package/bridge-utils/Config.in"
diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
new file mode 100644
index 0000000..d2b4910
--- /dev/null
+++ b/package/bluez5_utils/Config.in
@@ -0,0 +1,36 @@
+config BR2_PACKAGE_BLUEZ5_UTILS
+ bool "bluez-utils 5.x"
+ depends on !BR2_avr32
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
+ depends on BR2_USE_MMU # dbus
+ depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version
+ select BR2_PACKAGE_DBUS
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBICAL
+ select BR2_PACKAGE_READLINE
+ help
+ bluez utils version 5.x
+
+ With this release BlueZ only supports the new Bluetooth Management kernel
+ interface (introduced in Linux 3.4).
+ For Low Energy support at least kernel version 3.5 is needed.
+
+ The API is not backwards compatible with BlueZ 4.
+
+ Bluez utils will use systemd and/or udev if enabled.
+
+ http://www.bluez.org
+ http://www.kernel.org/pub/linux/bluetooth
+
+if BR2_PACKAGE_BLUEZ5_UTILS
+
+config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
+ bool "build experimental plugins"
+ help
+ Build BlueZ 5.x experimental plugins.
+
+endif
+
+comment "bluez5-utils needs a toolchain w/ wchar, threads"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
new file mode 100644
index 0000000..a557868
--- /dev/null
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -0,0 +1,42 @@
+################################################################################
+#
+# bluez5_utils
+#
+################################################################################
+
+BLUEZ5_UTILS_VERSION = 5.10
+BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
+BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
+BLUEZ5_UTILS_INSTALL_STAGING = YES
+BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2 libical readline
+BLUEZ5_UTILS_CONF_OPT = --enable-test --enable-tools --enable-library
+BLUEZ5_UTILS_AUTORECONF = YES
+BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
+BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
+
+# experimental plugins
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL),y)
+BLUEZ5_UTILS_CONF_OPT += \
+ --enable-experimental
+else
+BLUEZ5_UTILS_CONF_OPT += \
+ --disable-experimental
+endif
+
+# use udev if available
+ifeq ($(BR2_PACKAGE_UDEV),y)
+ BLUEZ5_UTILS_CONF_OPT += --enable-udev
+ BLUEZ5_UTILS_DEPENDENCIES += udev
+else
+ BLUEZ5_UTILS_CONF_OPT += --disable-udev
+endif
+
+# integrate with systemd if available
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+ BLUEZ5_UTILS_CONF_OPT += --enable-systemd
+ BLUEZ5_UTILS_DEPENDENCIES += systemd
+else
+ BLUEZ5_UTILS_CONF_OPT += --disable-systemd
+endif
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] bluez5_utils: new package
2013-11-04 12:59 Marcin Bis
@ 2013-11-04 16:06 ` Thomas De Schampheleire
0 siblings, 0 replies; 14+ messages in thread
From: Thomas De Schampheleire @ 2013-11-04 16:06 UTC (permalink / raw)
To: buildroot
Hi Marcin,
Thanks for your contribution!
Some comments below...
On Mon, Nov 4, 2013 at 1:59 PM, Marcin Bis <marcin@bis.org.pl> wrote:
> This patch adds support for BlueZ 5.x.
>
> API is not backwards compatible with BlueZ 4. It uses kernel interface
> introduces in 3.4 (3.5 for Low Energy).
>
> BlueZ utils will use systemd and/or udev if enabled.
>
> Signed-off-by: Marcin Bis <marcin@bis.org.pl>
> ---
> package/Config.in | 1 +
> package/bluez5_utils/Config.in | 36 +++++++++++++++++++++++++++++
> package/bluez5_utils/bluez5_utils.mk | 42 ++++++++++++++++++++++++++++++++++
> 3 files changed, 79 insertions(+), 0 deletions(-)
> create mode 100644 package/bluez5_utils/Config.in
> create mode 100644 package/bluez5_utils/bluez5_utils.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 4c4da51..0e0fca9 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -768,6 +768,7 @@ source "package/axel/Config.in"
> source "package/bcusdk/Config.in"
> source "package/bind/Config.in"
> source "package/bluez_utils/Config.in"
> +source "package/bluez5_utils/Config.in"
> source "package/bmon/Config.in"
> source "package/boa/Config.in"
> source "package/bridge-utils/Config.in"
> diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
> new file mode 100644
> index 0000000..d2b4910
> --- /dev/null
> +++ b/package/bluez5_utils/Config.in
> @@ -0,0 +1,36 @@
> +config BR2_PACKAGE_BLUEZ5_UTILS
> + bool "bluez-utils 5.x"
> + depends on !BR2_avr32
> + depends on BR2_USE_WCHAR # libglib2
> + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
> + depends on BR2_USE_MMU # dbus
> + depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version
> + select BR2_PACKAGE_DBUS
> + select BR2_PACKAGE_LIBGLIB2
> + select BR2_PACKAGE_LIBICAL
> + select BR2_PACKAGE_READLINE
> + help
> + bluez utils version 5.x
> +
> + With this release BlueZ only supports the new Bluetooth Management kernel
> + interface (introduced in Linux 3.4).
> + For Low Energy support at least kernel version 3.5 is needed.
> +
> + The API is not backwards compatible with BlueZ 4.
> +
> + Bluez utils will use systemd and/or udev if enabled.
> +
> + http://www.bluez.org
> + http://www.kernel.org/pub/linux/bluetooth
> +
> +if BR2_PACKAGE_BLUEZ5_UTILS
> +
> +config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
> + bool "build experimental plugins"
> + help
> + Build BlueZ 5.x experimental plugins.
> +
> +endif
> +
> +comment "bluez5-utils needs a toolchain w/ wchar, threads"
> + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
This comment should repeat the other dependencies of bluez5-utils, so
that the comment is only visible when relevant, so it should become:
comment "bluez5-utils needs a toolchain w/ wchar, threads"
depends on !BR2_avr32 && BR2_USE_MMU && !BR2_PACKAGE_BLUEZ_UTILS
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
This is not properly documented yet, but I have submitted a patch
today to fix all packages and will submit another patch to clarify the
documentation.
Also, I prefer to keep the comment together with the actual config
option, instead of having the 'experimental' part in between.
> diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
> new file mode 100644
> index 0000000..a557868
> --- /dev/null
> +++ b/package/bluez5_utils/bluez5_utils.mk
> @@ -0,0 +1,42 @@
> +################################################################################
> +#
> +# bluez5_utils
> +#
> +################################################################################
> +
> +BLUEZ5_UTILS_VERSION = 5.10
> +BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
> +BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
> +BLUEZ5_UTILS_INSTALL_STAGING = YES
> +BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2 libical readline
> +BLUEZ5_UTILS_CONF_OPT = --enable-test --enable-tools --enable-library
> +BLUEZ5_UTILS_AUTORECONF = YES
> +BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
> +BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
> +
> +# experimental plugins
> +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL),y)
> +BLUEZ5_UTILS_CONF_OPT += \
> + --enable-experimental
> +else
> +BLUEZ5_UTILS_CONF_OPT += \
> + --disable-experimental
In the above cases I don't think it's necessary to wrap the lines (yet).
> +endif
> +
> +# use udev if available
> +ifeq ($(BR2_PACKAGE_UDEV),y)
> + BLUEZ5_UTILS_CONF_OPT += --enable-udev
> + BLUEZ5_UTILS_DEPENDENCIES += udev
> +else
> + BLUEZ5_UTILS_CONF_OPT += --disable-udev
> +endif
> +
> +# integrate with systemd if available
> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> + BLUEZ5_UTILS_CONF_OPT += --enable-systemd
> + BLUEZ5_UTILS_DEPENDENCIES += systemd
> +else
> + BLUEZ5_UTILS_CONF_OPT += --disable-systemd
> +endif
> +
> +$(eval $(autotools-package))
Best regards,
Thomas
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-03-07 23:09 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-23 9:37 [Buildroot] [PATCH] bluez5_utils: new package Alexandre Belloni
2013-12-23 9:50 ` Baruch Siach
2013-12-23 9:54 ` Alexandre Belloni
2013-12-23 9:57 ` Baruch Siach
2013-12-23 10:11 ` Thomas Petazzoni
2013-12-23 10:16 ` Alexandre Belloni
2013-12-23 10:17 ` Baruch Siach
2013-12-23 9:50 ` Thomas Petazzoni
2013-12-23 9:57 ` Thomas Petazzoni
2014-03-07 22:56 ` Thomas Petazzoni
2014-03-07 23:03 ` Alexandre Belloni
2014-03-07 23:09 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2013-11-04 12:59 Marcin Bis
2013-11-04 16:06 ` Thomas De Schampheleire
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox