Re: [ptxdist] git source checkout checksum error

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

On Thu, Aug 04, 2016 at 06:50:45AM +0000, Gieseler, Christian wrote:
> > -----Ursprüngliche Nachricht-----
> > Von: ptxdist [mailto:ptxdist-bounces@pengutronix.de] Im Auftrag von
> > Michael Olbrich
> > Gesendet: Donnerstag, 4. August 2016 08:39
> > An: ptxdist@pengutronix.de
> > Betreff: Re: [ptxdist] git source checkout checksum error
> > 
> > On Wed, Aug 03, 2016 at 11:06:36AM +0000, Gieseler, Christian wrote:
> > > > Unpacked, as in uncompressed tar match or individual files match?
> > > > If the files match, then the file order or timestamps in the tar may be
> > > > different, or something like that.
> > > I unpacked both tar.bz2 with with tar -xf  and a diff shows no difference.
> > However the filesize of the archeives is different.
> > > du -h centos7/trace-cmd-2.5.2.tar.bz2 -->1.7M
> > > du -h centos6/trace-cmd-2.5.2.tar.bz2 -->3.2M
> > 
> > What does 'file' say about both? Is centos6/trace-cmd-2.5.2.tar.bz2 really
> > a bzip2 file? Maybe it's gzip.
> > 
> file centos6/trace-cmd-2.5.2.tar.bz2  centos6/trace-cmd-2.5.2.tar.bz2: POSIX tar archive
> file centos7/trace-cmd-2.5.2.tar.bz2  centos7/trace-cmd-2.5.2.tar.bz2: bzip2 compressed data, block size = 900k
> 
> Which parameters are you passing to git archive about compression? Are you using the system defaults?

scripts/lib/ptxd_make_get.sh +138

That's basically a 'git config tar.tar.bz2.command "bzip2 -c"'. I think the
command option was introduced with git 1.8.x :-/.

Maybe you could change ptxd_make_get_git() do so something like this:

case "${path}" in
*.bz2)
	cmd="bzip2 -c"
	;;
...
esac
git archive ... | ${cmd}" > "${path}"

make sure 'git archive' produces just tar for all git version when called
like this.

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