Răsfoiți Sursa

Revert "package/network-manager: add optional nmcli support"

This reverts commit 5238f51fc86714b9fe861edf6a48cf8952e5eeb7.
It was wrongly pushed to master during a stabilisation preiod.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Yann E. MORIN 3 ani în urmă
părinte
comite
525913b24b

+ 1 - 7
package/network-manager/Config.in

@@ -33,13 +33,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI
 	help
 	help
 	  This option enables terminal based UI
 	  This option enables terminal based UI
 
 
-config BR2_PACKAGE_NETWORK_MANAGER_CLI
-	bool "nmcli support"
-	select BR2_PACKAGE_READLINE
-	help
-	  This option enables support for the NetworkManager Command
-	  Line Interface
-
 config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER
 config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER
 	bool "modem-manager support"
 	bool "modem-manager support"
 	select BR2_PACKAGE_MODEM_MANAGER
 	select BR2_PACKAGE_MODEM_MANAGER
@@ -57,6 +50,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS
 	select BR2_PACKAGE_JANSSON
 	select BR2_PACKAGE_JANSSON
 	help
 	help
 	  This option enables support for OpenVSwitch
 	  This option enables support for OpenVSwitch
+
 endif
 endif
 
 
 comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9"
 comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9"

+ 1 - 1
package/network-manager/network-manager.mk

@@ -142,7 +142,7 @@ else
 NETWORK_MANAGER_CONF_OPTS += --disable-polkit
 NETWORK_MANAGER_CONF_OPTS += --disable-polkit
 endif
 endif
 
 
-ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y)
+ifeq ($(BR2_PACKAGE_READLINE),y)
 NETWORK_MANAGER_DEPENDENCIES += readline
 NETWORK_MANAGER_DEPENDENCIES += readline
 NETWORK_MANAGER_CONF_OPTS += --with-nmcli
 NETWORK_MANAGER_CONF_OPTS += --with-nmcli
 else
 else