From 83ab8cc0bdb3ff376d7c61ceeb0b749f8c142b8a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 24 Mar 2022 00:39:28 -0600 Subject: [PATCH] package/network-manager: bump to version 1.36.4 CONTRIBUTING.md hash changed due to various style updates. Set new default wifi backend config option to iwd when enabled in cases where the default wpa_supplicant is not enabled. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/network-manager/network-manager.hash | 6 +++--- package/network-manager/network-manager.mk | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index d25f0e8194..26bcf843c2 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a90228992c..3479bb3794 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.34 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 +NETWORK_MANAGER_VERSION_MAJOR = 1.36 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 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 @@ -53,8 +53,15 @@ endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd NETWORK_MANAGER_CONF_OPTS += --with-iwd +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd +endif +else +NETWORK_MANAGER_CONF_OPTS += \ + --without-iwd \ + --with-config-wifi-backend-default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y)