diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
| commit | 11271540bfe6adafbc133caf6b5b902a816f5f02 (patch) | |
| tree | 48df469d4e88c7e6efc0a8f4f8d5a386468ed72b /package/network-manager | |
| parent | 24d6c5258ee38c38f0156b057cecd3cfe7ed7b1d (diff) | |
| parent | 8e5eef6c323c6a928ccea7279b3d9848419b99d9 (diff) | |
| download | buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.tar.gz buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/network-manager')
| -rw-r--r-- | package/network-manager/network-manager.hash | 4 | ||||
| -rw-r--r-- | package/network-manager/network-manager.mk | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 94f3e26784..2861aedc87 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/NetworkManager-1.4.2.sha256sum -sha256 a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204 NetworkManager-1.4.2.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.8/NetworkManager-1.8.0.sha256sum +sha256 fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e NetworkManager-1.8.0.tar.xz diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 6adc9b1ab6..4a05a658b9 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.4 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 +NETWORK_MANAGER_VERSION_MAJOR = 1.8 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES @@ -32,6 +32,20 @@ NETWORK_MANAGER_CONF_OPTS = \ --disable-ifupdown \ --disable-ifnet +ifeq ($(BR2_PACKAGE_OFONO),y) +NETWORK_MANAGER_DEPENDENCIES += ofono +NETWORK_MANAGER_CONF_OPTS += --with-ofono +else +NETWORK_MANAGER_CONF_OPTS += --without-ofono +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +NETWORK_MANAGER_DEPENDENCIES += libcurl +NETWORK_MANAGER_CONF_OPTS += --enable-concheck +else +NETWORK_MANAGER_CONF_OPTS += --disable-concheck +endif + ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes |
