All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package
@ 2018-09-13 11:56 Grzegorz Blach
  2018-09-13 11:56 ` [Buildroot] [PATCH 2/2] python3: add optional dependency on bluez5_utils-headers Grzegorz Blach
       [not found] ` <20180915000534.210ed343@windsurf>
  0 siblings, 2 replies; 6+ messages in thread
From: Grzegorz Blach @ 2018-09-13 11:56 UTC (permalink / raw)
  To: buildroot

Header files from bluez utils version 5.x.

Separated headers are required to break circular dependencies
when python3 is build with bluetooth support.

Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
---
 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 package/bluez5_utils-headers/Config.in        |  7 ++++++
 .../bluez5_utils_headers.hash                 |  1 +
 .../bluez5_utils_headers.mk                   | 22 +++++++++++++++++++
 5 files changed, 32 insertions(+)
 create mode 100644 package/bluez5_utils-headers/Config.in
 create mode 120000 package/bluez5_utils-headers/bluez5_utils_headers.hash
 create mode 100644 package/bluez5_utils-headers/bluez5_utils_headers.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index e4f30e1981..8a3e934763 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -893,6 +893,7 @@ F:	package/libwebsock/
 F:	package/sofia-sip/
 
 N:	Grzegorz Blach <grzegorz@blach.pl>
+F:	package/bluez5_utils-headers/
 F:	package/python-falcon/
 F:	package/python-mimeparse/
 
diff --git a/package/Config.in b/package/Config.in
index 2810d0497f..5a62cfa03d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1438,6 +1438,7 @@ menu "Networking"
 	source "package/azmq/Config.in"
 	source "package/azure-iot-sdk-c/Config.in"
 	source "package/batman-adv/Config.in"
+	source "package/bluez5_utils-headers/Config.in"
 	source "package/c-ares/Config.in"
 	source "package/canfestival/Config.in"
 	source "package/cgic/Config.in"
