[ptxdist] [PATCH v2] networkmanager: version bump 1.4.2 -> 1.6.0

[ptxdist] [PATCH v2] networkmanager: version bump 1.4.2 -> 1.6.0

[Ulrich Ölmann]

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
Changes since v1:
- replaced "--without-config-dhcp-default" with
  "--with-config-dhcp-default=internal"

 rules/networkmanager.make | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index cd4d8da3c1e6..90654d8d268c 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION	:= 1.4.2
-NETWORKMANAGER_MD5	:= 59b5b5585467756787c6cb535cbd306e
+NETWORKMANAGER_VERSION	:= 1.6.0
+NETWORKMANAGER_MD5	:= ccdac1d03133a59065cbb93a09fa54b0
 NETWORKMANAGER		:= NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX	:= tar.xz
-NETWORKMANAGER_URL	:= https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL	:= https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_SOURCE	:= $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_DIR	:= $(BUILDDIR)/$(NETWORKMANAGER)
 
@@ -44,7 +44,7 @@ NETWORKMANAGER_CONF_OPT := \
 	--enable-ifupdown \
 	--disable-ifnet \
 	--disable-code-coverage \
-	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \
+	--$(call ptx/endis,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \
 	--disable-introspection \
 	--disable-qt \
 	--disable-teamdctl \
@@ -70,7 +70,7 @@ NETWORKMANAGER_CONF_OPT := \
 	--with-systemdsystemunitdir=/lib/systemd/system \
 	--with-hostname-persist=default \
 	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \
-	--with-logging-backend-default="" \
+	--with-config-logging-backend-default="" \
 	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-logind \
 	--without-consolekit \
 	--with-session-tracking=no \
@@ -83,6 +83,8 @@ NETWORKMANAGER_CONF_OPT := \
 	--without-ofono \
 	--with-dhclient=/sbin/dhclient \
 	--without-dhcpcd \
+	--without-dhcpcd-supports-ipv6 \
+	--with-config-dhcp-default=internal \
 	--without-resolvconf \
 	--without-netconfig \
 	--with-config-dns-rc-manager-default=file \
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de