From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Wed, 19 Feb 2020 20:04:47 +0100 From: Michael Olbrich Message-ID: <20200219190447.GA4597@pengutronix.de> References: <20200219111919.12568-1-u.oelmann@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200219111919.12568-1-u.oelmann@pengutronix.de> Subject: Re: [ptxdist] [PATCH] networkmanager: version bump 1.20.8 -> 1.22.8 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Ulrich =?iso-8859-1?Q?=D6lmann?= On Wed, Feb 19, 2020 at 12:19:19PM +0100, Ulrich =D6lmann 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 ex= act > same file as GNU publishes may help distros that deduplicate the licens= e texts > or hardlink duplicates. > = > [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/6= 9f048bf0ca387d2dc4683cfdfe9d170bfceb52b > [2] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/d= 27fcd07541ae6f524115d5b0f36e14673135ca3 > [3] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/e= 9f2ea6c22f36cb7986d2228763629ed44b9e76b > = > Signed-off-by: Ulrich =D6lmann 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) +=3D networkmanager > # > # Paths and names > # > -NETWORKMANAGER_VERSION :=3D 1.20.8 > -NETWORKMANAGER_MD5 :=3D c0ceb5ab14bfdfeee07536d94cc5c548 > +NETWORKMANAGER_VERSION :=3D 1.22.8 > +NETWORKMANAGER_MD5 :=3D b512b4985fe3b7e0b37fdac7ab5b8284 > NETWORKMANAGER :=3D NetworkManager-$(NETWORKMANAGER_VERSION) > NETWORKMANAGER_SUFFIX :=3D tar.xz > -NETWORKMANAGER_URL :=3D https://ftp.gnome.org/pub/GNOME/sources/NetworkM= anager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > +NETWORKMANAGER_URL :=3D https://ftp.gnome.org/pub/GNOME/sources/NetworkM= anager/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMAN= AGER_SUFFIX) > NETWORKMANAGER_SOURCE :=3D $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_= SUFFIX) > NETWORKMANAGER_DIR :=3D $(BUILDDIR)/$(NETWORKMANAGER) > NETWORKMANAGER_LICENSE :=3D GPL-2.0-or-later AND LGPL-2.0-or-later > -NETWORKMANAGER_LICENSE_FILES :=3D file://COPYING;md5=3Dcbbffd568227ada50= 6640fe950a4823b > +NETWORKMANAGER_LICENSE_FILES :=3D file://COPYING;md5=3Db234ee4d69f5fce44= 86a80fdaf4a4263 > = > # ----------------------------------------------------------------------= ------ > # Prepare > @@ -67,9 +67,11 @@ NETWORKMANAGER_CONF_OPT =3D \ > -Dnetconfig=3Dfalse \ > -Dnmcli=3D$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMCLI) \ > -Dnmtui=3D$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMTUI) \ > + -Dnm_cloud_setup=3Dfalse \ > -Dofono=3Dfalse \ > -Dovs=3Dfalse \ > -Dpolkit=3D$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_POLKIT) \ > + -Dconfig_auth_polkit_default=3Ddefault \ > -Dpolkit_agent=3Dfalse \ > -Dppp=3D$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_PPP) \ > -Dpppd=3D/usr/sbin/pppd \ > -- = > 2.25.0 > = > = > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de -- = 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 ptxdist@pengutronix.de