diff --git a/package/bluez5_utils-headers/Config.in b/package/bluez5_utils-headers/Config.in
new file mode 100644
index 0000000000..7ae42af930
--- /dev/null
+++ b/package/bluez5_utils-headers/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_BLUEZ5_UTILS_HEADERS
+	bool "bluez5_utils-headers 5.x"
+	help
+	  Header files from bluez utils version 5.x
+
+	  http://www.bluez.org
+	  http://www.kernel.org/pub/linux/bluetooth
diff --git a/package/bluez5_utils-headers/bluez5_utils_headers.hash b/package/bluez5_utils-headers/bluez5_utils_headers.hash
new file mode 120000
index 0000000000..1f489458fe
--- /dev/null
+++ b/package/bluez5_utils-headers/bluez5_utils_headers.hash
@@ -0,0 +1 @@
+../bluez5_utils/bluez5_utils.hash
\ No newline at end of file
diff --git a/package/bluez5_utils-headers/bluez5_utils_headers.mk b/package/bluez5_utils-headers/bluez5_utils_headers.mk
new file mode 100644
index 0000000000..dbab848930
--- /dev/null
+++ b/package/bluez5_utils-headers/bluez5_utils_headers.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# bluez5_utils-headers
+#
+################################################################################
+
+BLUEZ5_UTILS_HEADERS_VERSION = 5.50
+BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
+BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
+BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils
+BLUEZ5_UTILS_HEADERS_LICENSE = GPL-2.0+, LGPL-2.1+
+BLUEZ5_UTILS_HEADERS_LICENSE_FILES = COPYING COPYING.LIB
+
+BLUEZ5_UTILS_HEADERS_INSTALL_STAGING = YES
+BLUEZ5_UTILS_HEADERS_INSTALL_TARGET = NO
+
+define BLUEZ5_UTILS_HEADERS_INSTALL_STAGING_CMDS
+	$(INSTALL) -d $(STAGING_DIR)/usr/include/bluetooth/
+	$(INSTALL) -m 644 $(@D)/lib/*.h $(STAGING_DIR)/usr/include/bluetooth/
+endef
+
+$(eval $(generic-package))
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] python3: add optional dependency on bluez5_utils-headers
  2018-09-13 11:56 [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package Grzegorz Blach
@ 2018-09-13 11:56 ` Grzegorz Blach
       [not found] ` <20180915000534.210ed343@windsurf>
  1 sibling, 0 replies; 6+ messages in thread
From: Grzegorz Blach @ 2018-09-13 11:56 UTC (permalink / raw)
  To: buildroot

When python3 depends on bluez5_utils-headers,
python3 is build with bluetooth support.

Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
---
 package/python3/python3.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 5e94e8e726..913e0773ca 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -255,6 +255,11 @@ endif
 # Provided to other packages
 PYTHON3_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/
 
+# Support for socket.AF_BLUETOOTH
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),y)
+	PYTHON3_DEPENDENCIES += bluez5_utils-headers
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package
       [not found] ` <20180915000534.210ed343@windsurf>
@ 2018-09-17 12:14   ` Grzegorz Blach
  2018-10-21 15:44     ` Arnout Vandecappelle
  0 siblings, 1 reply; 6+ messages in thread
From: Grzegorz Blach @ 2018-09-17 12:14 UTC (permalink / raw)
  To: buildroot

On 9/15/18 12:05 AM, Thomas Petazzoni wrote:
> Hello,
> 
> On Thu, 13 Sep 2018 13:56:55 +0200, Grzegorz Blach wrote:
>> Header files from bluez utils version 5.x.
>>
>> Separated headers are required to break circular dependencies
>> when python3 is build with bluetooth support.
>>
>> Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
> 
> What are the changes compared to the previous iteration ?

- bluez5_utils-headers/bluez5_utils_headers.hash now is a symlink to 
bluez5_utils/bluez5_utils.hash. Previously it was a copy of this file.

- In bluez5_utils_headers.mk I added 'BLUEZ5_UTILS_HEADERS_DL_SUBDIR = 
bluez5_utils', because package bluez5_utils-headers and bluez5_utils 
downloads exactly the same file.

> It is customary to:
> 
>   - Add a patch title prefix which differs for each version. You can do
>     this using 'git format-patch -v2' or 'git format-patch
>     --prefix="PATCH v2"'
> 
>   - Add a changelog of what changed between each version, either in the
>     cover letter (you can generate a template cover letter using git
>     format-patch --cover) or in each patch, below the "---" sign.

Ok, I'll do that with future patches

> Thomas
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package
  2018-09-17 12:14   ` [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package Grzegorz Blach
@ 2018-10-21 15:44     ` Arnout Vandecappelle
  0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2018-10-21 15:44 UTC (permalink / raw)
  To: buildroot

 Hi Gregorz,

On 17/09/2018 13:14, Grzegorz Blach wrote:
> On 9/15/18 12:05 AM, Thomas Petazzoni wrote:
>> Hello,
>>
>> On Thu, 13 Sep 2018 13:56:55 +0200, Grzegorz Blach wrote:
>>> Header files from bluez utils version 5.x.
>>>
>>> Separated headers are required to break circular dependencies
>>> when python3 is build with bluetooth support.
>>>
>>> Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
>>
>> What are the changes compared to the previous iteration ?
> 
> - bluez5_utils-headers/bluez5_utils_headers.hash now is a symlink to
> bluez5_utils/bluez5_utils.hash. Previously it was a copy of this file.
> 
> - In bluez5_utils_headers.mk I added 'BLUEZ5_UTILS_HEADERS_DL_SUBDIR =
> bluez5_utils', because package bluez5_utils-headers and bluez5_utils downloads
> exactly the same file.

 I've reworked both patches a little more and applied to master, thanks.

 The changes are:

- made bluez5_utils-headers a blind option (cfr. mesa3d-headers);
- let python3 select bluez5_utils-headers if bluez5_utils is enabled;
- correct the name of the .mk and .hash files (- instead of _);
- don't indent inside a make condition;
- add a comment in both bluez5_utils and bluez5_utils-headers that the versions
should be kept in sync.


 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package
  2018-09-05 11:39 Grzegorz Blach
@ 2018-09-10 15:56 ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2018-09-10 15:56 UTC (permalink / raw)
  To: buildroot

Grzegorz, All,

On 2018-09-05 13:39 +0200, Grzegorz Blach spake thusly:
> Header files from bluez utils version 5.x.
> 
> Separated headers are required to break circular dependencies
> when python3 is build with bluetooth support.
> 
> Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
> ---
[--SNIP--]
> diff --git a/package/bluez5_utils-headers/bluez5_utils_headers.hash b/package/bluez5_utils-headers/bluez5_utils_headers.hash
> new file mode 100644
> index 0000000000..b965708559
> --- /dev/null
> +++ b/package/bluez5_utils-headers/bluez5_utils_headers.hash
> @@ -0,0 +1,4 @@
> +# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
> +sha256  5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911  bluez-5.50.tar.xz
> +sha256  b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259  COPYING
> +sha256  ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  COPYING.LIB
> diff --git a/package/bluez5_utils-headers/bluez5_utils_headers.mk b/package/bluez5_utils-headers/bluez5_utils_headers.mk
> new file mode 100644
> index 0000000000..9bc463432c
> --- /dev/null
> +++ b/package/bluez5_utils-headers/bluez5_utils_headers.mk
> @@ -0,0 +1,21 @@
> +################################################################################
> +#
> +# bluez5_utils-headers
> +#
> +################################################################################
> +
> +BLUEZ5_UTILS_HEADERS_VERSION = 5.50
> +BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz

Since we are using the same source tarball as for bluez5_utils, we want
to download it and store it only once:

    BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils

Consequently, the hash file should be a symlink to the one from
bluez5_utils.

See for example mesa3d and mesa3d-headers for an example.

Regards,
Yann E. MORIN.

> +BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
> +BLUEZ5_UTILS_HEADERS_LICENSE = GPL-2.0+, LGPL-2.1+
> +BLUEZ5_UTILS_HEADERS_LICENSE_FILES = COPYING COPYING.LIB
> +
> +BLUEZ5_UTILS_HEADERS_INSTALL_STAGING = YES
> +BLUEZ5_UTILS_HEADERS_INSTALL_TARGET = NO
> +
> +define BLUEZ5_UTILS_HEADERS_INSTALL_STAGING_CMDS
> +	$(INSTALL) -d $(STAGING_DIR)/usr/include/bluetooth/
> +	$(INSTALL) -m 644 $(@D)/lib/*.h $(STAGING_DIR)/usr/include/bluetooth/
> +endef
> +
> +$(eval $(generic-package))
> -- 
> 2.17.1
> 
> _______________________________________________
> 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] 6+ messages in thread
* [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package
@ 2018-09-05 11:39 Grzegorz Blach
  2018-09-10 15:56 ` Yann E. MORIN
  0 siblings, 1 reply; 6+ messages in thread
From: Grzegorz Blach @ 2018-09-05 11:39 UTC (permalink / raw)
  To: buildroot

Header files from bluez utils version 5.x.

Separated headers are required to break circular dependencies
when python3 is build with bluetooth support.

Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
---
 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 package/bluez5_utils-headers/Config.in        |  7 +++++++
 .../bluez5_utils_headers.hash                 |  4 ++++
 .../bluez5_utils_headers.mk                   | 21 +++++++++++++++++++
 5 files changed, 34 insertions(+)
 create mode 100644 package/bluez5_utils-headers/Config.in
 create mode 100644 package/bluez5_utils-headers/bluez5_utils_headers.hash
 create mode 100644 package/bluez5_utils-headers/bluez5_utils_headers.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index bd8095bd20..8ea433e930 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -877,6 +877,7 @@ F:	package/libwebsock/
 F:	package/sofia-sip/
 
 N:	Grzegorz Blach <grzegorz@blach.pl>
+F:	package/bluez5_utils-headers/
 F:	package/python-falcon/
 F:	package/python-mimeparse/
 
diff --git a/package/Config.in b/package/Config.in
index 66f303ec58..a1b9300f8b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1427,6 +1427,7 @@ menu "Networking"
 	source "package/azmq/Config.in"
 	source "package/azure-iot-sdk-c/Config.in"
 	source "package/batman-adv/Config.in"
+	source "package/bluez5_utils-headers/Config.in"
 	source "package/c-ares/Config.in"
 	source "package/canfestival/Config.in"
 	source "package/cgic/Config.in"
diff --git a/package/bluez5_utils-headers/Config.in b/package/bluez5_utils-headers/Config.in
new file mode 100644
index 0000000000..7ae42af930
--- /dev/null
+++ b/package/bluez5_utils-headers/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_BLUEZ5_UTILS_HEADERS
+	bool "bluez5_utils-headers 5.x"
+	help
+	  Header files from bluez utils version 5.x
+
+	  http://www.bluez.org
+	  http://www.kernel.org/pub/linux/bluetooth
diff --git a/package/bluez5_utils-headers/bluez5_utils_headers.hash b/package/bluez5_utils-headers/bluez5_utils_headers.hash
new file mode 100644
index 0000000000..b965708559
--- /dev/null
+++ b/package/bluez5_utils-headers/bluez5_utils_headers.hash
@@ -0,0 +1,4 @@
+# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
+sha256  5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911  bluez-5.50.tar.xz
+sha256  b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259  COPYING
+sha256  ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  COPYING.LIB
diff --git a/package/bluez5_utils-headers/bluez5_utils_headers.mk b/package/bluez5_utils-headers/bluez5_utils_headers.mk
new file mode 100644
index 0000000000..9bc463432c
--- /dev/null
+++ b/package/bluez5_utils-headers/bluez5_utils_headers.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# bluez5_utils-headers
+#
+################################################################################
+
+BLUEZ5_UTILS_HEADERS_VERSION = 5.50
+BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
+BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
+BLUEZ5_UTILS_HEADERS_LICENSE = GPL-2.0+, LGPL-2.1+
+BLUEZ5_UTILS_HEADERS_LICENSE_FILES = COPYING COPYING.LIB
+
+BLUEZ5_UTILS_HEADERS_INSTALL_STAGING = YES
+BLUEZ5_UTILS_HEADERS_INSTALL_TARGET = NO
+
+define BLUEZ5_UTILS_HEADERS_INSTALL_STAGING_CMDS
+	$(INSTALL) -d $(STAGING_DIR)/usr/include/bluetooth/
+	$(INSTALL) -m 644 $(@D)/lib/*.h $(STAGING_DIR)/usr/include/bluetooth/
+endef
+
+$(eval $(generic-package))
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-21 15:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-13 11:56 [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package Grzegorz Blach
2018-09-13 11:56 ` [Buildroot] [PATCH 2/2] python3: add optional dependency on bluez5_utils-headers Grzegorz Blach
     [not found] ` <20180915000534.210ed343@windsurf>
2018-09-17 12:14   ` [Buildroot] [PATCH 1/2] bluez5_utils-headers: new package Grzegorz Blach
2018-10-21 15:44     ` Arnout Vandecappelle
  -- strict thread matches above, loose matches on Subject: below --
2018-09-05 11:39 Grzegorz Blach
2018-09-10 15:56 ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.