On Thu, May 11, 2017 at 08:54:41PM +0200, Robert Schwebel wrote: > NetworkManager 1.8 has a bunch of new functionality; for details, see > https://blogs.gnome.org/lkundrak/2017/05/10/networkmanager-1-8-whats-new/ > > For ptxdist, one of the most interesting features is the removed > dependency to libsoap, which in turn makes it possible to drop the > dependency to libxml2 and sqlite as well. > > Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> > --- > rules/networkmanager.in | 7 ++++--- > rules/networkmanager.make | 12 +++++++----- > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/rules/networkmanager.in b/rules/networkmanager.in > index 36fe00adc..f7ad1c87d 100644 > --- a/rules/networkmanager.in > +++ b/rules/networkmanager.in > @@ -4,6 +4,7 @@ menuconfig NETWORKMANAGER > tristate > # intltool is unconditionally requested by configure > select HOST_INTLTOOL > + select HOST_GLIB
What is this needed for? > select LIBC_M > select LIBC_DL > select LIBC_PTHREAD > @@ -12,18 +13,18 @@ menuconfig NETWORKMANAGER > select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES && > RUNTIME > select GLIB > select GNUTLS > - select LIBGUDEV > select LIBNDP > select LIBNEWT if NETWORKMANAGER_NMTUI > select LIBNL3 > - select LIBSOUP if NETWORKMANAGER_CONCHECK > + select LIBCURL if NETWORKMANAGER_CONCHECK Please keep the list alphabetically sorted. > 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..6fac8a85d 100644 > --- a/rules/networkmanager.make > +++ b/rules/networkmanager.make > @@ -1,6 +1,6 @@ > # -*-makefile-*- > # > -# Copyright (C) 2009 by Robert Schwebel <r.schwe...@pengutronix.de> > +# Copyright (C) 2009, 2017 by Robert Schwebel <r.schwe...@pengutronix.de> > # (C) 2012 by Jan Luebbe <j.lue...@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+ I'm pretty sure this is incomplete. libnm is LGPL, so this should be "GPL-2.0+ AND LGPL-2.0+" or something like that. > +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 \ > + --with-libpsl=no \ --without-libpsl Michael > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMCLI)-nmcli \ > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMTUI)-nmtui \ > --without-valgrind \ > -- > 2.11.0 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
