On Wed, Feb 19, 2020 at 12:19:19PM +0100, Ulrich Ölmann wrote: > Instead of hardcoding NetworkManager's major & minor versions in the URL > derive > that information from the already existing parameter. > > Two new config options have been added in the meantime (see NetworkManager > commits [1] & [2]) which are both set to their reasonable default values. > > The license did not change, but its text was adjusted - citing from > NetworkManagers's commit [3]: > > The update to the GPL text is purely cosmetic. However, shipping the exact > same file as GNU publishes may help distros that deduplicate the license > texts > or hardlink duplicates. > > [1] > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/69f048bf0ca387d2dc4683cfdfe9d170bfceb52b > [2] > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/d27fcd07541ae6f524115d5b0f36e14673135ca3 > [3] > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/e9f2ea6c22f36cb7986d2228763629ed44b9e76b > > Signed-off-by: Ulrich Ölmann <[email protected]>
prepare with all options enabled fails with: Run-time dependency mm-glib found: YES 1.12.6 Run-time dependency mobile-broadband-provider-info found: NO (tried pkgconfig) meson.build:532:2: ERROR: Dependency "mobile-broadband-provider-info" not found, tried pkgconfig Michael > --- > This is an implicit v2 with respect to "networkmanager: version bump 1.20.8-> > 1.22.6" > > rules/networkmanager.make | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > index de0e755b3a5d..037a1735a368 100644 > --- a/rules/networkmanager.make > +++ b/rules/networkmanager.make > @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager > # > # Paths and names > # > -NETWORKMANAGER_VERSION := 1.20.8 > -NETWORKMANAGER_MD5 := c0ceb5ab14bfdfeee07536d94cc5c548 > +NETWORKMANAGER_VERSION := 1.22.8 > +NETWORKMANAGER_MD5 := b512b4985fe3b7e0b37fdac7ab5b8284 > NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) > NETWORKMANAGER_SUFFIX := tar.xz > -NETWORKMANAGER_URL := > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > +NETWORKMANAGER_URL := > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(basename > $(NETWORKMANAGER_VERSION))/$(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 > -NETWORKMANAGER_LICENSE_FILES := > file://COPYING;md5=cbbffd568227ada506640fe950a4823b > +NETWORKMANAGER_LICENSE_FILES := > file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 > > # > ---------------------------------------------------------------------------- > # Prepare > @@ -67,9 +67,11 @@ NETWORKMANAGER_CONF_OPT = \ > -Dnetconfig=false \ > -Dnmcli=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMCLI) \ > -Dnmtui=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMTUI) \ > + -Dnm_cloud_setup=false \ > -Dofono=false \ > -Dovs=false \ > -Dpolkit=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_POLKIT) \ > + -Dconfig_auth_polkit_default=default \ > -Dpolkit_agent=false \ > -Dppp=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_PPP) \ > -Dpppd=/usr/sbin/pppd \ > -- > 2.25.0 > > > _______________________________________________ > ptxdist mailing list > [email protected] -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected]
