Re: [ptxdist] [PATCH] ptxdist-2011.01.0 bug in make ipkg-push

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Thu, Dec 08, 2011 at 05:38:26PM +0000, Benoît BURNICHON wrote:
> 
> 
> > -----Original Message-----
> > From: ptxdist-bounces@pengutronix.de [mailto:ptxdist-
> > bounces@pengutronix.de] On Behalf Of Michael Olbrich
> > Sent: Thursday, December 08, 2011 4:56 PM
> > To: ptxdist@pengutronix.de
> > Subject: Re: [ptxdist] [PATCH] ptxdist-2011.01.0 bug in make ipkg-push
> >
> > On Thu, Dec 08, 2011 at 10:45:00AM -0500, Jon Ringle wrote:
> > > On Thu, Dec 8, 2011 at 10:37 AM, Michael Olbrich
> > > <m.olbrich@pengutronix.de>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ît 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?
> 
> The possibly prepended ':' also is not taken into account.

True, but that's not realy something we care about right now. An since it's
not part of the upstream version, it should be split off in ptxd_ipkg_split
anyways, right?

Hmmm, but the current check fails for versions that do not start with a
number. ptxd_ipkg_rev_decimal_convert returns something starting with '.'.
I'm running a possible fix through a test script right now. It calls
ptxdist quite often, so it'll take a few hours....

> > > > 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=$*
> > > > -       while echo $ver | grep -q '[^0-9.]'
> > > > +       while echo $ver | grep -q '[^0-9.~]'
> > > >        do
> > > > -               local char=`echo -n $ver | sed 's/.*\([^0-9.]\).*/\1/'`
> > > > +               local char=`echo -n $ver | sed
> > > > + 's/.*\([^0-9.~]\).*/\1/'`
> > > >                 local char_dec=`echo -n $char | od -b | head -n 1 |
> > > > awk '{print $2}'`
> > > >                 ver=`echo $ver | sed "s/$char/.$char_dec/g"`
> > > >         done
> > > >
> > > > +       ver=`echo $ver | sed -r "s/\.?~/.-1/g"`
> > > >         ver=`echo $ver | sed 's/\.\./.0/g'`
> > > >
> > > >         echo "$ver"
> > > > --------------------------------------------------------------------
> > > > ----
> > > >
> > > > So I've been thinking about this whole version issue. The next step
> > > > would 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 '-'.
> 
> Couldn't we just replace '-' by '+' in versions? There is not much
> difference in ASCII between the 2, only the ',' comes in between the 2.

I don't really care. Any other opinions?

> >
> > > > What remains are 'broken' versions. For those few we could do, e.g.:
> > > >
> > > > MYSQL_VERSION           := 5.1.14-beta
> > > > MYSQL_XPKG_VERSION      := 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 <PKG>_VERSION.
> > <PKG>_XPKG_VERSION should just be a way to overwrite the default if
> > necessary.
> >
> So replacements would be as follows:
> 
> CANFESTIVAL_VERSION := 3-20081204-1
> MYSQL_VERSION := 5.1.14-beta
> SPEEX_VERSION  := 1.2rc1
> 
> Detection of pre-versions: s/-?\(alpha|beta|gamma|rc\)/~\1/g
> tr/-/+/

And the tr/_/./ we have right now, right? (ptxd_make_xpkg_common).
I'll probably just add it there.

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