On 7/11/19 6:40 PM, Ken Moffat via lfs-dev wrote:
On Tue, Jul 02, 2019 at 10:43:16AM -0500, Bruce Dubbs via lfs-dev wrote:
On 7/2/19 9:42 AM, Pierre Labastie via lfs-dev wrote:
On 02/07/2019 15:10, Wayne Blaszczyk via lfs-dev wrote:
Hi All,
Since yesterday, building the LFS book has been cause some issues for me.
I've been using git rather than svn to keep up to date with the LFS repository.
But recently I've been getting a 'update-index --refresh: command returned
error: 1' when doing a git svn rebase.
I turns out that 'make REV=systemd' keeps regenerating
lfs-bootscripts-20190524.tar.xz .
Has something changed to have caused this?
I've even checked out using svn (svn co
svn://svn.linuxfromscratch.org/LFS/trunk/BOOK) and the issue is there as well.
Md5sum before executing make:
c91b11e366649c9cec60c2552820fed5 lfs-bootscripts-20190524.tar.xz
md5sum after executing make:
cd1ebce5e7b89442f41f85fde5994a38 lfs-bootscripts-20190524.tar.xz
$ svn status
M trunk/BOOK/lfs-bootscripts-20190524.tar.xz
$
I think this has been present for years. The bootscripts are regenerated by
make-aux-files.sh, which is run by aux-file-data.sh, which is itself run at
the end of the "validate" target.
That is correct. In addition the xml in packages.ent has:
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
<!ENTITY lfs-bootscripts-url
"&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">
<!ENTITY lfs-bootscripts-home " ">
<!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB">
and aux-file-data.sh updates those BOOTSCRIPTS entries in an intermediate
file when rendering the book.
The md5sum will change due to datestamps, but the contents do not change
often. When they do, we change <!ENTITY lfs-bootscripts-version "20190524">
in packages.ent.
Note that I just changed the scripts to create .xz tarballs instead of .bz2.
-- Bruce
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@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
--
http://lists.linuxfromscratch.org/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
