On 26/05/2016 01:31, Bruce Dubbs wrote:
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">
The revision= attribute can be added to most tags. This can handle the
changelog issue also.
In one case, chapter06/pkgmgt.xml, I added a <phrase revision="systemd">
construct to changes that only affect a part of a paragraph.
All this is then implemented in the Makefile. A 'make' (or 'make sysv')
builds the normal book and 'make systemd' does what you would think.
the
default destinations are ~/lfs-book and ~/lfs-systemd respectively.
This was a fairly invasive change overall. To implement it on a regular
basis there are still a lot of things to do or at least check:
Validate/fix md5sum extraction
Validate/fix wget-list extraction
Integrate changes into pdf builds
The above should all work now.
Integrate changes into jhalfs
Integrate changes into daily build scripts
Integrate changes into daily currency checks
Integrate changes into daily missing packages checks
Other things that I can't think of right now
I have updated quite a few files in the merge branch and the Makefile
is a lot more concise. This is how you use it.
The make targets are book, pdf, nochunks, validate, wget-list,
md5sums, and dump-commands
If running book, you also get validate, wget-list, and md5sums.
The default target is 'book'. The 'all' target does book, nochunks,
pdf, and dump-commands
If you want the systemd version, you run:
make REV=systemd [target]
If you want to make systemd the default, just
export REV=systemd
The only valid values for REV are 'sysv' and 'systemd'.
The does need a little more testing, but I think we are about there.
The next big step is to fix jhalfs. Once we can validate that the new
structure can build both books, then I can work on fixing the daily
scripts.
Pierre, do you need me to do something for jhalfs?
I've seen you already did ;-)
What do you think if we mode the jhalfs discussion to alfs-discuss?
Pierre
--
http://lists.linuxfromscratch.org/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
