package/connman: format opts and deps
PATCH v3 1/4 package/connman: format opts and deps
Use style typical for Buildroot.
---
Changes v2->v3:
* New commit (each logical change should be in a separate commit).
package/connman/connman.mk | 73 +++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 16 deletions(-)
package/connman/connman.mk +57 -16
@@ -11,22 +11,63 @@ CONNMAN_DEPENDENCIES = libglib2 dbus iptables CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING -CONNMAN_CONF_OPTS += \ - --with-dbusconfdir=/etc \ - $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \ - $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \ - $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \ - $(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \ - $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \ - $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \ - $(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \ - $(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \ - $(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system) - -CONNMAN_DEPENDENCIES += \ - $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \ - $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) \ - $(if $(BR2_PACKAGE_CONNMAN_WISPR),gnutls) + +CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc + +ifeq ($(BR2_INIT_SYSTEMD),y) +CONNMAN_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_BLUETOOTH),y) +CONNMAN_CONF_OPTS += --enable-bluetooth +else +CONNMAN_CONF_OPTS += --disable-bluetooth +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_DEBUG),y) +CONNMAN_CONF_OPTS += --enable-debug +else +CONNMAN_CONF_OPTS += --disable-debug +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_ETHERNET),y) +CONNMAN_CONF_OPTS += --enable-ethernet +else +CONNMAN_CONF_OPTS += --disable-ethernet +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_LOOPBACK),y) +CONNMAN_CONF_OPTS += --enable-loopback +else +CONNMAN_CONF_OPTS += --disable-loopback +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_NEARD),y) +CONNMAN_CONF_OPTS += --enable-neard +CONNMAN_DEPENDENCIES += neard +else +CONNMAN_CONF_OPTS += --disable-neard +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_OFONO),y) +CONNMAN_CONF_OPTS += --enable-ofono +CONNMAN_DEPENDENCIES += ofono +else +CONNMAN_CONF_OPTS += --disable-ofono +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_WIFI),y) +CONNMAN_CONF_OPTS += --enable-wifi +else +CONNMAN_CONF_OPTS += --disable-wifi +endif + +ifeq ($(BR2_PACKAGE_CONNMAN_WISPR),y) +CONNMAN_CONF_OPTS += --enable-wispr +CONNMAN_DEPENDENCIES += gnutls +else +CONNMAN_CONF_OPTS += --disable-wispr +endif define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
Signature · 1 line
2.25.1
PATCH v3 2/4 package/connman: bump to 1.38
--- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/connman/connman.hash +1 -1
@@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16 connman-1.37.tar.xz +sha256 cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b connman-1.38.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
package/connman/connman.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.37 +CONNMAN_VERSION = 1.38 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables
Signature · 1 line
2.25.1
Thomas Petazzoni
AppliedPATCH v3 2/4 package/connman: bump to 1.38
Quoted 5 lines · On Fri, 28 Feb 2020 00:29:53 +0100 Petr Vorel <[email protected]> wrote:
Signed-off-by Petr Vorel <[email protected]>--- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 2/4 package/connman: bump to 1.38
In reply to Petr VorelHello,
Quoted 21 lines · Petr Vorel
Signed-off-by Petr Vorel <[email protected]>--- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/connman/connman.hash +1
-1@@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16 connman-1.37.tar.xz +sha256 cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b connman-1.38.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYINGpackage/connman/connman.mk +0
-0
package/connman/connman.mk line 7
Quoted 5 lines
package/connman/connman.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.37 +CONNMAN_VERSION = 1.38
The default build configuration of connman 1.38 uses 'WireGuard' and 'libmnl'.
The current autobuild is broken due to the missing 'libmnl' dependency [1]. A set of patches is already suggested [2] but,
the best way could be a default 'connman' configuration with 'WireGuard' disabled,
before the adding of WireGuard support,
('CONNMAN_CONF_OPTS += --disable-wireguard' in 'package/connman/connman.mk')
so the default build of connman will be ok,
and then, complete the patch.
package/connman/connman.mk line 10
Quoted 3 lines
package/connman/connman.mk +0
-0CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables
[1]
http://autobuild.buildroot.org/results/e66/e66c83d0a9d0f3710907b6f7358d92b69b9e297d/build-end.log
[2] http://patchwork.ozlabs.org/patch/1250994/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200312/1aae888c/attachment.html>
PATCH v3 3/4 package/connman: add iptables/nftables selection
In reply to Petr VorelThis allows to use nftables instead of the default iptables.
---
Changes v2->v3:
* New commit (each logical change should be in a separate commit).
package/connman/Config.in | 22 +++++++++++++++++++++- package/connman/connman.mk | 10 ++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-)
package/connman/Config.in +21 -1
@@ -8,7 +8,6 @@ config BR2_PACKAGE_CONNMAN depends on !BR2_TOOLCHAIN_USES_MUSL # missing res_ninit() select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_IPTABLES help The Connection Manager (ConnMan) project provides a daemon for managing internet connections within embedded devices
@@ -18,6 +17,27 @@ config BR2_PACKAGE_CONNMAN if BR2_PACKAGE_CONNMAN +choice + prompt "Firewall type" + default BR2_PACKAGE_CONNMAN_IPTABLES + help + Select which firewall type is used. + +config BR2_PACKAGE_CONNMAN_IPTABLES + bool "iptables" + select BR2_PACKAGE_IPTABLES + help + Use iptables as firewall. + +config BR2_PACKAGE_CONNMAN_NFTABLES + bool "nftables" + select BR2_PACKAGE_NFTABLES + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + help + Use nftables as firewall. +endchoice + config BR2_PACKAGE_CONNMAN_ETHERNET bool "enable Ethernet support" default y
package/connman/connman.mk +10 -0
@@ -36,6 +36,11 @@ else CONNMAN_CONF_OPTS += --disable-ethernet endif +ifeq ($(BR2_PACKAGE_CONNMAN_IPTABLES),y) +CONNMAN_CONF_OPTS += --with-firewall=iptables +CONNMAN_DEPENDENCIES += iptables +endif + ifeq ($(BR2_PACKAGE_CONNMAN_LOOPBACK),y) CONNMAN_CONF_OPTS += --enable-loopback else
@@ -49,6 +54,11 @@ else CONNMAN_CONF_OPTS += --disable-neard endif +ifeq ($(BR2_PACKAGE_CONNMAN_NFTABLES),y) +CONNMAN_CONF_OPTS += --with-firewall=nftables +CONNMAN_DEPENDENCIES += nftables +endif + ifeq ($(BR2_PACKAGE_CONNMAN_OFONO),y) CONNMAN_CONF_OPTS += --enable-ofono CONNMAN_DEPENDENCIES += ofono
Signature · 1 line
2.25.1
Thomas Petazzoni
AppliedPATCH v3 3/4 package/connman: add iptables/nftables selection
Quoted 6 lines · On Fri, 28 Feb 2020 00:29:54 +0100 Petr Vorel <[email protected]> wrote:
This allows to use nftables instead of the default iptables.
Signed-off-by Petr Vorel <[email protected]>---
Changesv2->v3:
* New commit (each logical change should be in a separate commit).
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 4/4 package/connman: add option to enable/disable WireGuard
In reply to Petr Vorel---
Changes v2->v3:
* New commit (each logical change should be in a separate commit).
package/connman/Config.in | 7 +++++++ package/connman/connman.mk | 7 +++++++ 2 files changed, 14 insertions(+)
package/connman/Config.in +7 -0
@@ -42,6 +42,13 @@ config BR2_PACKAGE_CONNMAN_ETHERNET bool "enable Ethernet support" default y +config BR2_PACKAGE_CONNMAN_WIREGUARD + bool "enable WireGuard support" + select BR2_PACKAGE_LIBMNL + select BR2_PACKAGE_WIREGUARD_TOOLS + help + Enable WireGuard support. + config BR2_PACKAGE_CONNMAN_WIFI bool "enable WiFi support" select BR2_PACKAGE_WPA_SUPPLICANT # runtime
package/connman/connman.mk +7 -0
@@ -72,6 +72,13 @@ else CONNMAN_CONF_OPTS += --disable-wifi endif +ifeq ($(BR2_PACKAGE_CONNMAN_WIREGUARD),y) +CONNMAN_CONF_OPTS += --enable-wireguard +CONNMAN_DEPENDENCIES += libmnl +else +CONNMAN_CONF_OPTS += --disable-wireguard +endif + ifeq ($(BR2_PACKAGE_CONNMAN_WISPR),y) CONNMAN_CONF_OPTS += --enable-wispr CONNMAN_DEPENDENCIES += gnutls
Signature · 1 line
2.25.1
PATCH v3 4/4 package/connman: add option to enable/disable WireGuard
Quoted 14 lines · On Fri, 28 Feb 2020 00:29:55 +0100 Petr Vorel <[email protected]> wrote:
Signed-off-by Petr Vorel <[email protected]>---
Changesv2->v3:
* New commit (each logical change should be in a separate commit).package/connman/Config.in | 7 +++++++ package/connman/connman.mk | 7 +++++++ 2 files changed, 14 insertions(+)package/connman/Config.in +0
-0
package/connman/Config.in config BR2_PACKAGE_CONNMAN_ETHERNET · line 48
Quoted 7 lines
package/connman/Config.in +4
-0@@ -42,6 +42,13 @@ config BR2_PACKAGE_CONNMAN_ETHERNET bool "enable Ethernet support" default y +config BR2_PACKAGE_CONNMAN_WIREGUARD + bool "enable WireGuard support" + select BR2_PACKAGE_LIBMNL + select BR2_PACKAGE_WIREGUARD_TOOLS
You forgot to propagate the dependencies of wireguard-tools, i.e:
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
package/connman/Config.in config BR2_PACKAGE_CONNMAN_ETHERNET · line 51
Quoted 3 lines
package/connman/Config.in +3
-0+ifeq ($(BR2_PACKAGE_CONNMAN_WIREGUARD),y) +CONNMAN_CONF_OPTS += --enable-wireguard +CONNMAN_DEPENDENCIES += libmnl
You don't depend on wireguard-tools here. Is it because wireguard-tools are only a runtime dependency? If so, there should be a comment in the Config.in, like this:
select BR2_PACKAGE_WIREGUARD_TOOLS # runtime
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH v3 1/4 package/connman: format opts and deps
In reply to Petr VorelQuoted 7 lines · On Fri, 28 Feb 2020 00:29:52 +0100 Petr Vorel <[email protected]> wrote:
Use style typical for Buildroot.
Suggested-by Thomas Petazzoni <[email protected]>Signed-off-by Petr Vorel <[email protected]>---
Changesv2->v3:
* New commit (each logical change should be in a separate commit).
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com