Skip to contentSkip to conversation

network-manager: Bump to version 1.10.2

PATCH New Petr Vorel 3 participants 5 messages Feb 1, 2018 – Feb 3, 2018

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v2 1/2 network-manager: Bump to version 1.10.2

handle new dependency to Jansson (since 1.10.0).

---
Changes v1->v2:
* Split patch into two (requested by Thomas).

---
 package/network-manager/network-manager.hash |  4 ++--
 package/network-manager/network-manager.mk   | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)
package/network-manager/network-manager.hash +2 -2
index 3262ad3b00..8fedc64729 100644
@@ -1,2 +1,2 @@
-# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.8/NetworkManager-1.8.4.sha256sum
-sha256 625e2eb36386dcae599075226200140d010f213b47f7202d83b3b1a202029212  NetworkManager-1.8.4.tar.xz
+# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.10/NetworkManager-1.10.2.sha256sum
+sha256 169c34f50770e3c96b431f7d2cff654455246f2e6ccd46eccfb4454d4595625b  NetworkManager-1.10.2.tar.xz
package/network-manager/network-manager.mk +9 -2
index caf462e26e..96e5a0b707 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NETWORK_MANAGER_VERSION_MAJOR = 1.8
-NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4
+NETWORK_MANAGER_VERSION_MAJOR = 1.10
+NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2
 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
@@ -75,6 +75,13 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
 endif
 
+ifeq ($(BR2_PACKAGE_JANSSON),y)
+NETWORK_MANAGER_CONF_OPTS += --enable-ovs
+NETWORK_MANAGER_DEPENDENCIES += jansson
+else
+NETWORK_MANAGER_CONF_OPTS += --disable-ovs
+endif
+
 # uClibc by default doesn't have backtrace support, so don't use it
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 NETWORK_MANAGER_CONF_OPTS += --disable-crashtrace
Signature · 1 line
2.16.1
author
#1 lore raw

PATCH v2 2/2 network-manager: Add option OpenVSwitch support

---
 package/network-manager/Config.in          | 6 ++++++
 package/network-manager/network-manager.mk | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
package/network-manager/Config.in +6 -0
index 37e9b2fd8c..72658c1278 100644
@@ -56,6 +56,12 @@ config BR2_PACKAGE_NETWORK_MANAGER_PPPD
 comment "pppd support needs a glibc or uClibc toolchain"
 	depends on BR2_TOOLCHAIN_USES_MUSL
 
+config BR2_PACKAGE_NETWORK_MANAGER_OVS
+	bool "OpenVSwitch support"
+	select BR2_PACKAGE_JANSSON
+	help
+	  This option enables support for OpenVSwitch
+
 endif
 
 comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7, dynamic library"
package/network-manager/network-manager.mk +1 -1
index 96e5a0b707..a520aad9c0 100644
@@ -75,7 +75,7 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
 endif
 
-ifeq ($(BR2_PACKAGE_JANSSON),y)
+ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y)
 NETWORK_MANAGER_CONF_OPTS += --enable-ovs
 NETWORK_MANAGER_DEPENDENCIES += jansson
 else
Signature · 1 line
2.16.1
#2 lore raw

PATCH v2 1/2 network-manager: Bump to version 1.10.2

In reply to Petr Vorel

Hello,

package/network-manager/network-manager.mk ifeq ($(BR2_PACKAGE_DHCPCD),y) · line 83

Quoted 6 lines · Petr Vorel
package/network-manager/network-manager.mk +6 -0
+ifeq ($(BR2_PACKAGE_JANSSON),y)
+NETWORK_MANAGER_CONF_OPTS += --enable-ovs
+NETWORK_MANAGER_DEPENDENCIES += jansson
+else
+NETWORK_MANAGER_CONF_OPTS += --disable-ovs
+endif

It is somewhat weird to introduce this here, and then add an explicit option in a second patch.

Perhaps PATCH 1/2 could just do --disable-ovs unconditionally, and PATCH 2/2 add the rest. If you agree, I can rework locally before applying, I understand it's a lot of nitpicking for such a small change :)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
author
#3 lore raw

PATCH v2 1/2 network-manager: Bump to version 1.10.2

Hi Thomas,

Quoted 9 lines

package/network-manager/network-manager.mk ifeq ($(BR2_PACKAGE_DHCPCD),y) · line 83

Quoted 6 lines
package/network-manager/network-manager.mk +6 -0
+ifeq ($(BR2_PACKAGE_JANSSON),y)
+NETWORK_MANAGER_CONF_OPTS += --enable-ovs
+NETWORK_MANAGER_DEPENDENCIES += jansson
+else
+NETWORK_MANAGER_CONF_OPTS += --disable-ovs
+endif

It is somewhat weird to introduce this here, and then add an explicit option in a second patch.

Oh, you're right.

Quoted 4 lines

Perhaps PATCH 1/2 could just do --disable-ovs unconditionally, and PATCH 2/2 add the rest. If you agree, I can rework locally before applying, I understand it's a lot of nitpicking for such a small change :)

OK, please do it as I'm on a way to Fosdem, so I'd do it next week. Thanks!

Kind regards,
Petr

#4 lore raw

PATCH v2 1/2 network-manager: Bump to version 1.10.2

Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Petr" == Petr Vorel <[email protected]> writes:

Hi Thomas,

Quoted 9 lines

package/network-manager/network-manager.mk ifeq ($(BR2_PACKAGE_DHCPCD),y) · line 83

Quoted 6 lines
package/network-manager/network-manager.mk +6 -0
+ifeq ($(BR2_PACKAGE_JANSSON),y)
+NETWORK_MANAGER_CONF_OPTS += --enable-ovs
+NETWORK_MANAGER_DEPENDENCIES += jansson
+else
+NETWORK_MANAGER_CONF_OPTS += --disable-ovs
+endif

It is somewhat weird to introduce this here, and then add an explicit option in a second patch.

Quoted 8 lines

Oh, you're right.

Quoted 4 lines

Perhaps PATCH 1/2 could just do --disable-ovs unconditionally, and PATCH 2/2 add the rest. If you agree, I can rework locally before applying, I understand it's a lot of nitpicking for such a small change :)

OK, please do it as I'm on a way to Fosdem, so I'd do it next week. Thanks!

Committed both after reworking as suggested by Thomas, thanks.

Signature · 1 line
Bye, Peter Korsgaard