diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2018-09-17 10:04:27 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-20 08:12:21 +0200 |
| commit | 062a2b70c63cf950c2fe5677f547d0cfa45a7d64 (patch) | |
| tree | 3d579965803fe03eee7d8a47a17ecb433694fa62 /rules/networkmanager.make | |
| parent | 9282ef9f41227231368e2c5cacc115702108fde1 (diff) | |
| download | ptxdist-062a2b70c63cf950c2fe5677f547d0cfa45a7d64.tar.gz ptxdist-062a2b70c63cf950c2fe5677f547d0cfa45a7d64.tar.xz | |
networkmanager: version bump 1.12.2 -> 1.14.0
Also remove patches as those are already in 1.14.0.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
[mol: use --without-... instead of --with-...=no]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/networkmanager.make')
| -rw-r--r-- | rules/networkmanager.make | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 5ee8dcd3e..a84f74ad5 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.12.2 -NETWORKMANAGER_MD5 := 94d02b80b120f166927e6ef242b29a9b +NETWORKMANAGER_VERSION := 1.14.0 +NETWORKMANAGER_MD5 := bedae3bb29bc68825b6c616a68cc6ba9 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.12/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.14/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later @@ -69,14 +69,16 @@ NETWORKMANAGER_CONF_OPT = \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wext \ + --without-iwd \ --without-libnm-glib \ + --with-udev-dir=/usr/lib/udev \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-hostname-persist=default \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \ --with-config-logging-backend-default="" \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-logind \ --without-consolekit \ - --with-session-tracking=no \ + --without-session-tracking \ --with-suspend-resume=$(call ptx/ifdef,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT,systemd,upower) \ --without-selinux \ --without-libaudit \ @@ -89,7 +91,6 @@ NETWORKMANAGER_CONF_OPT = \ --without-dhcpcanon \ --with-dhclient=/usr/sbin/dhclient \ --without-dhcpcd \ - --without-dhcpcd-supports-ipv6 \ --with-config-dhcp-default=internal \ --without-resolvconf \ --without-netconfig \ @@ -102,8 +103,8 @@ NETWORKMANAGER_CONF_OPT = \ --without-libpsl \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMCLI)-nmcli \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMTUI)-nmtui \ - --without-valgrind \ - --without-tests + --without-address-sanitizer \ + --without-valgrind ifdef PTXCONF_NETWORKMANAGER_WWAN NETWORKMANAGER_LDFLAGS := \ |