From 35a5259fe64d197ee8202a38e58db4f3ea5383e9 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 25 May 2016 23:16:12 +0000
Subject: Optimize building merged books

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11076 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/chapter06.xml  | 17 ++++++----
 chapter06/chapter06d.xml | 87 ------------------------------------------------
 chapter06/dbus.xml       |  2 +-
 chapter06/eudev.xml      |  4 +--
 chapter06/sysklogd.xml   |  2 +-
 chapter06/systemd.xml    |  2 +-
 chapter06/sysvinit.xml   |  2 +-
 7 files changed, 17 insertions(+), 99 deletions(-)
 delete mode 100644 chapter06/chapter06d.xml

(limited to 'chapter06')

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 264834493..300e8c57d 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -67,10 +67,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
 
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
-
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
@@ -82,16 +83,20 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
 
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+
+  <!-- sysv only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>-->
   
+  <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
diff --git a/chapter06/chapter06d.xml b/chapter06/chapter06d.xml
deleted file mode 100644
index d08135f7e..000000000
--- a/chapter06/chapter06d.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Chapter 6">
-  <?dbhtml dir="chapter06"?>
-  <?dbhtml filename="chapter06.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/>
-
-</chapter>
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index ee5390137..0448659f6 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-dbus" role="wrap">
+<sect1 id="ch-system-dbus" role="wrap" revision="systemd">
   <?dbhtml filename="dbus.html"?>
 
   <sect1info condition="script">
diff --git a/chapter06/eudev.xml b/chapter06/eudev.xml
index 498ec8c30..2930b8e02 100644
--- a/chapter06/eudev.xml
+++ b/chapter06/eudev.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-eudev" role="wrap">
+<sect1 id="ch-system-eudev" role="wrap" revision="sysv">
   <?dbhtml filename="eudev.html"?>
 
   <sect1info condition="script">
@@ -152,7 +152,7 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-      <varlistentry id="udevadm">
+      <varlistentry id="udevadm" revision="sysv">
         <term><command>udevadm</command></term>
         <listitem>
           <para>Generic udev administration tool: controls the udevd daemon,
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index db76b6c85..d4cf68ecb 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-sysklogd" role="wrap">
+<sect1 id="ch-system-sysklogd" role="wrap" revision="sysv">
   <?dbhtml filename="sysklogd.html"?>
 
   <sect1info condition="script">
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index bbfac9c61..76ed51378 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-systemd" role="wrap">
+<sect1 id="ch-system-systemd" role="wrap" revision="systemd">
   <?dbhtml filename="systemd.html"?>
 
   <sect1info condition="script">
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 33376f7c2..7ef8bc4e6 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-sysvinit" role="wrap">
+<sect1 id="ch-system-sysvinit" role="wrap" revision="sysv">
   <?dbhtml filename="sysvinit.html"?>
 
   <sect1info condition="script">
-- 
cgit v1.2.3-54-g00ecf