2016-05-25 6:17 GMT+08:00 Bruce Dubbs <[email protected]>:
> 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
> 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
>
> What I need right now is to get some other eyes on the output. If someone
> could carefully compare the following and see if there are issues I've
> missed, it would help a lot.
>
> LFS sysv:
> http://www.linuxfromscratch.org/lfs/view/development/
> vs
> http://anduin.linuxfromscratch.org/~bdubbs/lfs-book/
>
> LFS systemd:
> http://www.linuxfromscratch.org/lfs/view/systemd/
> vs
> http://anduin.linuxfromscratch.org/~bdubbs/lfs-systemd/
>
> -- Bruce
>
> P.S. IF you have any questions, please do not hesitate to ask.
How doese jhalfs work with this version?
> --
> http://lists.linuxfromscratch.org/listinfo/lfs-dev
> FAQ: http://www.linuxfromscratch.org/faq/
> Unsubscribe: See the above information page
--
http://lists.linuxfromscratch.org/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
