[REVIEW:3-5] fix download and unpack-sources for .xz source tarballs
Petr Mladek
pmladek at suse.cz
Mon Apr 16 08:55:25 PDT 2012
Petr Mladek píše v Pá 13. 04. 2012 v 18:36 +0200:
> Petr Mladek píše v Pá 13. 04. 2012 v 18:00 +0200:
> > Korrawit Pruegsanusak píše v Pá 13. 04. 2012 v 22:40 +0700:
> > > Hello again Petr,
> > >
> > > On Fri, Apr 13, 2012 at 21:34, Petr Mladek <pmladek at suse.cz> wrote:
> > > > "the scripts "download" and "unpack-sources" needed some changes to work
> > > > with the newly generated .xz source tarballs [snip]
> > >
> > > And I think that ./unpack-sources line 87 should be removed as well.
> > > Because we don't have 'bootstrap' now. :-)
> > > http://cgit.freedesktop.org/libreoffice/core/tree/bin/unpack-sources#n87
> >
> > I did my best to update the stuff for download but I did not test it. My
> > changes are step forward but it seems that they are not enough. If you
> > want, you could improve it. Otherwise, I will look at it the following
> > week.
ok, so the download started to work with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae9a98b436e7ee9c246b85d8e9bb4ff94732f3b8
It was more complicated because the core.ver file got deleted by
configure. Also solenv/inc/minor.mk could not be sourced into the shell
because of brackets in the RSCREVISION variable. Anyway, it works now.
So, we need to cherry-pick two commits:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f780859b76263638b9227122e465b0c629c7ca3e
http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae9a98b436e7ee9c246b85d8e9bb4ff94732f3b8
The merged commit for -3-5 is attached.
If you want to test it, you need to copy the attached sources.ver into
the libreoffice-core-3.5.2.2 sources. It will be generated for the next
release, see the change in bin/lo-pack-sources.
Best Regards,
Petr
More information about the LibreOffice
mailing list