summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2016-05-17 17:37:18 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-05-19 08:36:22 +0200
commit94259ea55b9d72f35f5cf5f3c2f07fddd2914572 (patch)
tree7a7b1324c1f63f7a949b07d3a644aa1883b8a64b
parent74c112c8affd019cf50550d934895984385f16ed (diff)
downloadptxdist-94259ea55b9d72f35f5cf5f3c2f07fddd2914572.tar.gz
ptxdist-94259ea55b9d72f35f5cf5f3c2f07fddd2914572.tar.xz
networkmanager: version bump 1.0.12 -> 1.2.0
Signed-off-by: Ladislav Michl <ladis@linux-mips.org> [mol: fix dependencies] Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/networkmanager.in6
-rw-r--r--rules/networkmanager.make6
2 files changed, 6 insertions, 6 deletions
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index c9caddc8f..dbe7068cc 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -2,19 +2,19 @@
menuconfig NETWORKMANAGER
tristate
+ # intltool is unconditionally requested by configure
+ select HOST_INTLTOOL
select LIBC_M
select LIBC_DL
select LIBC_PTHREAD
select LIBC_RT
- select NCURSES if NETWORKMANAGER_NMTUI
select LIBNEWT if NETWORKMANAGER_NMTUI
select DBUS
- select DBUS_GLIB
select READLINE if NETWORKMANAGER_NMCLI
select LIBUUID
+ select GLIB
select GNUTLS
select LIBNL3
- select HOST_INTLTOOL # why? NLS is disabled!!!
select LIBNDP
select UDEV if RUNTIME
select LIBGUDEV
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 6b042a32a..4697f69df 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
#
# Paths and names
#
-NETWORKMANAGER_VERSION := 1.0.12
-NETWORKMANAGER_MD5 := ebb273456a81ccf9dfaf2461061b0e96
+NETWORKMANAGER_VERSION := 1.2.0
+NETWORKMANAGER_MD5 := d431bad77b68326282249bdb53ade6b4
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
NETWORKMANAGER_SUFFIX := tar.xz
-NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)