From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Fri, 14 Feb 2020 09:36:02 +0100 From: Michael Olbrich Message-ID: <20200214083602.GB13619@pengutronix.de> References: <20200212101112.8981-1-u.oelmann@pengutronix.de> <20200212203029.t6yyvkzfgu3gxi2y@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200212203029.t6yyvkzfgu3gxi2y@pengutronix.de> Subject: Re: [ptxdist] [PATCH] networkmanager: version bump 1.20.8-> 1.22.6 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?= , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= On Wed, Feb 12, 2020 at 09:30:29PM +0100, Uwe Kleine-K=F6nig wrote: > On Wed, Feb 12, 2020 at 11:11:12AM +0100, Ulrich =D6lmann wrote: > > Two new config options have been added in the meantime (see NetworkMana= ger > > commits [1] & [2]) which are both set to their reasonable default value= s. > > = > > 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 lice= nse 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 =D6lmann > > --- > > rules/networkmanager.make | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > = > > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > > index de0e755b3a5d..86542b6f74e1 100644 > > --- a/rules/networkmanager.make > > +++ b/rules/networkmanager.make > > @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) +=3D networkmana= ger > > # > > # Paths and names > > # > > -NETWORKMANAGER_VERSION :=3D 1.20.8 > > -NETWORKMANAGER_MD5 :=3D c0ceb5ab14bfdfeee07536d94cc5c548 > > +NETWORKMANAGER_VERSION :=3D 1.22.6 > > +NETWORKMANAGER_MD5 :=3D 0f4b493cc0c67f94a2ad3573363eb3b2 > > NETWORKMANAGER :=3D NetworkManager-$(NETWORKMANAGER_VERSION) > > NETWORKMANAGER_SUFFIX :=3D tar.xz > > -NETWORKMANAGER_URL :=3D https://ftp.gnome.org/pub/GNOME/sources/Networ= kManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > > +NETWORKMANAGER_URL :=3D https://ftp.gnome.org/pub/GNOME/sources/Networ= kManager/1.22/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > = > I wonder if it would make sense to use some make magic to derive the > directory name (1.22) from NETWORKMANAGER_VERSION. > = > Hmm, this is more complicated than I thought, the following works: > = > EMPTY =3D > SPACE =3D $(EMPTY) $(EMPTY) > NETWORKMANAGER_MAJOR :=3D $(subst $(SPACE),.,$(wordlist 1, 2, $(subst .,= ,$(NETWORKMANAGER_VERSION)))) > = > or > = > NETWORKMANAGER_V1 =3D $(word 1, $(subst ., ,$(NETWORKMANAGER_VERSION))) > NETWORKMANAGER_V2 =3D $(word 2, $(subst ., ,$(NETWORKMANAGER_VERSION))) > NETWORKMANAGER_MAJOR =3D $(NETWORKMANAGER_V1).$(NETWORKMANAGER_V2) > = > Unless someone can come up with something easier, probably not worth the > effort? There is a much simpler way to do this: NETWORKMANAGER_URL :=3D https://ftp.gnome.org/pub/GNOME/sources/NetworkMana= ger/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGE= R_SUFFIX) We already use this in several other packages. This does not work when a '0' for the patchlevel version is omitted but that's not the case here. Michael -- = 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