Bruce Dubbs wrote:
I have created a new branch in svn for merged LFS trunk and systemd sources.If you have a current full repository that you checked out with svn co svn://svn.linuxfromscratch.org/LFS you only need to go to the extraction point and issue 'svn update' To get just the merged version of the book's xml, you can use: svn co svn://svn.linuxfromscratch.org/LFS/branches/merge What I found was a great similarity in the the books. For instance, Chapters 2, 4, and 5 in both books are identical. On the other hand, Chapter 7 is almost completely different. The merge was done in two ways. In come cases, like Chapter 7, a new chapter07/chapter07d.xml index file was created that points to pages specific to systemd. In 18 xml files there are additions to xml tags that look like: <screen revision="sysv"> or <screen revision="systmed">
OK, I've finished testing the merged procedure. With the latest patch from Pierre for jhalfs and some book patches from DJ (lightly modified and committed) for the systemd book, I've been able to build both books with the patched jhalfs.
I did run into a minor build problem on the System V book. I had both perl and e2fsprogs fail because I was using a -j10 parallel make. Both of those are common for both books and they build fine when I edited the script to add -j1 to the make entries. They also built fine at -j10 when I did the systemd book so it is some kind of timing issue. Perhaps we need a note there, but we already have a generic note in Section 4.5 - About SBUs.
I would like to make the switch to make the merged version of the book(s) the default late Sunday. I'd like to get comments from others about the change before then if there are issues.
-- Bruce -- http://lists.linuxfromscratch.org/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
