From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RYgK4-00061m-NB for ptxdist@pengutronix.de; Thu, 08 Dec 2011 16:55:48 +0100 Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72) (envelope-from ) id 1RYgK4-0004zJ-M8 for ptxdist@pengutronix.de; Thu, 08 Dec 2011 16:55:48 +0100 Date: Thu, 8 Dec 2011 16:55:48 +0100 From: Michael Olbrich Message-ID: <20111208155548.GA18714@pengutronix.de> References: <3944866A166FC34A948C72DD5EDDCA2A1DC6A97C@HQ0SBS01.airtag.local> <20111208153738.GF11859@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [ptxdist] [PATCH] ptxdist-2011.01.0 bug in make ipkg-push Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Thu, Dec 08, 2011 at 10:45:00AM -0500, Jon Ringle wrote: > On Thu, Dec 8, 2011 at 10:37 AM, Michael Olbrich > wrote: > = > > Hi, > > > > so I accidentally pushed it before I could really review it... > > I had some time today and I think it's at least better than before. > > > > On Tue, Nov 29, 2011 at 03:59:41PM +0000, Beno=EEt BURNICHON wrote: > > > Now, ptxd_ipkg_rev_smaller does not enforce a revision to be 1.2.3-4 = but > > > allows everything debian like. > > > > Well, not everything debian like, '~' is not handled correctly, right? > > Maybe something like this: > > ------------------------------------------------------------------------ > > --- libptxdist.sh 2011-12-08 16:11:21.143970557 +0100 > > +++ libptxdist.sh 2011-12-08 16:15:00.300421956 +0100 > > @@ -741,13 +741,14 @@ > > # > > ptxd_ipkg_rev_decimal_convert() { > > local ver=3D$* > > - while echo $ver | grep -q '[^0-9.]' > > + while echo $ver | grep -q '[^0-9.~]' > > do > > - local char=3D`echo -n $ver | sed 's/.*\([^0-9.]\).*/\1/= '` > > + local char=3D`echo -n $ver | sed 's/.*\([^0-9.~]\).*/\1= /'` > > local char_dec=3D`echo -n $char | od -b | head -n 1 | a= wk > > '{print $2}'` > > ver=3D`echo $ver | sed "s/$char/.$char_dec/g"` > > done > > > > + ver=3D`echo $ver | sed -r "s/\.?~/.-1/g"` > > ver=3D`echo $ver | sed 's/\.\./.0/g'` > > > > echo "$ver" > > ------------------------------------------------------------------------ > > > > So I've been thinking about this whole version issue. The next step wou= ld > > be all versions with '-'. Maybe we should always add '-1' as packages > > revision. That would solve the problem for most of the packages is the > > list, you posted some time ago. Or we could add '-1' if the version contains a '-'. > > What remains are 'broken' versions. For those few we could do, e.g.: > > > > MYSQL_VERSION :=3D 5.1.14-beta > > MYSQL_XPKG_VERSION :=3D 5.1.14~beta > > > > Sounds like a good idea. > Seems like the pkg_XPKG_VERSION could be autogenerated based on the > pkg_VERSION so you wouldn't have to update all the package files. If there > is no '-' character in the version then pkg_XPKG_VERSION would be equal to > pkg_VERSION Yes, for most packages I want to reuse _VERSION. _XPKG_VERSION should just be a way to overwrite the default if necessary. Michael -- = 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