diff options
-rw-r--r-- | rules/networkmanager.in | 7 | ||||
-rw-r--r-- | rules/networkmanager.make | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/rules/networkmanager.in b/rules/networkmanager.in index 36fe00adc..547843c26 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -3,6 +3,7 @@ menuconfig NETWORKMANAGER tristate # intltool is unconditionally requested by configure + select HOST_GLIB select HOST_INTLTOOL select LIBC_M select LIBC_DL @@ -12,18 +13,18 @@ menuconfig NETWORKMANAGER select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES && RUNTIME select GLIB select GNUTLS - select LIBGUDEV + select LIBCURL if NETWORKMANAGER_CONCHECK select LIBNDP select LIBNEWT if NETWORKMANAGER_NMTUI select LIBNL3 - select LIBSOUP if NETWORKMANAGER_CONCHECK select LIBUUID select MODEMMANAGER if NETWORKMANAGER_WWAN select PPP if NETWORKMANAGER_PPP select PPP_PLUGINS if NETWORKMANAGER_PPP select READLINE if NETWORKMANAGER_NMCLI select SYSTEMD if NETWORKMANAGER_SYSTEMD_UNIT - select UDEV if RUNTIME + select UDEV + select UDEV_LIBUDEV select WPA_SUPPLICANT if NETWORKMANAGER_WIRELESS && RUNTIME select WPA_SUPPLICANT_CTRL_IFACE_DBUS if NETWORKMANAGER_WIRELESS && RUNTIME prompt "networkmanager " diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 66563d2d3..69a086090 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -1,6 +1,6 @@ # -*-makefile-*- # -# Copyright (C) 2009 by Robert Schwebel <r.schwebel@pengutronix.de> +# Copyright (C) 2009, 2017 by Robert Schwebel <r.schwebel@pengutronix.de> # (C) 2012 by Jan Luebbe <j.luebbe@pengutronix.de> # # See CREDITS for details about who has contributed to this project. @@ -17,13 +17,15 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.6.2 -NETWORKMANAGER_MD5 := 89c975afe19fbac854191edb6e9bcd3b +NETWORKMANAGER_VERSION := 1.8.0 +NETWORKMANAGER_MD5 := de0e70933a17ee6a682e8440015c9b1e NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.8/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) +NETWORKMANAGER_LICENSE := GPL-2.0+ AND LGPL-2.0+ +NETWORKMANAGER_LICENSE_FILES := file://COPYING;md5=cbbffd568227ada506640fe950a4823b # ---------------------------------------------------------------------------- # Prepare @@ -93,7 +95,7 @@ NETWORKMANAGER_CONF_OPT = \ --with-dnssec-trigger=/bin/true \ --with-system-ca-path=/etc/ssl/certs \ --with-kernel-firmware-dir=/lib/firmware \ - --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_CONCHECK)-libsoup \ + --without-libpsl \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMCLI)-nmcli \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMTUI)-nmtui \ --without-valgrind \ |