[Buildroot] [git commit branch/next] package/network-manager: make readline optional for network-manager
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Sun Nov 14 15:27:33 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=6ad98fab7a2a4f84d9ec38d86af6282f27a4a4c9
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
This removes the hard dependency on readline which is GPL-3.0+ licensed.
If readline is enabled the dependency is added and nmcli is built.
Signed-off-by: Moritz Bitsch <moritz at h6t.eu>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/network-manager/Config.in | 1 -
package/network-manager/network-manager.mk | 9 ++++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 43987451b6..2534963918 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -18,7 +18,6 @@ config BR2_PACKAGE_NETWORK_MANAGER
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_WIRELESS_TOOLS
select BR2_PACKAGE_WIRELESS_TOOLS_LIB
- select BR2_PACKAGE_READLINE
select BR2_PACKAGE_LIBNDP
help
NetworkManager is a set of co-operative tools that make
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index fbd5b1c85c..453d1fc617 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
NETWORK_MANAGER_INSTALL_STAGING = YES
NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \
- libgcrypt wireless_tools util-linux host-intltool readline libndp
+ libgcrypt wireless_tools util-linux host-intltool libndp
NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm)
NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md
NETWORK_MANAGER_CPE_ID_VENDOR = gnome
@@ -49,6 +49,13 @@ else
NETWORK_MANAGER_CONF_OPTS += --disable-concheck
endif
+ifeq ($(BR2_PACKAGE_READLINE),y)
+NETWORK_MANAGER_DEPENDENCIES += readline
+NETWORK_MANAGER_CONF_OPTS += --with-nmcli=yes
+else
+NETWORK_MANAGER_CONF_OPTS += --with-nmcli=no
+endif
+
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
NETWORK_MANAGER_DEPENDENCIES += newt
NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes
More information about the buildroot
mailing list