Skip to contentSkip to conversation

package/network-manager: bump to version 1.36.4

PATCH Applied James Hilliard 2 participants 4 messages Mar 24, 2022 – Mar 27, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/network-manager/network-manager.hash |  6 +++---
 package/network-manager/network-manager.mk   | 13 ++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)
package/network-manager/network-manager.hash +3 -3
index d25f0e8194..26bcf843c2 100644
@@ -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
package/network-manager/network-manager.mk +10 -3
index a90228992c..3479bb3794 100644
@@ -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)
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 4 lines · James Hilliard

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.

Applied to master, thanks.

However, I would like to challenge the order of preference here. If you select
network-manager, iwd and wpa_supplicant, and network-manager uses wpa_supplicant, then you end up not using iwd at all, so that was probably not the intention of the user. However, there is a good reason to still have wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant is also used for 802.1X authentication over Ethernet.

Either way, it's pretty hard to guess the intention of the user. So maybe a
Config.in choice is appropriate?

Quoted 40 lines
---
  package/network-manager/network-manager.hash |  6 +++---
  package/network-manager/network-manager.mk   | 13 ++++++++++---
  2 files changed, 13 insertions(+), 6 deletions(-)
package/network-manager/network-manager.hash +3 -3
index d25f0e8194..26bcf843c2 100644
@@ -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
package/network-manager/network-manager.mk +2 -2
index a90228992c..3479bb3794 100644
@@ -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

package/network-manager/network-manager.mk endif · line 64

Quoted 10 lines
package/network-manager/network-manager.mk +8 -1
+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

This is set regardless of whether wpa_supplicant is enabled or not. Are you
sure that's OK?

Regards,
Arnout

package/network-manager/network-manager.mk endif · line 67

Quoted 3 lines
package/network-manager/network-manager.mk +0 -0
  endif
 
  ifeq ($(BR2_PACKAGE_LIBCURL),y)

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
Quoted 9 lines · Arnout Vandecappelle
Quoted 4 lines · James Hilliard

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.

Quoted 8 lines

Applied to master, thanks.

However, I would like to challenge the order of preference here. If you select
network-manager, iwd and wpa_supplicant, and network-manager uses wpa_supplicant, then you end up not using iwd at all, so that was probably not the intention of the user. However, there is a good reason to still have wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant is also used for 802.1X authentication over Ethernet.

This just sets a somewhat sane default, which can be overridden by the config files as with previous versions by setting the network manager config setting:
[device]
wifi.backend=iwd

Note that upstream considers the iwd wifi backend somewhat experimental and defaults to wpa_supplicant even when iwd backend support is enabled.

Quoted 3 lines

Either way, it's pretty hard to guess the intention of the user. So maybe a
Config.in choice is appropriate?

I figured overrides can be just done via overlay for this with a config file.

Quoted 55 lines
Quoted 41 lines
---
  package/network-manager/network-manager.hash |  6 +++---
  package/network-manager/network-manager.mk   | 13 ++++++++++---
  2 files changed, 13 insertions(+), 6 deletions(-)
package/network-manager/network-manager.hash +3 -3
index d25f0e8194..26bcf843c2 100644
@@ -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
package/network-manager/network-manager.mk +2 -2
index a90228992c..3479bb3794 100644
@@ -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

package/network-manager/network-manager.mk endif · line 64

Quoted 10 lines
package/network-manager/network-manager.mk +8 -1
+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

This is set regardless of whether wpa_supplicant is enabled or not. Are you
sure that's OK?

Quoted 6 lines

Regards,
Arnout

Quoted 3 lines
package/network-manager/network-manager.mk +0 -0
  endif
 
  ifeq ($(BR2_PACKAGE_LIBCURL),y)

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
Quoted 19 lines · James Hilliard
Quoted 9 lines · Arnout Vandecappelle
Quoted 4 lines · James Hilliard

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.

Quoted 8 lines

Applied to master, thanks.

However, I would like to challenge the order of preference here. If you select
network-manager, iwd and wpa_supplicant, and network-manager uses wpa_supplicant, then you end up not using iwd at all, so that was probably not the intention of the user. However, there is a good reason to still have wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant is also used for 802.1X authentication over Ethernet.

Quoted 7 lines

This just sets a somewhat sane default, which can be overridden by the config files as with previous versions by setting the network manager config setting:
[device]
wifi.backend=iwd

Note that upstream considers the iwd wifi backend somewhat experimental and defaults to wpa_supplicant even when iwd backend support is enabled.

Good reasons.

Quoted 6 lines
Quoted 4 lines

Either way, it's pretty hard to guess the intention of the user. So maybe a
Config.in choice is appropriate?

I figured overrides can be just done via overlay for this with a config file.

Yes, I agree, better like that than adding an explicit Config.in option which
anyway only sets a default.

Thanks for the explanation!

Regards,
Arnout

Quoted 56 lines
Quoted 56 lines
Quoted 42 lines
---
   package/network-manager/network-manager.hash |  6 +++---
   package/network-manager/network-manager.mk   | 13 ++++++++++---
   2 files changed, 13 insertions(+), 6 deletions(-)
package/network-manager/network-manager.hash +3 -3
index d25f0e8194..26bcf843c2 100644
@@ -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
package/network-manager/network-manager.mk +2 -2
index a90228992c..3479bb3794 100644
@@ -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

package/network-manager/network-manager.mk endif · line 64

Quoted 10 lines
package/network-manager/network-manager.mk +8 -1
+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

This is set regardless of whether wpa_supplicant is enabled or not. Are you
sure that's OK?

Quoted 6 lines
Quoted 6 lines

Regards,
Arnout

Quoted 3 lines
package/network-manager/network-manager.mk +0 -0
   endif
 
   ifeq ($(BR2_PACKAGE_LIBCURL),y)

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot