From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] tar: Update to 1.30 (V2)
Date: Wed, 06 Jun 2018 13:32:00 +0100
Message-ID: <ad74f9578ba87824bf9fed38ef159e8f77e79fee.camel@ipfire.org>
In-Reply-To: <fb10fb9d-c59d-1e47-6287-bb4948c528e3@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9023583564417272934=="
List-Id: <development.lists.ipfire.org>

--===============9023583564417272934==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello,

did you test our backup and restore scripts as well? Are they affected by any=
 of
these changes?

-Michael

On Thu, 2018-05-31 at 11:11 +0200, Matthias Fischer wrote:
> Hi,
>=20
> On 29.05.2018 21:36, Michael Tremer wrote:
> > Hi,
> >=20
> > On Tue, 2018-05-29 at 20:42 +0200, Matthias Fischer wrote:
> > > For details see:
> > > https://www.gnu.org/software/tar/
> > >=20
> > > Second attempt to update 'tar' to 1.30.
> > > ...
> > >  lfs/Config       | 8 +++-----
> > >  lfs/cdrom        | 5 ++---
> > >  lfs/core-updates | 7 +++----
> > >  lfs/tar          | 6 +++---
> > >  make.sh          | 4 ++--
> > >  5 files changed, 13 insertions(+), 17 deletions(-)
> > >=20
> > > diff --git a/lfs/Config b/lfs/Config
> > > index cf70f81f9..8e8e5879b 100644
> > > --- a/lfs/Config
> > > +++ b/lfs/Config
> > > @@ -205,13 +205,11 @@ define PAK
> > >  	sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e
> > > 's/MACHINE/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES
> > >  	sed -e 's/xxxKVERxxx/$(KVER)/g' -i
> > > /install/packages/package/install.sh
> > >  	chmod 755 /install/packages/package/{{,un}install,update}.sh
> > > -	cd / && tar cf /install/packages/package/files.tmp --files-
> > > from=3D/install/packages/package/ROOTFILES --exclude=3D'#*' \
> > > -		-p --numeric-owner
> > > +	cd / && tar cfp /install/packages/package/files.tmp --numeric-
> > > owner
> > > --exclude=3D'#*' --files-from=3D/install/packages/package/ROOTFILES
> > >  	# Double tar to remove double files
> > > -	tar xf /install/packages/package/files.tmp -C
> > > /install/packages/package/tmp/ \
> > > -		-p --numeric-owner
> > > +	tar xfp /install/packages/package/files.tmp --numeric-owner -C
> > > /install/packages/package/tmp/
> > >  	rm -f /install/packages/package/files.tmp
> > > -	cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner
> > > * |
> > > xz $(XZ_OPT) > /install/packages/package/files.tar.xz
> > > +	cd /install/packages/package/tmp/ && tar cJp --numeric-owner * |
> > > xz
> > > $(XZ_OPT) > /install/packages/package/files.tar.xz
> >=20
> > You are introducing another -J parameter here again which will cause the
> > tarball
> > to be compressed twice.
>=20
> Yep. Now I saw this too. I should have checked the logs a little more
> closely. Overlooked this.
>=20
> > > ...
> > > diff --git a/lfs/cdrom b/lfs/cdrom
> > > index 00f185d81..6382034b5 100644
> > > --- a/lfs/cdrom
> > > +++ b/lfs/cdrom
> > > ...
> > > diff --git a/lfs/tar b/lfs/tar
> > > index 6a949a003..4e914b535 100644
> > > --- a/lfs/tar
> > > +++ b/lfs/tar
>=20
>=20
> > >  ...
> > > diff --git a/make.sh b/make.sh
> > > index bfcfbc3e4..1050eb03b 100755
> > > --- a/make.sh
> > > +++ b/make.sh
> > > @@ -1785,8 +1785,8 @@ toolchain)
> > >  	buildtoolchain
> > >  	echo "`date -u '+%b %e %T'`: Create toolchain image for
> > > ${BUILD_ARCH}" | tee -a $LOGFILE
> > >  	test -d $BASEDIR/cache/toolchains || mkdir -p
> > > $BASEDIR/cache/toolchains
> > > -	cd $BASEDIR && tar -cf- --exclude=3D'log/_build.*.log'
> > > build/${TOOLS_DIR} build/bin/sh log | xz ${XZ_OPT} \
> > > -		> cache/toolchains/$SNAME-$VERSION-toolchain-
> > > $TOOLCHAINVER-
> > > ${BUILD_ARCH}.tar.xz
> > > +	cd $BASEDIR && XZ_OPT=3D"$(XZ_OPT)" tar -Jc --
> > > exclude=3D'log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolch=
ain-
> > > $TOOLCHAINVER-${BUILD_ARCH}.tar.xz --xz \
> > > +		build/${TOOLS_DIR} build/bin/sh log >> $LOGFILE
> >=20
> > This bit also reverts some of the previous changes.
>=20
> Yep. Hm! Too bad. I was a bit too fast in committing. I'm dropping the
> changes for 'make.sh' and try to make only the changes necessary for
> 'tar 1.30' in 'Config', 'cdrom' and 'core-updates'.
> I updated the branch and rebuild.
>=20
> > Are you sure you worked on next?
>=20
> Yes. Definitely.
>=20
> Best,
> Matthias

--===============9023583564417272934==--