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

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

[Petr Vorel]

handle new dependency to Jansson (since 1.10.0).

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
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(-)

diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash
index 3262ad3b00..8fedc64729 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.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
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index caf462e26e..96e5a0b707 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -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
-- 
2.16.1

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

[Petr Vorel]

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 package/network-manager/Config.in          | 6 ++++++
 package/network-manager/network-manager.mk | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 37e9b2fd8c..72658c1278 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -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"
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 96e5a0b707..a520aad9c0 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -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
-- 
2.16.1

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

[Thomas Petazzoni]

Hello,

On Fri,  2 Feb 2018 00:45:15 +0100, Petr Vorel wrote:

> +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
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com

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

[Petr Vorel]

Hi Thomas,

> > +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.

> 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

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

[Peter Korsgaard]

>>>>> "Petr" == Petr Vorel <petr.vorel@gmail.com> writes:

 > Hi Thomas,
 >> > +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.

 >> 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.

-- 
Bye, Peter Korsgaard