[lfs-dev] make keeps modifying lfs-bootscripts-20190524.tar.xz

Ken Moffat zarniwhoop at ntlworld.com
Thu Jul 11 18:58:51 PDT 2019


On Thu, Jul 11, 2019 at 07:22:49PM -0500, Bruce Dubbs via lfs-dev wrote:
> > 
> > Possibly related:
> > 
> > I've just updated my local copy of LFS (previous version was dated
> > 20190629) and I got a conflict in that file:
> > 
> > ken at milliways ~/repos/LFS/trunk/BOOK $svn up
> > Updating '.':
> > Enter passphrase for key '/home/ken/.ssh/id_rsa':
> > U    chapter02/creatingpartition.xml
> > C    lfs-bootscripts-20190524.tar.xz
> > U    chapter06/eudev.xml
> > Updated to revision 11633.
> > Summary of conflicts:
> >    Text conflicts: 1
> > Merge conflict discovered in binary file 'lfs-bootscripts-20190524.tar.xz'.
> > Select: (p) Postpone, (mf) Mark as resolved, (tf) Accept incoming: tf
> > 
> > Solved for the moment, but it seems there was _something_ different.
> > I know that the bootscripts change their md5sum but I've never seen
> > a conflict like this before.
> 
> I added the bootscripts to svn.  I guess that was a mistake.  The tarball is
> generated nightly. It is also generated with a 'make' in the BOOK directory.
> 
> I just deleted it from svn.
> 
>   -- Bruce
> 
Thanks.

ĸen
-- 
This is magic for grown-ups; it has to be hard because we know there's
no such thing as a free goblin.
   -- Pratchett, Stewart & Cohen - The Science of Discworld II


More information about the lfs-dev mailing list