package/connman : enable build without gnutls dependency
PATCH 1/1 package/connman : enable build without gnutls dependency
- add new configuration option '--enable-wispr' (disabled by default)
- move gnutls dependency to "wispr" config option
Signed-off-by Heiko Abraham <[email protected]>
--- package/connman/Config.in | 14 +++++++++++++- package/connman/connman.mk | 7 ++++++- 2 files changed, 19 insertions(+), 2 deletions(-)
package/connman/Config.in +13 -1
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CONNMAN select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_GNUTLS depends on !BR2_avr32 # no inotify_init1 depends on !BR2_UCLIBC_VERSION_0_9_32 depends on BR2_USE_WCHAR # libglib2 and gnutls
@@ -26,9 +25,22 @@ config BR2_PACKAGE_CONNMAN_ETHERNET config BR2_PACKAGE_CONNMAN_WIFI bool "enable WiFi support" select BR2_PACKAGE_WPA_SUPPLICANT + help + Enable WiFi support (scan and static/dhcp interface setup). ConnMan + detect the start of wpa_supplicant automatically. + +config BR2_PACKAGE_CONNMAN_WISPR + bool "enable WISPr support" + select BR2_PACKAGE_GNUTLS + help + Enable support for (WISPr) Wireless Internet Service Provider roaming. + A RADIUS server is used to authenticate the subscriber's credentials. config BR2_PACKAGE_CONNMAN_BLUETOOTH bool "enable Bluetooth support" + help + Enable Bluetooth (PAN profile) support. The start of bluetoothd is + automatically detected and only a runtime dependency. config BR2_PACKAGE_CONNMAN_LOOPBACK bool "enable loopback support"
package/connman/connman.mk +6 -1
@@ -7,7 +7,7 @@ CONNMAN_VERSION = 1.23 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/ -CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls +CONNMAN_DEPENDENCIES = libglib2 dbus iptables CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPLv2 CONNMAN_LICENSE_FILES = COPYING
@@ -15,6 +15,7 @@ CONNMAN_CONF_OPT += --localstatedir=/var \ $(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) \
@@ -25,6 +26,10 @@ CONNMAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \ $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) +ifeq ($(BR2_PACKAGE_CONNMAN_WISPR),y) +CONNMAN_DEPENDENCIES += gnutls +endif + define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef
Signature · 1 line
1.8.5.2 (Apple Git-48)
PATCH 1/1 package/connman : enable build without gnutls dependency
Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Heiko" == Heiko Abraham <[email protected]> writes:
- add new configuration option '--enable-wispr' (disabled by default)
- move gnutls dependency to "wispr" config optionSigned-off-by Heiko Abraham <[email protected]>--- package/connman/Config.in | 14 +++++++++++++- package/connman/connman.mk | 7 ++++++- 2 files changed, 19 insertions(+), 2 deletions(-)package/connman/Config.in +0
-0
package/connman/Config.in config BR2_PACKAGE_CONNMAN · line 8
Quoted 7 lines
package/connman/Config.in +0
-1@@ -3,7 +3,6 @@ config BR2_PACKAGE_CONNMAN select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_GNUTLS depends on !BR2_avr32 # no inotify_init1 depends on !BR2_UCLIBC_VERSION_0_9_32 depends on BR2_USE_WCHAR # libglib2 and gnutls
This comment should also be updated.
package/connman/Config.in config BR2_PACKAGE_CONNMAN_ETHERNET · line 36
Quoted 13 lines
package/connman/Config.in +9
-0@@ -26,9 +25,22 @@ config BR2_PACKAGE_CONNMAN_ETHERNET config BR2_PACKAGE_CONNMAN_WIFI bool "enable WiFi support" select BR2_PACKAGE_WPA_SUPPLICANT + help + Enable WiFi support (scan and static/dhcp interface setup). ConnMan + detect the start of wpa_supplicant automatically. + +config BR2_PACKAGE_CONNMAN_WISPR + bool "enable WISPr support" + select BR2_PACKAGE_GNUTLS + help + Enable support for (WISPr) Wireless Internet Service Provider roaming.
It imho makes more sense to move (WISPr) to right after the definition of it.
Quoted 32 lines
package/connman/Config.in +4
-0+ A RADIUS server is used to authenticate the subscriber's credentials. config BR2_PACKAGE_CONNMAN_BLUETOOTH bool "enable Bluetooth support" + help + Enable Bluetooth (PAN profile) support. The start of bluetoothd is + automatically detected and only a runtime dependency. config BR2_PACKAGE_CONNMAN_LOOPBACK bool "enable loopback support"package/connman/connman.mk +2
-1@@ -7,7 +7,7 @@ CONNMAN_VERSION = 1.23 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/ -CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls +CONNMAN_DEPENDENCIES = libglib2 dbus iptables CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPLv2 CONNMAN_LICENSE_FILES = COPYING@@ -15,6 +15,7 @@ CONNMAN_CONF_OPT += --localstatedir=/var \ $(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) \
package/connman/connman.mk CONNMAN_DEPENDENCIES += \ · line 31
Quoted 6 lines
package/connman/connman.mk +3
-0@@ -25,6 +26,10 @@ CONNMAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \ $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) +ifeq ($(BR2_PACKAGE_CONNMAN_WISPR),y) +CONNMAN_DEPENDENCIES += gnutls +endif
We might as well use the short form like for neard/ofono.
Committed with these fixes to next, thanks.
Signature · 1 line
Bye, Peter Korsgaard