Diff [560065f976e371779928dbf8b9428217f3f57331:675606bde2ba53946537b42a5aa576692a311621] for / – LFS Trac

Makefile

-              r560065f
+              r675606b
   PDF_OUTPUT      ?= LFS-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-BOOK.html
   DUMPDIR         ?= ~/lfs-commands
+  DUMPDIR         ?= ~/cross-lfs-commands
 else
   BASEDIR         ?= ~/lfs-systemd
 …
         $(Q)mkdir -p $(BASEDIR)/stylesheets
         $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-        $(Q)pushd $(BASEDIR)/ > /dev/null;                     \
-#       sed -i -e "s@../stylesheets@stylesheets@g" *.html; \
-       popd > /dev/null
         $(Q)mkdir -p $(BASEDIR)/images

appendices/dependencies.xml

-              r560065f
+              r675606b
       </segmentedlist>
 <!-- Begin Gcc dependency info -->
   <bridgehead renderas="sect2" id="gcc-dep">Gcc</bridgehead>
+<!-- Begin GCC dependency info -->
+  <bridgehead renderas="sect2" id="gcc-dep">GCC</bridgehead>
       <segmentedlist>
 …
         <seglistitem>
          <seg>Binutils, Coreutils, Gcc, and Python</seg>
+         <seg>Binutils, Coreutils, GCC, and Python</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Binutils, Coreutils, Gcc, Make, and Perl</seg>
+         <seg>Binutils, Coreutils, GCC, Make, and Perl</seg>
         </seglistitem>
       </segmentedlist>

chapter01/changelog.xml

-              r560065f
+              r675606b
     <listitem>
+      <para>2020-06-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Split Chapter 5 into three separate chapters.
+          Implement a new method of cross-building the LFS tool chain
+          and other tools to simplify the method of isolating the
+          new system from the original host.  This will be the start of
+          LFS-10.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
       <para>2020-06-03</para>
       <itemizedlist>
 …
           <para>[pierre] - Pass -Wno-format-overflow to systemd to
           prevent an error with GCC 10.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>2020-05-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Patch GCC pass 2 to allow cross-compile
+          (specific to new cross method).</para>
         </listitem>
       </itemizedlist>

chapter01/how.xml

-              r560065f
+              r675606b
   <xref linkend="chapter-final-preps"/> carefully as it explains several
   important issues you need be aware of before beginning to
   work your way through <xref linkend="chapter-temporary-tools"/> and beyond.</para>
+  work your way through <xref linkend="chapter-cross-tools"/> and beyond.</para>
+  <para><xref linkend="chapter-temporary-tools"/> explains the
+  installation of a number of packages that will form the basic
+  development suite (or toolchain) which is used to build the actual
+  system in <xref linkend="chapter-building-system"/>. Some of these
+  packages are needed to resolve circular dependencies&mdash;for example,
+  to compile a compiler, you need a compiler.</para>
+  <para><xref linkend="chapter-cross-tools"/>,  explains the installation of
+  the initial tool chain, (binutils, gcc, and glibc) using cross compilation
+  techniques to isolate the new tools from the host system.</para>
+  <para><xref linkend="chapter-temporary-tools"/> also shows you how to
+  build a first pass of the toolchain, including Binutils and GCC (first pass
+  basically means these two core packages will be reinstalled).
+  The next step is to build Glibc, the C library. Glibc will be compiled by
+  the toolchain programs built in the first pass. Then, a second pass of the
+  toolchain will be built. This time, the toolchain will be dynamically linked
+  against the newly built Glibc. The remaining <xref
+  linkend="chapter-temporary-tools"/> packages are built using this second
+  pass toolchain. When this is done, the LFS installation process will no
+  longer depend on the host distribution, with the exception of the running
+  kernel. </para>
+  <para><xref linkend="chapter-temporary-tools"/> shows you how to
+  cross-compile basic utilities using the just built cross-toolchain.</para>
+  <para><xref linkend="chapter-chroot-temporary-tools"/> then enters a
+  "chroot" environment and uses the previously built tools to build
+  the additional tools needed to build and test the final system.</para>
   <para>This effort to isolate the new system from the host distribution may
   seem excessive. A full technical explanation as to why this is done is provided in
   <xref linkend="ch-tools-toolchaintechnotes"/>.</para>
+  seem excessive. A full technical explanation as to why this is done is
+  provided in <xref linkend="ch-tools-toolchaintechnotes"/>.</para>
+  <para>In <xref linkend="chapter-building-system"/>, the full LFS system is
+  built. The <command>chroot</command> (change root) program is used to enter
+  a virtual environment and start a new shell whose root directory will be
+  set to the LFS partition. This is very similar to rebooting and instructing
+  the kernel to mount the LFS partition as the root partition. The system
+  does not actually reboot, but instead uses <command>chroot</command> because
+  creating a bootable system requires additional work which is not necessary
+  just yet. The major advantage is that <quote>chrooting</quote> allows you
+  to continue using the host system while LFS is being built. While waiting
+  for package compilations to complete, you can continue using your computer as
+  normal.</para>
+  <para>In <xref linkend="chapter-building-system"/>, The
+  full LFS system is built. Another advantage provided by the chroot
+  environment is that it allows you to continue using the host system
+  while LFS is being built. While waiting for package compilations to
+  complete, you can continue using your computer as normal.</para>
   <para>To finish the installation, the basic system configuration is set up in

chapter01/whatsnew.xml

-              r560065f
+              r675606b
   <title>What's new since the last release</title>
+  <para>In this version of LFS, there has been a major reorganization
+  of the book using techniques that avoid changing the host system
+  and provides a more straight forward build process.</para>
   <para>Below is a list of package updates made since the previous
   release of the book.</para>

chapter02/creatingfilesystem.xml

-              r560065f
+              r675606b
 <screen role="nodump"><userinput>mkfs -v -t ext4 /dev/<replaceable>&lt;xxx&gt;</replaceable></userinput></screen>
-<!--
   <para>Replace <replaceable>&lt;xxx&gt;</replaceable> with the name of the LFS
+  partition (<filename class="devicefile">sda5</filename> in our previous
+  example).</para>
+  partition.</para>
-  <note>
-    <para>Some host distributions use custom features in their filesystem
-    creation tools (E2fsprogs). This can cause problems when booting into your new
-    LFS in Chapter&nbsp;9, as those features will not be supported by the LFS-installed
-    E2fsprogs; you will get an error similar to <quote>unsupported filesystem
-    features, upgrade your e2fsprogs</quote>. To check if your host system
-    uses custom enhancements, run the following command:</para>
-<screen role="nodump"><userinput>debugfs -R feature /dev/<replaceable>&lt;xxx&gt;</replaceable></userinput></screen>
-    <para>If the output contains features other than
-    <option>has_journal</option>, <option>ext_attr</option>,
-    <option>resize_inode</option>, <option>dir_index</option>,
-    <option>filetype</option>, <option>sparse_super</option>,
-    <option>large_file</option> or <option>needs_recovery</option>, then your
-    host system may have custom enhancements.  In that case, to avoid later
-    problems, you should compile the stock E2fsprogs package and use the
-    resulting binaries to re-create the filesystem on your LFS partition:</para>
-<screen role="nodump"><userinput>cd /tmp
-tar -xzvf /path/to/sources/e2fsprogs-&e2fsprogs-version;.tar.gz
-cd e2fsprogs-&e2fsprogs-version;
-mkdir -v build
-cd build
-../configure
-make #note that we intentionally don't 'make install' here!
-./misc/mke2fs -jv /dev/<replaceable>&lt;xxx&gt;</replaceable>
-cd /tmp
-rm -rfv e2fsprogs-&e2fsprogs-version;</userinput></screen>
-  </note>
--->
   <para>If you are using an existing <systemitem class="filesystem">swap
   </systemitem> partition, there is no need to format it. If a new

chapter02/creatingpartition.xml

-              r560065f
+              r675606b
   is to use an available empty partition or, if you have enough unpartitioned
   space, to create one.</para>
-<!--
-  <para>It is possible to install an LFS system (in fact even multiple LFS
-  systems) on a partition already occupied by another
-  operating system and the different systems will co-exist peacefully. The
-  document <ulink url="&hints-root;lfs_next_to_existing_systems.txt"/>
-  contains notes on how to implement this. This document was last updated
-  in 2004. It has not been updated since and it has not been tested with
-  recent versions of this LFS book. The document is more than likely not
-  usable as-is and you will need to account for changes made to the LFS
-  procedures since it was written. This is only recommended for expert LFS
-  users.</para>
--->
   <para>A minimal system requires a partition of around 10 gigabytes (GB).
 …
   <para>Requests for advice on system partitioning are often posted on the LFS mailing
   lists.  This is a highly subjective topic.  The default for most distributions
+  lists. This is a highly subjective topic.  The default for most distributions
   is to use the entire drive with the exception of one small swap partition.  This
   is not optimal for LFS for several reasons.  It reduces flexibility, makes
 …
     <para>A root LFS partition (not to be confused with the
     <filename class="directory">/root</filename> directory) of
     ten gigabytes is a good compromise for most systems.  It provides enough
+    twenty gigabytes is a good compromise for most systems.  It provides enough
     space to build LFS and most of BLFS, but is small enough so that multiple
     partitions can be easily created for experimentation.</para> </sect3>
 …
     swapping.</para>
+    <para>Swapping is never good.  Generally you can tell if a system is
+    swapping by just listening to disk activity and observing how the system
+    reacts to commands.  The first reaction to swapping should be to check for
+    an unreasonable command such as trying to edit a five gigabyte file.  If
+    swapping becomes a normal occurrence, the best solution is to purchase more
+    RAM for your system.</para>
+    </sect3>
+    <para>If you want to use the hibernation feature (suspend-to-disk) of Linux,
+    it writes out the contents of RAM to the swap partition before turning off
+    the machine. In this case the size of the swap partition should be at
+    least as large as the system's installed RAM.</para>
+    <para>Swapping is never good. For mechanical hard drives you can generally
+    tell if a system is swapping by just listening to disk activity and
+    observing how the system reacts to commands.  For an SSD drive you will not
+    be able to hear swapping but you can tell how much swap space is being used
+    by the <command>top</command> or <command>free</command> programs.  Use of
+    an SSD drive for a swap partition should be avoided if possible.  The first
+    reaction to swapping should be to check for an unreasonable command such as
+    trying to edit a five gigabyte file. If swapping becomes a normal
+    occurrence, the best solution is to purchase more RAM for your
+    system.</para> </sect3>
     <sect3>
 …
       store kernels and other booting information.  To minimize potential boot
       problems with larger disks, make this the first physical partition on
       your first disk drive.  A partition size of 100 megabytes is quite
+      your first disk drive.  A partition size of 200 megabytes is quite
       adequate.</para></listitem>
 …
       <listitem><para>/usr &ndash; A separate /usr partition is generally used
       if providing a server for a thin client or diskless workstation.  It is
       normally not needed for LFS.  A size of five gigabytes will handle most
+      normally not needed for LFS.  A size of ten gigabytes will handle most
       installations.</para></listitem>

chapter02/stages.xml

-              r560065f
+              r675606b
     <itemizedlist>
       <listitem>
          <para>Procedures done as the root user after Section 2.4 need to
          have the LFS environment variable set <emphasis>FOR THE ROOT
          USER</emphasis>.</para>
+        <para>Procedures done as the root user after Section 2.4 need to
+        have the LFS environment variable set <emphasis>FOR THE ROOT
+        USER</emphasis>.</para>
       </listitem>
     </itemizedlist>
 …
   <sect2>
+  <title>Chapter&nbsp;5</title>
+  <title>Chapter&nbsp;5&ndash;6</title>
+    <itemizedlist>
+      <listitem>
+        <para>The /mnt/lfs partition must be mounted.</para>
+      </listitem>
+      <listitem>
+        <para>Threse two chapters must be done as user <emphasis>lfs</emphasis>.
+        A <command>su - lfs</command> needs to be done before any task in these
+        chapters. Failing to do that, you are at risk of installing packages to the
+        host, and potentially rendering it unusable.</para>
+      </listitem>
+      <listitem>
+         <para>The procedures in <xref linkend='ch-tools-generalinstructions'/>
+         are critical.  If there is any
+         doubt about installing a package, ensure any previously expanded
+         tarballs are removed, then re-extract the package files, and complete all
+         instructions in that section.</para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+  <sect2>
+  <title>Chapter&nbsp;7&ndash;10</title>
     <itemizedlist>
 …
       <listitem>
+         <para><emphasis>ALL</emphasis> instructions in Chapter&nbsp;5
+         must be done by user <emphasis>lfs</emphasis>.
+         A  <command>su - lfs</command> needs to be done before any
+         task in Chapter&nbsp;5.</para>
+      </listitem>
+      <listitem>
+         <para>The procedures in <xref linkend='ch-tools-generalinstructions'/>
+         are critical.  If there is any
+         doubt about installing a package, ensure any previously expanded
+         tarballs are removed, re-extract the package files, and complete all
+         instructions in that section.</para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+  <sect2>
+  <title>Chapters&nbsp;6&ndash;8</title>
+    <itemizedlist>
+      <listitem>
+         <para>The /mnt/lfs partition must be mounted.</para>
+        <para>A few operations, from <quote>Changing Ownership</quote> to
+        <quote>Entering the Chroot Environment</quote> must be done as the
+        root user, with the LFS envirnment variable set for the root user.</para>
       </listitem>
       <listitem>
          <para> When entering chroot, the LFS environment variable must be set
          for root.  The LFS variable is not used otherwise.</para>
+         for root. The LFS variable is not used afterwards.</para>
       </listitem>

chapter03/patches.xml

-              r560065f
+              r675606b
       </listitem>
     </varlistentry>
+<!--
+    <varlistentry>
+      <term>Flex Fixes Patch - <token>&flex-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&flex-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&flex-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+-->
+<!--
+    <varlistentry>
+      <term>Gccc ASAN Patch - <token>&gcc-asan-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-asan-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-asan-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+-->
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
 …
       </listitem>
     </varlistentry>
+<!--
     <varlistentry>
       <term>Glibc Glob Security Patch - <token>&glibc-glob-patch-size;</token>:</term>
+      <term>GCC Cross Build Fix Patch - <token>&gcc-cross-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&glibc-glob-patch;"/></para>
         <para>MD5 sum: <literal>&glibc-glob-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&gcc-cross-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-cross-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
 …
       </listitem>
     </varlistentry>
+<!--
+    <varlistentry>
+      <term>Ninja Limit Jobs Patch - <token>&ninja-limit-jobs-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&ninja-limit-jobs-patch;"/></para>
+        <para>MD5 sum: <literal>&ninja-limit-jobs-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+-->
+<!--
+    <varlistentry>
+      <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+-->
     <varlistentry revision="sysv">
       <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
 …
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry revision="systemd">
-      <term>Systemd Consolidated Patch - <token>&systemd-consolidated-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-consolidated-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-consolidated-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
     <varlistentry revision="systemd">

chapter04/aboutsbus.xml

-              r560065f
+              r675606b
   <para>The SBU measure works as follows. The first package to be compiled
   from this book is Binutils in <xref linkend="chapter-temporary-tools"/>. The
+  from this book is binutils in <xref linkend="chapter-cross-tools"/>. The
   time it takes to compile this package is what will be referred to as the
   Standard Build Unit or SBU. All other compile times will be expressed relative
 …
   <para>For example, consider a package whose compilation time is 4.5
   SBUs. This means that if a system took 10 minutes to compile and
   install the first pass of Binutils, it will take
+  install the first pass of binutils, it will take
   <emphasis>approximately</emphasis> 45 minutes to build this example package.
   Fortunately, most build times are shorter than the one for Binutils.</para>
+  Fortunately, most build times are shorter than the one for binutils.</para>
   <para>In general, SBUs are not entirely accurate because they depend on many
 …
     make" by either setting an environment variable or telling the
     <command>make</command> program how many processors are available.  For
     instance, a Core2Duo can support two simultaneous processes with:</para>
+    instance, an Intel i5-6500 CPU can support four simultaneous processes with:</para>
     <screen role="nodump"><userinput>export MAKEFLAGS='-j 2'</userinput></screen>
+    <screen role="nodump"><userinput>export MAKEFLAGS='-j4'</userinput></screen>
     <para>or just building with:</para>
     <screen role="nodump"><userinput>make -j2</userinput></screen>
+    <screen role="nodump"><userinput>make -j4</userinput></screen>
     <para>When multiple processors are used in this way, the SBU units in the

chapter04/abouttestsuites.xml

-              r560065f
+              r675606b
   <para>Some test suites are more important than others. For example,
   the test suites for the core toolchain packages&mdash;GCC, Binutils, and
   Glibc&mdash;are of the utmost importance due to their central role in a
   properly functioning system. The test suites for GCC and Glibc can
+  the test suites for the core toolchain packages&mdash;GCC, binutils, and
+  glibc&mdash;are of the utmost importance due to their central role in a
+  properly functioning system. The test suites for GCC and glibc can
   take a very long time to complete, especially on slower hardware, but
   are strongly recommended.</para>
   <note>
+    <para>Experience has shown that there is little to be gained from running
+    the test suites in <xref linkend="chapter-temporary-tools"/>. There can be
+    no escaping the fact that the host system always exerts some influence on
+    the tests in that chapter, often causing inexplicable failures. Because
+    the tools built in <xref linkend="chapter-temporary-tools"/> are temporary
+    and eventually discarded, we do not recommend running the test suites in
+    <xref linkend="chapter-temporary-tools"/> for the average reader. The
+    instructions for running those test suites are provided for the benefit of
+    testers and developers, but they are strictly optional.</para>
+    <para>Running the test suites in <xref linkend="chapter-cross-tools"/>
+    and <xref linkend="chapter-temporary-tools"/>
+    is impossible, since the programs are compiled with a cross-compiler,
+    so are not supposed to be able to run on the build host.</para>
   </note>
   <para>A common issue with running the test suites for Binutils and GCC
+  <para>A common issue with running the test suites for binutils and GCC
   is running out of pseudo terminals (PTYs). This can result in a high
   number of failing tests. This may happen for several reasons, but the

chapter04/addinguser.xml

-              r560065f
+              r675606b
   <para>When logged in as user <systemitem class="username">root</systemitem>,
   making a single mistake can damage or destroy a system. Therefore, we
   recommend building the packages in the next chapter as an unprivileged user.
+  making a single mistake can damage or destroy a system. Therefore,
+  the packages in the next two chapters are built as an unprivileged user.
   You could use your own user name, but to make it easier to set up a clean
   working environment, create a new user called <systemitem
 …
       <term><parameter>lfs</parameter></term>
       <listitem>
         <para>This is the actual name for the created group and user.</para>
+        <para>This is the actual name for the created user.</para>
       </listitem>
     </varlistentry>
 …
   <para>Grant <systemitem class="username">lfs</systemitem> full access to
   <filename class="directory">$LFS/tools</filename> by making
+  all directories under <filename class="directory">$LFS</filename> by making
   <systemitem class="username">lfs</systemitem> the directory owner:</para>
+<screen><userinput>chown -v lfs $LFS/tools</userinput></screen>
+<screen><userinput>chown -v lfs $LFS/{usr,lib,var,etc,bin,sbin,tools}
+case $(uname -m) in
+  x86_64) chown -v lfs $LFS/lib64 ;;
+esac</userinput></screen>
   <para>If a separate working directory was created as suggested, give
 …
   <para>Next, login as user <systemitem class="username">lfs</systemitem>.
   This can be done via a virtual console, through a display manager, or with
   the following substitute user command:</para>
+  the following substitute/switch user command:</para>
 <screen role="nodump"><userinput>su - lfs</userinput></screen>

chapter04/chapter04.xml

r560065f	r675606b
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
15	15	<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlfs.xml"/>-->
16		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creating~~toolsdir~~.xml"/>
	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingminlayout.xml"/>
17	17	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
18	18	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>

chapter04/introduction.xml

r560065f	r675606b
12	12
13	13	<para>In this chapter, we will perform a few additional tasks to prepare
14		for building the temporary system. We will create a ~~directory~~ in
	14	for building the temporary system. We will create a set of directories in
15	15	<filename class="directory">$LFS</filename> for the installation of the
16	16	temporary tools, add an unprivileged user to reduce risk,

chapter04/settingenviron.xml

-              r560065f
+              r675606b
 LC_ALL=POSIX
 LFS_TGT=$(uname -m)-lfs-linux-gnu
+PATH=/tools/bin:/bin:/usr/bin
+PATH=/usr/bin
+if [ ! -L /bin ]; then PATH=/bin:$PATH; fi
+PATH=$LFS/tools/bin:$PATH
 export LFS LC_ALL LFS_TGT PATH</literal>
 EOF</userinput></screen>
   <variablelist>
     <title>The meaning of the command line options in <filename>.bashrc</filename></title>
+    <title>The meaning of the settings in <filename>.bashrc</filename></title>
     <varlistentry>
 …
   the shell will always search the <envar>PATH</envar> when a program is to
   be run. As such, the shell will find the newly compiled tools in
   <filename class="directory">$LFS/tools</filename> as soon as they are
+  <filename class="directory">~/tools</filename> as soon as they are
   available without remembering a previous version of the same program in a
   different location.</para>
 …
     <varlistentry>
       <term><parameter>PATH=/tools/bin:/bin:/usr/bin</parameter></term>
+      <term><parameter>PATH=/usr/bin</parameter></term>
       <listitem>
+  <para>By putting <filename class="directory">/tools/bin</filename> ahead of the
+  standard <envar>PATH</envar>, all the programs installed in <xref
+  linkend="chapter-temporary-tools"/> are picked up by the shell immediately after
+  their installation. This, combined with turning off hashing, limits the risk
+  that old programs are used from the host when the same programs are available in
+  the Chapter 5 environment.</para>
+  <para>Many modern linux distributions have merged <filename
+  class="directory">/bin</filename> and <filename
+  class="directory">/usr/bin</filename>. When this is the case, the standard
+  <envar>PATH</envar> variable needs just to be set to <filename
+  class="directory">/usr/bin/</filename> for the <xref
+  linkend="chapter-temporary-tools"/> environment. When this is not the
+  case, the following line adds <filename class="directory">/bin</filename>
+  to the path.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><parameter>if [ ! -L /bin ]; then PATH=/bin:$PATH; fi</parameter></term>
+      <listitem>
+  <para>If <filename class="directory">/bin</filename> is not a symbolic
+  link, then it has to be added to the <envar>PATH</envar> variable.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><parameter>PATH=$LFS/tools/bin:$PATH</parameter></term>
+      <listitem>
+  <para>By putting <filename class="directory">$LFS/tools/bin</filename> ahead of the
+  standard <envar>PATH</envar>, the cross-compiler installed at the beginning
+  of <xref linkend="chapter-cross-tools"/> is picked up by the shell
+  immediately after its installation. This, combined with turning off hashing,
+  limits the risk that the compiler from the host be used instead of the
+  cross-compiler.</para>
       </listitem>
     </varlistentry>
 …
       <listitem>
         <para>While the above commands have set some variables, in order
         to make them visible within any sub-shells, we export them</para>
+        to make them visible within any sub-shells, we export them.</para>
       </listitem>
     </varlistentry>

chapter05/binutils-pass1.xml

-              r560065f
+              r675606b
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../chapter06/binutils.xml"
+    href="../chapter08/binutils.xml"
     xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 …
       <seglistitem>
         <seg>&binutils-ch5p1-sbu;</seg>
         <seg>&binutils-ch5p1-du;</seg>
+        <seg>&binutils-tmpp1-sbu;</seg>
+        <seg>&binutils-tmpp1-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
       the configuration, up to and including the first install. To achieve
       this easily, wrap the commands in a <command>time</command>
       command like this: <userinput>time { ./configure ... &amp;&amp; ...
+      command like this: <userinput>time { ./configure ... &amp;&amp; make
       &amp;&amp; make install; }</userinput>.</para>
     </note>
-    <note><para>The approximate build SBU values and required disk space
-    in Chapter&nbsp;5 does not include test suite data.</para></note>
     <para>Now prepare Binutils for compilation:</para>
 <screen><userinput remap="configure">../configure --prefix=/tools            \
+<screen><userinput remap="configure">../configure --prefix=$LFS/tools       \
              --with-sysroot=$LFS        \
-             --with-lib-path=/tools/lib \
              --target=$LFS_TGT          \
              --disable-nls              \
 …
       <varlistentry>
         <term><parameter>--prefix=/tools</parameter></term>
+        <term><parameter>--prefix=$LFS/tools</parameter></term>
         <listitem>
           <para>This tells the configure script to prepare to install the
           Binutils programs in the <filename class="directory">/tools</filename>
           directory.</para>
+          binutils programs in the <filename
+          class="directory">$LFS/tools</filename> directory.</para>
         </listitem>
       </varlistentry>
 …
       <varlistentry>
-        <term><parameter>--with-lib-path=/tools/lib</parameter></term>
-        <listitem>
-          <para>This specifies which library path the linker should be
-          configured to use.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term><envar>--target=$LFS_TGT</envar></term>
         <listitem>
 …
           variable is slightly different than the value returned by the
           <command>config.guess</command> script, this switch will tell the
           <command>configure</command> script to adjust Binutil's build system
+          <command>configure</command> script to adjust binutil's build system
           for building a cross linker.  </para>
         </listitem>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>Compilation is now complete. Ordinarily we would now run the
-    test suite, but at this early stage the test suite framework (Tcl,
-    Expect, and DejaGNU) is not yet in place. The benefits of running the
-    tests at this point are minimal since the programs from this
-    first pass will soon be replaced by those from the second.</para>
-    <para>If building on x86_64, create a symlink to ensure the sanity of
-    the toolchain:</para>
-<screen><userinput remap="install">case $(uname -m) in
-  x86_64) mkdir -v /tools/lib &amp;&amp; ln -sv lib /tools/lib64 ;;
-esac</userinput></screen>
     <para>Install the package:</para>

chapter05/chapter05.xml

-              r560065f
+              r675606b
 ]>
 <chapter id="chapter-temporary-tools" xreflabel="Chapter&nbsp;5">
+<chapter id="chapter-cross-tools" xreflabel="Chapter&nbsp;5">
   <?dbhtml dir="chapter05"?>
   <?dbhtml filename="chapter05.html"?>
   <title>Constructing a Temporary System</title>
+  <title>Compiling a Cross-Toolchain</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="glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils-pass2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-pass2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.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="ncurses.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="bison.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="file.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="gawk.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="grep.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="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="perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.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="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="util-linux.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="stripping.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changingowner.xml"/>
 </chapter>

chapter05/gcc-pass1.xml

-              r560065f
+              r675606b
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../chapter06/gcc.xml"
+    href="../chapter08/gcc.xml"
     xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 …
       <seglistitem>
         <seg>&gcc-ch5p1-sbu;</seg>
         <seg>&gcc-ch5p1-du;</seg>
+        <seg>&gcc-tmpp1-sbu;</seg>
+        <seg>&gcc-tmpp1-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <title>Installation of Cross GCC</title>
     <para>GCC now requires the GMP, MPFR and MPC packages. As these packages may
+    <para>GCC requires the GMP, MPFR and MPC packages. As these packages may
     not be included in your host distribution, they will be built with
     GCC.  Unpack each package into the GCC source directory and rename the
 …
 mv -v mpc-&mpc-version; mpc</userinput></screen>
+    <para>The following command will change the location of GCC's default
+    dynamic linker to use the one installed in <filename
+    class="directory">/tools</filename>. It also removes <filename
+    class="directory">/usr/include</filename> from GCC's include search path.
+    Issue:</para>
+<screen><userinput remap="pre">for file in gcc/config/{linux,i386/linux{,64}}.h
+do
+  cp -uv $file{,.orig}
+  sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&amp;@g' \
+      -e 's@/usr@/tools@g' $file.orig &gt; $file
+  echo '
+#undef STANDARD_STARTFILE_PREFIX_1
+#undef STANDARD_STARTFILE_PREFIX_2
+#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"
+#define STANDARD_STARTFILE_PREFIX_2 ""' &gt;&gt; $file
+  touch $file.orig
+done</userinput></screen>
+    <para>In case the above seems hard to follow, let's break it down a bit.
+    First we copy the files <filename>gcc/config/linux.h</filename>,
+    <filename>gcc/config/i386/linux.h</filename>, and
+    <filename>gcc/config/i386/linux64.h</filename> to a file of
+    the same name but with an added suffix of <quote>.orig</quote>. Then the
+    first sed expression prepends <quote>/tools</quote> to every instance of
+    <quote>/lib/ld</quote>, <quote>/lib64/ld</quote> or
+    <quote>/lib32/ld</quote>, while the second one replaces hard-coded
+    instances of <quote>/usr</quote>. Next, we add our define statements which
+    alter the default startfile prefix to the end of the file. Note that the
+    trailing <quote>/</quote> in <quote>/tools/lib/</quote> is required.
+    Finally, we use <command>touch</command> to update the timestamp on the
+    copied files.  When used in conjunction with <command>cp -u</command>, this
+    prevents unexpected changes to the original files in case the commands are
+    inadvertently run twice.</para>
+    <para>Finally, on x86_64 hosts, set the default directory name for
+    <para>On x86_64 hosts, set the default directory name for
 -bit libraries to <quote>lib</quote>:</para>
 …
 esac</userinput></screen>
-<!--
-    <para>GCC doesn't detect stack protection correctly, which causes problems
-    for the build of Glibc-&glibc-version;, so fix that by issuing the following
-    command:</para>
-<screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen>
--->
-<!--
-    <para>Also fix a problem identified upstream:</para>
-<screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
--->
     <para>The GCC documentation recommends building GCC
     in a dedicated build directory:</para>
 …
 <screen><userinput remap="configure">../configure                                       \
     --target=$LFS_TGT                              \
     --prefix=/tools                                \
+    --prefix=$LFS/tools                            \
     --with-glibc-version=2.11                      \
     --with-sysroot=$LFS                            \
     --with-newlib                                  \
     --without-headers                              \
+    --with-local-prefix=/tools                     \
+    --with-native-system-header-dir=/tools/include \
+    --enable-initfini-array                        \
     --disable-nls                                  \
     --disable-shared                               \
 …
       <varlistentry>
+        <term><parameter>--with-local-prefix=/tools</parameter></term>
+        <listitem>
+          <para>The local prefix is the location in the system that GCC will search
+          for locally installed include files. The default is <filename>/usr/local</filename>.
+          Setting this to <filename>/tools</filename> helps keep the host location of
+          <filename>/usr/local</filename> out of this GCC's search path.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--with-native-system-header-dir=/tools/include</parameter></term>
+        <listitem>
+          <para>By default, GCC searches <filename>/usr/include</filename> for
+          system headers. In conjunction with the sysroot switch, this would
+          normally translate to <filename>$LFS/usr/include</filename>. However
+          the headers that will be installed in the next two sections will go
+          to <filename>$LFS/tools/include</filename>. This switch ensures that
+          gcc will find them correctly. In the second pass of GCC, this same
+          switch will ensure that no headers from the host system are
+          found.</para>
+        <term><parameter>--enable-initfini-array</parameter></term>
+        <listitem>
+          <para>This switch forces the use of some internal data structures
+          that are needed but cannot be detected when building a cross
+          compiler.</para>
         </listitem>
       </varlistentry>
 …
         <listitem>
           <para>This switch forces GCC to link its internal libraries
+          statically. We do this to avoid possible issues with the host
+          system.</para>
+          statically. We need this because the shared libraries require glibc,
+          which is not yet installed on the target system.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--disable-multilib</parameter></term>
+        <listitem>
+          <para>On x86_64, LFS does not support a multilib configuration.
+          This switch is harmless for x86.</para>
         </listitem>
       </varlistentry>
 …
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
               --disable-libatomic, --disable-libgomp, <!--- -disable-libmpx,-->
+              --disable-libatomic, --disable-libgomp,
         --disable-libquadmath, --disable-libssp, --disable-libvtv,
         --disable-libstdcxx</parameter></term>
         <listitem>
           <para>These switches disable support for the decimal floating point
           extension, threading, libatomic, libgomp, <!--libmpx, --> libquadmath, libssp,
+          extension, threading, libatomic, libgomp, libquadmath, libssp,
           libvtv, and the C++ standard library respectively. These features
           will fail to compile when building a cross-compiler and are not
 …
       <varlistentry>
-        <term><parameter>--disable-multilib</parameter></term>
-        <listitem>
-          <para>On x86_64, LFS does not yet support a multilib configuration.
-          This switch is harmless for x86.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term><parameter>--enable-languages=c,c++</parameter></term>
         <listitem>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>Compilation is now complete. At this point, the test suite would
-    normally be run, but, as mentioned before, the test suite framework is
-    not in place yet. The benefits of running the tests at this point
-    are minimal since the programs from this first pass will soon be
-    replaced.</para>
     <para>Install the package:</para>
+<screen><userinput remap="install">make install</userinput></screen>
+<!--
+    <para>Using <parameter>- -disable-shared</parameter> means that the
+    <filename>libgcc_eh.a</filename> file isn't created and installed. The
+    Glibc package depends on this library as it uses
+    <parameter>-lgcc_eh</parameter> within its build system. This dependency
+    can be satisfied by creating a symlink to <filename>libgcc.a</filename>,
+    since that file will end up containing the objects normally contained in
+    <filename>libgcc_eh.a</filename>:</para>
+<screen><userinput remap="install">ln -sv libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | sed 's/libgcc/&amp;_eh/'`</userinput></screen>
+-->
+    <screen><userinput remap="install">make install</userinput></screen>
+    <para>This build of GCC has installed a couple of internal system
+    headers.  Normally one of them, <filename>limits.h</filename>, would in turn
+    include the corresponding system <filename>limits.h</filename> header, in
+    this case, <filename>$LFS/usr/include/limits.h</filename>. However, at the
+    time of this build of GCC <filename>$LFS/usr/include/limits.h</filename>
+    does not exist, so the internal header that has just been installed is a
+    partial, self-contained file and does not include the extended features of
+    the system header. This is adequate for building glibc, but the full
+    internal header will be needed later.  Create a full version of the internal
+    header using a command that is identical to what the GCC build system does
+    in normal circumstances:</para>
+<screen><userinput remap="install">cd ..
+cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
+  `dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/install-tools/include/limits.h</userinput></screen>
   </sect2>

chapter05/generalinstructions.xml

-              r560065f
+              r675606b
     <para>Several of the packages are patched before compilation, but only when
     the patch is needed to circumvent a problem. A patch is often needed in
     both this and the next chapter, but sometimes in only one or the other.
+    both this and the following chapters, but sometimes in only one location.
     Therefore, do not be concerned if instructions for a downloaded patch seem
     to be missing.  Warning messages about <emphasis>offset</emphasis> or
 …
           <para>Place all the sources and patches in a directory that will be
           accessible from the chroot environment such as
           <filename class="directory">/mnt/lfs/sources/</filename>.  Do
+          <filename class="directory">/mnt/lfs/sources/</filename>.<!-- Do
           <emphasis>not</emphasis> put sources in
           <filename class="directory">/mnt/lfs/tools/</filename>.</para>
+          <filename class="directory">/mnt/lfs/tools/</filename>. --></para>
         </listitem>
         <listitem>
 …
             <listitem>
               <para>Using the <command>tar</command> program, extract the package
               to be built.  In Chapter&nbsp;5, ensure you are the <emphasis>lfs</emphasis>
               user when extracting the package.</para>
+              to be built.  In Chapters 5 and 6, ensure you are
+              the <emphasis>lfs</emphasis> user when extracting the package.</para>
             </listitem>
             <listitem>

chapter05/glibc.xml

-              r560065f
+              r675606b
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../chapter06/glibc.xml"
+    href="../chapter08/glibc.xml"
     xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 …
       <seglistitem>
         <seg>&glibc-ch5-sbu;</seg>
         <seg>&glibc-ch5-du;</seg>
+        <seg>&glibc-tmp-sbu;</seg>
+        <seg>&glibc-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <title>Installation of Glibc</title>
+    <para>First, create a symbolic link for LSB compliance. Additionally,
+    for x86_64, create a compatibility symbolic link required for proper
+    operation of the dynamic library loader:</para>
+<screen><userinput remap="pre">case $(uname -m) in
+    i?86)   ln -sfv ld-linux.so.2 $LFS/lib/ld-lsb.so.3
+    ;;
+    x86_64) ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
+            ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3
+    ;;
+esac</userinput></screen>
+    <para>Some of the Glibc programs use the non-FHS compliant
+    <filename class="directory">/var/db</filename> directory to store their
+    runtime data. Apply the following patch to make such programs store their
+    runtime data in the FHS-compliant locations:</para>
+<screen><userinput remap="pre">patch -Np1 -i ../glibc-&glibc-version;-fhs-1.patch</userinput></screen>
     <para>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
 …
 <screen><userinput remap="configure">../configure                             \
       --prefix=/tools                    \
+      --prefix=/usr                      \
       --host=$LFS_TGT                    \
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
+      --with-headers=/tools/include</userinput></screen>
+      --with-headers=$LFS/usr/include    \
+      libc_cv_slibdir=/lib</userinput></screen>
 <!--
       libc_cv_forced_unwind=yes          \
 …
         <listitem>
           <para>The combined effect of these switches is that Glibc's build system
           configures itself to cross-compile, using the cross-linker and
+          configures itself to be cross-compiled, using the cross-linker and
           cross-compiler in <filename class="directory">/tools</filename>.</para>
         </listitem>
 …
       <varlistentry>
+        <term><parameter>--with-headers=/tools/include</parameter></term>
+        <listitem>
+          <para>This tells Glibc to compile itself against the headers recently
+          installed to the tools directory, so that it knows exactly what
+          features the kernel has and can optimize itself accordingly.</para>
+        </listitem>
+      </varlistentry>
+<!--
+      <varlistentry>
+        <term><parameter>libc_cv_forced_unwind=yes</parameter></term>
+        <listitem>
+          <para>The linker installed during
+          <xref linkend="ch-tools-binutils-pass1"/> was cross-compiled and as
+          such cannot be used until Glibc has been installed.  This means that
+          the configure test for force-unwind support will fail, as it relies on
+          a working linker.  The libc_cv_forced_unwind=yes variable is passed in
+          order to inform <command>configure</command> that force-unwind
+          support is available without it having to run the test.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>libc_cv_c_cleanup=yes</parameter></term>
+        <listitem>
+          <para>Similarly, we pass libc_cv_c_cleanup=yes through to the
+          <command>configure</command> script so that the test is skipped and C
+          cleanup handling support is configured.</para>
+        </listitem>
+      </varlistentry>
+-->
+<!--  <varlistentry>
+        <term><parameter>libc_cv_ctors_header=yes</parameter></term>
+        <listitem>
+          <para>Similarly, we pass libc_cv_ctors_header=yes through to the
+          <command>configure</command> script so that the test is skipped and
+          gcc constructor support is configured.</para>
+        </listitem>
+      </varlistentry>-->
+        <term><parameter>--with-headers=$LFS/usr/include</parameter></term>
+        <listitem>
+          <para>This tells Glibc to compile itself against the headers
+          recently installed to the $LFS/usr/include directory, so that
+          it knows exactly what features the kernel has and can optimize
+          itself accordingly.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>libc_cv_slibdir=/lib</parameter></term>
+        <listitem>
+          <para>This ensures that the library is installed in /lib instead
+          of the default /lib64 on 64 bit machines.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 …
     <para>Install the package:</para>
+<screen><userinput remap="install">make install</userinput></screen>
+  <caution>
+    <para>At this point, it is imperative to stop and ensure that the basic
+    functions (compiling and linking) of the new toolchain are working as
+    expected. To perform a sanity check, run the following commands:</para>
+    <warning><para>If <envar>LFS</envar> is not properly set, and despite the
+    recommendations, you are building as root, the next command will install
+    the newly built glibc to your host system, which most likely will render it
+    unusable. So double check that the environment is correctly set for user
+    <systemitem class="username">lfs</systemitem>.</para></warning>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+    <variablelist>
+      <title>The meaning of the <command>make install</command> option:</title>
+      <varlistentry>
+        <term><parameter>DESTDIR=$LFS</parameter></term>
+        <listitem>
+          <para>The <envar>DESTDIR</envar> make variable is used by almost all
+          packages to define the location where the package should be
+          installed. If it is not set, it defaults to the root (<filename
+          class="directory">/</filename>) directory. Here we specify that
+          the package be installed in <filename class="directory">$LFS
+          </filename>, which will become the root after <xref linkend=
+          "ch-tools-chroot"/>.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <caution>
+      <para>At this point, it is imperative to stop and ensure that the basic
+      functions (compiling and linking) of the new toolchain are working as
+      expected. To perform a sanity check, run the following commands:</para>
 <screen><userinput>echo 'int main(){}' &gt; dummy.c
 $LFS_TGT-gcc dummy.c
 readelf -l a.out | grep ': /tools'</userinput></screen>
     <para>If everything is working correctly, there should be no errors,
     and the output of the last command will be of the form:</para>
 <screen><computeroutput>[Requesting program interpreter: /tools/lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
     <para>Note that for 32-bit machines, the interpreter name will be
     <filename>/tools/lib/ld-linux.so.2</filename>.</para>
     <para>If the output is not shown as above or there was no output at all,
     then something is wrong. Investigate and retrace the steps to find out
     where the problem is and correct it. This issue must be resolved before
     continuing on.</para>
     <para>Once all is well, clean up the test files:</para>
+readelf -l a.out | grep '/ld-linux'</userinput></screen>
+      <para>If everything is working correctly, there should be no errors,
+      and the output of the last command will be of the form:</para>
+<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
+      <para>Note that for 32-bit machines, the interpreter name will be
+      <filename>/lib/ld-linux.so.2</filename>.</para>
+      <para>If the output is not shown as above or there was no output at all,
+      then something is wrong. Investigate and retrace the steps to find out
+      where the problem is and correct it. This issue must be resolved before
+      continuing on.</para>
+      <para>Once all is well, clean up the test files:</para>
 <screen><userinput>rm -v dummy.c a.out</userinput></screen>
+  </caution>
+  <note><para>Building Binutils in the section after next will serve as an
+  additional check that the toolchain has been built properly. If Binutils
+  fails to build, it is an indication that something has gone wrong with the
+  previous Binutils, GCC, or Glibc installations.</para></note>
+    </caution>
+    <note><para>Building packages in the next chapter will serve as an
+    additional check that the toolchain has been built properly. If some
+    package, especially binutils-pass2 or gcc-pass2, fails to build, it is
+    an indication that something has gone wrong with the
+    previous Binutils, GCC, or Glibc installations.</para></note>
+    <para>Now that our cross-toolchain is complete, finalize the installation
+    of the limits.h header. For doing so, run a utility provided by the GCC
+    developers:</para>
+<screen><userinput>$LFS/tools/libexec/gcc/$LFS_TGT/&gcc-version;/install-tools/mkheaders</userinput></screen>
   </sect2>

chapter05/introduction.xml

-              r560065f
+              r675606b
   <title>Introduction</title>
   <para>This chapter shows how to build a minimal Linux system.
   This system will contain just enough tools to start constructing the final
   LFS system in <xref linkend="chapter-building-system"/> and allow a working
   environment with more user convenience than a minimum environment would.</para>
+  <para>This chapter shows how to build a cross-compiler and its associated
+  tools. Although here cross-compilation is faked, the principles are
+  the same as for a real cross-toolchain, and are detailed in the next
+  section.</para>
+  <para>There are two steps in building this minimal system. The first step
+  is to build a new and host-independent toolchain (compiler, assembler,
+  linker, libraries, and a few useful utilities).  The second step uses this
+  toolchain to build the other essential tools.</para>
+  <para>The files compiled in this chapter will be installed under the
+  <para>The programs compiled in this chapter will be installed under the
   <filename class="directory">$LFS/tools</filename> directory to keep them
   separate from the files installed in the next chapter and the host
   production directories. Since the packages compiled here are temporary,
   we do not want them to pollute the soon-to-be LFS system.</para>
+  separate from the files installed in the following chapters. The libraries,
+  on the other hand, are installed into their final place, since they pertain
+  to the system we want to build.</para>
 </sect1>

chapter05/libstdc++.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-tools-libstdcpp" role="wrap">
   <?dbhtml filename="gcc-libstdc++.html"?>
+<sect1 id="ch-tools-libstdcpp-pass1" role="wrap">
+  <?dbhtml filename="gcc-libstdc++-pass1.html"?>
   <sect1info condition="script">
 …
   </sect1info>
   <title>Libstdc++ from GCC-&gcc-version;</title>
+  <title>Libstdc++ from GCC-&gcc-version;, Pass 1</title>
   <indexterm zone="ch-tools-libstdcpp">
+  <indexterm zone="ch-tools-libstdcpp-pass1">
     <primary sortas="a-GCC">GCC</primary>
     <secondary>tools, libstdc++</secondary>
+    <secondary>tools, libstdc++ pass 1</secondary>
   </indexterm>
 …
     (part of GCC is written in C++), but we had to defer its installation
     when we built <xref linkend="ch-tools-gcc-pass1"/>
+    because it depends on glibc, which was not yet available in /tools.
+    because it depends on glibc, which was not yet available in the target
+    directory.
     </para>
 …
       <seglistitem>
         <seg>&libstdcpp-ch5-sbu;</seg>
         <seg>&libstdcpp-ch5-du;</seg>
+        <seg>&libstdcpp-tmpp1-sbu;</seg>
+        <seg>&libstdcpp-tmpp1-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     </note>
     <para>Create a separate build directory for Libstdc++ and enter it:</para>
+    <para>Create a separate build directory for libstdc++ and enter it:</para>
 <screen><userinput remap="pre">mkdir -v build
 cd       build</userinput></screen>
     <para>Prepare Libstdc++ for compilation:</para>
+    <para>Prepare libstdc++ for compilation:</para>
 <screen><userinput remap="configure">../libstdc++-v3/configure           \
     --host=$LFS_TGT                 \
+    --prefix=/tools                 \
+    --build=$(../config.guess)      \
+    --prefix=/usr                   \
     --disable-multilib              \
+    --disable-nls                   \<!--
+    - -disable-libstdcxx-threads     \-->
+    --disable-nls                   \
     --disable-libstdcxx-pch         \
     --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
 …
         <term><parameter>--host=...</parameter></term>
         <listitem>
           <para>Indicates to use the cross compiler we have just built
+          <para>Specifies the use the cross compiler we have just built
           instead of the one in <filename>/usr/bin</filename>.</para>
         </listitem>
       </varlistentry>
+        <!--
+      <varlistentry>
+        <term><parameter>- -disable-libstdcxx-threads</parameter></term>
+        <listitem>
+          <para>Since gcc-pass1 is built without thread support, the C++
+          thread library cannot be built either.</para>
+        </listitem>
+      </varlistentry>
+        -->
       <varlistentry>
         <term><parameter>--disable-libstdcxx-pch</parameter></term>
 …
         <term><parameter>--with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</parameter></term>
         <listitem>
           <para>This is the location where the standard include files are
           searched by the C++ compiler. In a normal build, this information
           is automatically passed to the Libstdc++ <command>configure</command>
+          <para>This is the location where the C++ compiler should search for the
+          standard include files. In a normal build, this information
+          is automatically passed to the libstdc++ <command>configure</command>
           options from the top level directory. In our case, this information
           must be explicitly given.</para>
 …
     <para>Install the library:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>

chapter05/linux-headers.xml

-              r560065f
+              r675606b
     <title/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter06/linux-headers.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <para>The Linux API Headers (in linux-&linux-version;.tar.xz) expose the
+    kernel's API for use by Glibc.</para>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&linux-headers-ch5-sbu;</seg>
         <seg>&linux-headers-ch5-du;</seg>
+        <seg>&linux-headers-tmp-sbu;</seg>
+        <seg>&linux-headers-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
 <screen><userinput remap="make">make headers
+</userinput><userinput remap="install">cp -rv usr/include/* /tools/include</userinput></screen>
+find usr/include -name '.*' -delete
+rm usr/include/Makefile
+</userinput><userinput remap="install">cp -rv usr/include $LFS/usr</userinput></screen>
   </sect2>
+  <sect2 role="content">
+    <title/>
+    <para>Details on this package are located in
+    <xref linkend="contents-linux-headers" role="."/></para>
+  <sect2 id="contents-linux-headers" role="content">
+    <title>Contents of Linux API Headers</title>
+    <segmentedlist>
+      <segtitle>Installed headers</segtitle>
+      <segtitle>Installed directories</segtitle>
+      <seglistitem>
+        <seg>/usr/include/asm/*.h, /usr/include/asm-generic/*.h,
+        /usr/include/drm/*.h, /usr/include/linux/*.h, /usr/include/misc/*.h,
+        /usr/include/mtd/*.h, /usr/include/rdma/*.h, /usr/include/scsi/*.h,
+        /usr/include/sound/*.h, /usr/include/video/*.h,
+        and /usr/include/xen/*.h</seg>
+        <seg>/usr/include/asm, /usr/include/asm-generic, /usr/include/drm,
+        /usr/include/linux, /usr/include/misc, /usr/include/mtd,
+        /usr/include/rdma, /usr/include/scsi, /usr/include/sound,
+        /usr/include/video, and /usr/include/xen</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="asm">
+        <term><filename class="headerfile">/usr/include/asm/*.h</filename></term>
+        <listitem>
+          <para>The Linux API ASM Headers</para>
+          <indexterm zone="ch-tools-linux-headers asm">
+            <primary sortas="e-/usr/include/asm/*.h">/usr/include/asm/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+     <varlistentry id="asm-generic">
+        <term><filename class="headerfile">/usr/include/asm-generic/*.h</filename></term>
+        <listitem>
+          <para>The Linux API ASM Generic Headers</para>
+          <indexterm zone="ch-tools-linux-headers asm-generic">
+            <primary sortas="e-/usr/include/asm-generic/*.h">/usr/include/asm-generic/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="drm">
+        <term><filename class="headerfile">/usr/include/drm/*.h</filename></term>
+        <listitem>
+          <para>The Linux API DRM Headers</para>
+          <indexterm zone="ch-tools-linux-headers drm">
+            <primary sortas="e-/usr/include/drm/*.h">/usr/include/drm/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="linux">
+        <term><filename class="headerfile">/usr/include/linux/*.h</filename></term>
+        <listitem>
+          <para>The Linux API Linux Headers</para>
+          <indexterm zone="ch-tools-linux-headers linux">
+            <primary sortas="e-/usr/include/linux/*.h">/usr/include/linux/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="misc">
+        <term><filename class="headerfile">/usr/include/misc/*.h</filename></term>
+        <listitem>
+          <para>The Linux API Miscellaneous Headers</para>
+          <indexterm zone="ch-tools-linux-headers misc">
+            <primary sortas="e-/usr/include/misc/*.h">/usr/include/misc/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="mtd">
+        <term><filename class="headerfile">/usr/include/mtd/*.h</filename></term>
+        <listitem>
+          <para>The Linux API MTD Headers</para>
+          <indexterm zone="ch-tools-linux-headers mtd">
+            <primary sortas="e-/usr/include/mtd/*.h">/usr/include/mtd/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="rdma">
+        <term><filename class="headerfile">/usr/include/rdma/*.h</filename></term>
+        <listitem>
+          <para>The Linux API RDMA Headers</para>
+          <indexterm zone="ch-tools-linux-headers rdma">
+            <primary sortas="e-/usr/include/rdma/*.h">/usr/include/rdma/*.h</primary>
+         </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="scsi">
+        <term><filename class="headerfile">/usr/include/scsi/*.h</filename></term>
+        <listitem>
+          <para>The Linux API SCSI Headers</para>
+          <indexterm zone="ch-tools-linux-headers scsi">
+            <primary sortas="e-/usr/include/scsi/*.h">/usr/include/scsi/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sound">
+        <term><filename class="headerfile">/usr/include/sound/*.h</filename></term>
+        <listitem>
+          <para>The Linux API Sound Headers</para>
+          <indexterm zone="ch-tools-linux-headers sound">
+           <primary sortas="e-/usr/include/sound/*.h">/usr/include/sound/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="video">
+        <term><filename class="headerfile">/usr/include/video/*.h</filename></term>
+        <listitem>
+          <para>The Linux API Video Headers</para>
+          <indexterm zone="ch-tools-linux-headers video">
+            <primary sortas="e-/usr/include/video/*.h">/usr/include/video/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xen">
+        <term><filename class="headerfile">/usr/include/xen/*.h</filename></term>
+        <listitem>
+          <para>The Linux API Xen Headers</para>
+          <indexterm zone="ch-tools-linux-headers xen">
+            <primary sortas="e-/usr/include/xen/*.h">/usr/include/xen/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </sect2>

chapter05/toolchaintechnotes.xml

-              r560065f
+              r675606b
   to at any time during the process.</para>
+  <para>The overall goal of <xref linkend="chapter-temporary-tools"/> is to
+  produce a temporary area that contains a known-good set of tools that can be
+  isolated from the host system. By using <command>chroot</command>, the
+  commands in the remaining chapters will be contained within that environment,
+  ensuring a clean, trouble-free build of the target LFS system. The build
+  process has been designed to minimize the risks for new readers and to provide
+  the most educational value at the same time.</para>
+  <note>
+    <para>Before continuing, be aware of the name of the working platform,
+    often referred to as the target triplet. A simple way to determine the
+    name of the target triplet is to run the <command>config.guess</command>
+    script that comes with the source for many packages. Unpack the Binutils
+    sources and run the script: <userinput>./config.guess</userinput> and note
+    the output. For example, for a 32-bit Intel processor the
+    output will be <emphasis>i686-pc-linux-gnu</emphasis>. On a 64-bit
+    system it will be <emphasis>x86_64-pc-linux-gnu</emphasis>.</para>
+    <para>Also be aware of the name of the platform's dynamic linker, often
+    referred to as the dynamic loader (not to be confused with the standard
+    linker <command>ld</command> that is part of Binutils). The dynamic linker
+    provided by Glibc finds and loads the shared libraries needed by a program,
+    prepares the program to run, and then runs it. The name of the dynamic
+    linker for a 32-bit Intel machine will be <filename
+    class="libraryfile">ld-linux.so.2</filename> (<filename
+    class="libraryfile">ld-linux-x86-64.so.2</filename> for 64-bit systems).  A
+    sure-fire way to determine the name of the dynamic linker is to inspect a
+    random binary from the host system by running: <userinput>readelf -l
+    &lt;name of binary&gt; | grep interpreter</userinput> and noting the
+    output. The authoritative reference covering all platforms is in the
+    <filename>shlib-versions</filename> file in the root of the Glibc source
+    tree.</para>
+  </note>
+  <para>Some key technical points of how the <xref
+  linkend="chapter-temporary-tools"/> build method works:</para>
+  <itemizedlist>
+    <listitem>
+      <para>Slightly adjusting the name of the working platform, by changing the
+      &quot;vendor&quot; field target triplet by way of the
+      <envar>LFS_TGT</envar> variable, ensures that the first build of Binutils
+      and GCC produces a compatible cross-linker and cross-compiler. Instead of
+      producing binaries for another architecture, the cross-linker and
+      cross-compiler will produce binaries compatible with the current
+      hardware.</para>
+    </listitem>
+    <listitem>
+      <para> The temporary libraries are cross-compiled.  Because a
+      cross-compiler by its nature cannot rely on anything from its host
+      system, this method removes potential contamination of the target
+      system by lessening the chance of headers or libraries from the host
+      being incorporated into the new tools.  Cross-compilation also allows for
+      the possibility of building both 32-bit and 64-bit libraries on 64-bit
+      capable hardware.</para>
+    </listitem>
+    <listitem>
+    <para>Careful manipulation of the GCC source tells the compiler which target
+    dynamic linker will be used.</para>
+    </listitem>
+  </itemizedlist>
+  <para>Binutils is installed first because the <command>configure</command>
+  runs of both GCC and Glibc perform various feature tests on the assembler
+  and linker to determine which software features to enable or disable. This
+  is more important than one might first realize. An incorrectly configured
+  GCC or Glibc can result in a subtly broken toolchain, where the impact of
+  such breakage might not show up until near the end of the build of an
+  entire distribution. A test suite failure will usually highlight this error
+  before too much additional work is performed.</para>
+  <para>Binutils installs its assembler and linker in two locations,
+  <filename class="directory">/tools/bin</filename> and <filename
+  class="directory">/tools/$LFS_TGT/bin</filename>. The tools in one
+  location are hard linked to the other. An important facet of the linker is
+  its library search order. Detailed information can be obtained from
+  <command>ld</command> by passing it the <parameter>--verbose</parameter>
+  flag. For example, an <userinput>ld --verbose | grep SEARCH</userinput>
+  will illustrate the current search paths and their order. It shows which
+  files are linked by <command>ld</command> by compiling a dummy program and
+  passing the <parameter>--verbose</parameter> switch to the linker. For example,
+  <userinput>gcc dummy.c -Wl,--verbose 2&gt;&amp;1 | grep succeeded</userinput>
+  will show all the files successfully opened during the linking.</para>
+  <para>The next package installed is GCC. An example of what can be
+  seen during its run of <command>configure</command> is:</para>
+<screen><computeroutput>checking what assembler to use... /tools/i686-lfs-linux-gnu/bin/as
+checking what linker to use... /tools/i686-lfs-linux-gnu/bin/ld</computeroutput></screen>
+  <para>This is important for the reasons mentioned above. It also demonstrates
+  that GCC's configure script does not search the PATH directories to find which
+  tools to use. However, during the actual operation of <command>gcc</command>
+  itself, the same search paths are not necessarily used. To find out which
+  standard linker <command>gcc</command> will use, run:
+  <userinput>gcc -print-prog-name=ld</userinput>.</para>
+  <para>Detailed information can be obtained from <command>gcc</command> by
+  passing it the <parameter>-v</parameter> command line option while compiling
+  a dummy program. For example, <userinput>gcc -v dummy.c</userinput> will show
+  detailed information about the preprocessor, compilation, and assembly stages,
+  including <command>gcc</command>'s included search paths and their order.</para>
+  <para>Next installed are sanitized Linux API headers. These allow the standard
+  C library (Glibc) to interface with features that the Linux kernel will
+  provide.</para>
+  <para>The next package installed is Glibc. The most important considerations
+  for building Glibc are the compiler, binary tools, and kernel headers. The
+  compiler is generally not an issue since Glibc will always use the compiler
+  relating to the <parameter>--host</parameter> parameter passed to its
+  configure script; e.g. in our case, the compiler will be
+  <command>i686-lfs-linux-gnu-gcc</command>. The binary tools and kernel
+  headers can be a bit more complicated. Therefore, take no risks and use the
+  available configure switches to enforce the correct selections. After the run
+  of <command>configure</command>, check the contents of the
+  <filename>config.make</filename> file in the <filename
+  class="directory">glibc-build</filename> directory for all important details.
+  Note the use of <parameter>CC="i686-lfs-gnu-gcc"</parameter> to control which
+  binary tools are used and the use of the <parameter>-nostdinc</parameter> and
+  <parameter>-isystem</parameter> flags to control the compiler's include
+  search path. These items highlight an important aspect of the Glibc
+  package&mdash;it is very self-sufficient in terms of its build machinery and
+  generally does not rely on toolchain defaults.</para>
+  <para>During the second pass of Binutils, we are able to utilize the
+  <parameter>--with-lib-path</parameter> configure switch to control
+  <command>ld</command>'s library search path.</para>
+  <para>For the second pass of GCC, its sources also need to be modified to
+  tell GCC to use the new dynamic linker. Failure to do so will result in the
+  GCC programs themselves having the name of the dynamic linker from the host
+  system's <filename class="directory">/lib</filename> directory embedded into
+  them, which would defeat the goal of getting away from the host. From this
+  point onwards, the core toolchain is self-contained and self-hosted. The
+  remainder of the <xref linkend="chapter-temporary-tools"/> packages all build
+  against the new Glibc in <filename
+  class="directory">/tools</filename>.</para>
+  <para>Upon entering the chroot environment in <xref
+  linkend="chapter-building-system"/>, the first major package to be
+  installed is Glibc, due to its self-sufficient nature mentioned above.
+  Once this Glibc is installed into <filename
+  class="directory">/usr</filename>, we will perform a quick changeover of the
+  toolchain defaults, and then proceed in building the rest of the target
+  LFS system.</para>
+  <para>The overall goal of this chapter and <xref
+  linkend="chapter-temporary-tools"/> is to produce a temporary area that
+  contains a known-good set of tools that can be isolated from the host system.
+  By using <command>chroot</command>, the commands in the remaining chapters
+  will be contained within that environment, ensuring a clean, trouble-free
+  build of the target LFS system. The build process has been designed to
+  minimize the risks for new readers and to provide the most educational value
+  at the same time.</para>
+  <para>The build process is based on the process of
+  <emphasis>cross-compilation</emphasis>. Cross-compilation is normally used
+  for building a compiler and its toolchain for a machine different from
+  the one that is used for the build. This is not strictly needed for LFS,
+  since the machine where the new system will run is the same as the one
+  used for the build. But cross-compilation has the great advantage that
+  anything that is cross-compiled cannot depend on the host environment.</para>
+  <sect2 id="cross-compile" xreflabel="About Cross-Compilation">
+    <title>About Cross-Compilation</title>
+    <para>Cross-compilation involves some concepts that deserve a section on
+    their own. Although this section may be omitted in a first reading, it
+    is strongly suggested to come back to it later in order to get a full
+    grasp of the build process.</para>
+    <para>Let us first define some terms used in this context:</para>
+    <variablelist>
+      <varlistentry><term>build</term><listitem>
+        <para>is the machine where we build programs. Note that this machine
+        is referred to as the <quote>host</quote> in other
+        sections.</para></listitem>
+      </varlistentry>
+      <varlistentry><term>host</term><listitem>
+        <para>is the machine/system where the built programs will run. Note
+        that this use of <quote>host</quote> is not the same as in other
+        sections.</para></listitem>
+      </varlistentry>
+      <varlistentry><term>target</term><listitem>
+        <para>is only used for compilers. It is the machine the compiler
+        produces code for. It may be different from both build and
+        host.</para></listitem>
+      </varlistentry>
+    </variablelist>
+    <para>As an example, let us imagine the following scenario: we may have a
+    compiler on a slow machine only, let's call the machine A, and the compiler
+    ccA. We may have also a fast machine (B), but with no compiler, and we may
+    want to produce code for a another slow machine (C). Then, to build a
+    compiler for machine C, we would have three stages:</para>
+    <informaltable align="center">
+      <tgroup cols="5">
+        <colspec colnum="1" align="center"/>
+        <colspec colnum="2" align="center"/>
+        <colspec colnum="3" align="center"/>
+        <colspec colnum="4" align="center"/>
+        <colspec colnum="5" align="left"/>
+        <thead>
+          <row><entry>Stage</entry><entry>Build</entry><entry>Host</entry>
+               <entry>Target</entry><entry>Action</entry></row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>1</entry><entry>A</entry><entry>A</entry><entry>B</entry>
+            <entry>build cross-compiler cc1 using ccA on machine A</entry>
+          </row>
+          <row>
+            <entry>2</entry><entry>A</entry><entry>B</entry><entry>B</entry>
+            <entry>build cross-compiler cc2 using cc1 on machine A</entry>
+          </row>
+          <row>
+            <entry>3</entry><entry>B</entry><entry>C</entry><entry>C</entry>
+            <entry>build compiler ccC using cc2 on machine B</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+    <para>Then, all the other programs needed by machine C can be compiled
+    using cc2 on the fast machine B. Note that unless B can run programs
+    produced for C, there is no way to test the built programs until machine
+    C itself is running. For example, for testing ccC, we may want to add a
+    fourth stage:</para>
+    <informaltable align="center">
+      <tgroup cols="5">
+        <colspec colnum="1" align="center"/>
+        <colspec colnum="2" align="center"/>
+        <colspec colnum="3" align="center"/>
+        <colspec colnum="4" align="center"/>
+        <colspec colnum="5" align="left"/>
+        <thead>
+          <row><entry>Stage</entry><entry>Build</entry><entry>Host</entry>
+               <entry>Target</entry><entry>Action</entry></row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>4</entry><entry>C</entry><entry>C</entry><entry>C</entry>
+            <entry>rebuild  and test ccC using itself on machine C</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+    <para>In the example above, only cc1 and cc2 are cross-compilers, that is,
+    they produce code for a machine different from the one they are run on.
+    The other compilers ccA and ccC produce code for the machine they are run
+    on. Such compilers are called <emphasis>native</emphasis> compilers.</para>
+  </sect2>
+  <sect2 id="lfs-cross">
+    <title>Implementation of Cross-Compilation for LFS</title>
+    <note>
+      <para>Almost all the build systems use names of the form
+      cpu-vendor-kernel-os referred to as the machine triplet. An astute
+      reader may wonder why a <quote>triplet</quote> refers to a four component
+      name. The reason is history: initially, three component names were enough
+      to designate unambiguously a machine, but with new machines and systems
+      appearing, that proved insufficient. The word <quote>triplet</quote>
+      remained. A simple way to determine your machine triplet is to run
+      the <command>config.guess</command>
+      script that comes with the source for many packages. Unpack the binutils
+      sources and run the script: <userinput>./config.guess</userinput> and note
+      the output. For example, for a 32-bit Intel processor the
+      output will be <emphasis>i686-pc-linux-gnu</emphasis>. On a 64-bit
+      system it will be <emphasis>x86_64-pc-linux-gnu</emphasis>.</para>
+      <para>Also be aware of the name of the platform's dynamic linker, often
+      referred to as the dynamic loader (not to be confused with the standard
+      linker <command>ld</command> that is part of binutils). The dynamic linker
+      provided by Glibc finds and loads the shared libraries needed by a
+      program, prepares the program to run, and then runs it. The name of the
+      dynamic linker for a 32-bit Intel machine will be <filename
+      class="libraryfile">ld-linux.so.2</filename> (<filename
+      class="libraryfile">ld-linux-x86-64.so.2</filename> for 64-bit systems). A
+      sure-fire way to determine the name of the dynamic linker is to inspect a
+      random binary from the host system by running: <userinput>readelf -l
+      &lt;name of binary&gt; | grep interpreter</userinput> and noting the
+      output. The authoritative reference covering all platforms is in the
+      <filename>shlib-versions</filename> file in the root of the Glibc source
+      tree.</para>
+    </note>
+    <para>In order to fake a cross compilation, the name of the host triplet
+    is slightly adjusted by changing the &quot;vendor&quot; field in the
+    <envar>LFS_TGT</envar> variable. We also use the
+    <parameter>--with-sysroot</parameter> option when building the cross linker and
+    cross compiler to tell them where to find the needed host files. This
+    ensures that none of the other programs built in <xref
+    linkend="chapter-temporary-tools"/> can link to libraries on the build
+    machine. Only two stages are mandatory, and one more for tests:</para>
+    <informaltable align="center">
+      <tgroup cols="5">
+        <colspec colnum="1" align="center"/>
+        <colspec colnum="2" align="center"/>
+        <colspec colnum="3" align="center"/>
+        <colspec colnum="4" align="center"/>
+        <colspec colnum="5" align="left"/>
+        <thead>
+          <row><entry>Stage</entry><entry>Build</entry><entry>Host</entry>
+               <entry>Target</entry><entry>Action</entry></row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>1</entry><entry>pc</entry><entry>pc</entry><entry>lfs</entry>
+            <entry>build cross-compiler cc1 using cc-pc on pc</entry>
+          </row>
+          <row>
+            <entry>2</entry><entry>pc</entry><entry>lfs</entry><entry>lfs</entry>
+            <entry>build compiler cc-lfs using cc1 on pc</entry>
+          </row>
+          <row>
+            <entry>3</entry><entry>lfs</entry><entry>lfs</entry><entry>lfs</entry>
+            <entry>rebuild and test cc-lfs using itself on lfs</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+    <para>In the above table, <quote>on pc</quote> means the commands are run
+    on a machine using the already installed distribution. <quote>On
+    lfs</quote> means the commands are run in a chrooted environment.</para>
+    <para>Now, there is more about cross-compiling: the C language is not
+    just a compiler, but also defines a standard library. In this book, the
+    GNU C library, named glibc, is used. This library must
+    be compiled for the lfs machine, that is, using the cross compiler cc1.
+    But the compiler itself uses an internal library implementing complex
+    instructions not available in the assembler instruction set. This
+    internal library is named libgcc, and must be linked to the glibc
+    library to be fully functional! Furthermore, the standard library for
+    C++ (libstdc++) also needs being linked to glibc. The solution
+    to this chicken and egg problem is to first build a degraded cc1 based libgcc,
+    lacking some fuctionalities such as threads and exception handling, then
+    build glibc using this degraded compiler (glibc itself is not
+    degraded), then build libstdc++. But this last library will lack the
+    same functionalities as libgcc.</para>
+    <para>This is not the end of the story: the conclusion of the preceding
+    paragraph is that cc1 is unable to build a fully functional libstdc++, but
+    this is the only compiler available for building the C/C++ libraries
+    during stage 2! Of course, the compiler built during stage 2, cc-lfs,
+    would be able to build those libraries, but (1) the build system of
+    GCC does not know that it is usable on pc, and (2) using it on pc
+    would be at risk of linking to the pc libraries, since cc-lfs is a native
+    compiler. So we have to build libstdc++ later, in chroot.</para>
+  </sect2>
+  <sect2 id="other-details">
+    <title>Other procedural details</title>
+    <para>The cross-compiler will be installed in a separate <filename
+    class="directory">$LFS/tools</filename> directory, since it will not
+    be part of the final system.</para>
+    <para>Binutils is installed first because the <command>configure</command>
+    runs of both GCC and Glibc perform various feature tests on the assembler
+    and linker to determine which software features to enable or disable. This
+    is more important than one might first realize. An incorrectly configured
+    GCC or Glibc can result in a subtly broken toolchain, where the impact of
+    such breakage might not show up until near the end of the build of an
+    entire distribution. A test suite failure will usually highlight this error
+    before too much additional work is performed.</para>
+    <para>Binutils installs its assembler and linker in two locations,
+    <filename class="directory">$LFS/tools/bin</filename> and <filename
+    class="directory">$LFS/tools/$LFS_TGT/bin</filename>. The tools in one
+    location are hard linked to the other. An important facet of the linker is
+    its library search order. Detailed information can be obtained from
+    <command>ld</command> by passing it the <parameter>--verbose</parameter>
+    flag. For example, <command>$LFS_TGT-ld --verbose | grep SEARCH</command>
+    will illustrate the current search paths and their order. It shows which
+    files are linked by <command>ld</command> by compiling a dummy program and
+    passing the <parameter>--verbose</parameter> switch to the linker. For
+    example,
+    <command>$LFS_TGT-gcc dummy.c -Wl,--verbose 2&gt;&amp;1 | grep succeeded</command>
+    will show all the files successfully opened during the linking.</para>
+    <para>The next package installed is GCC. An example of what can be
+    seen during its run of <command>configure</command> is:</para>
+<screen><computeroutput>checking what assembler to use... /mnt/lfs/tools/i686-lfs-linux-gnu/bin/as
+checking what linker to use... /mnt/lfs/tools/i686-lfs-linux-gnu/bin/ld</computeroutput></screen>
+    <para>This is important for the reasons mentioned above. It also
+    demonstrates that GCC's configure script does not search the PATH
+    directories to find which tools to use. However, during the actual
+    operation of <command>gcc</command> itself, the same search paths are not
+    necessarily used. To find out which standard linker <command>gcc</command>
+    will use, run: <command>$LFS_TGT-gcc -print-prog-name=ld</command>.</para>
+    <para>Detailed information can be obtained from <command>gcc</command> by
+    passing it the <parameter>-v</parameter> command line option while compiling
+    a dummy program. For example, <command>gcc -v dummy.c</command> will show
+    detailed information about the preprocessor, compilation, and assembly
+    stages, including <command>gcc</command>'s included search paths and their
+    order.</para>
+    <para>Next installed are sanitized Linux API headers. These allow the
+    standard C library (Glibc) to interface with features that the Linux
+    kernel will provide.</para>
+    <para>The next package installed is Glibc. The most important
+    considerations for building Glibc are the compiler, binary tools, and
+    kernel headers. The compiler is generally not an issue since Glibc will
+    always use the compiler relating to the <parameter>--host</parameter>
+    parameter passed to its configure script; e.g. in our case, the compiler
+    will be <command>$LFS_TGT-gcc</command>. The binary tools and kernel
+    headers can be a bit more complicated. Therefore, take no risks and use
+    the available configure switches to enforce the correct selections. After
+    the run of <command>configure</command>, check the contents of the
+    <filename>config.make</filename> file in the <filename
+    class="directory">build</filename> directory for all important details.
+    Note the use of <parameter>CC="$LFS_TGT-gcc"</parameter> (with
+    <envar>$LFS_TGT</envar> expanded) to control which binary tools are used
+    and the use of the <parameter>-nostdinc</parameter> and
+    <parameter>-isystem</parameter> flags to control the compiler's include
+    search path. These items highlight an important aspect of the Glibc
+    package&mdash;it is very self-sufficient in terms of its build machinery
+    and generally does not rely on toolchain defaults.</para>
+    <para>As said above, the standard C++ library is compiled next, followed in
+    Chapter 6 by all the programs that need themselves to be built. The install
+    step of libstdc++ uses the <envar>DESTDIR</envar> variable to have the
+    programs land into the LFS filesystem.</para>
+    <para>In Chapter 7 the native lfs compiler is built. First binutils-pass2,
+    with the same <envar>DESTDIR</envar> install as the other programs is
+    built, and then the second pass of GCC is constructed, omitting libstdc++
+    and other non-important libraries.  Due to some weird logic in GCC's
+    configure script, <envar>CC_FOR_TARGET</envar> ends up as
+    <command>cc</command> when the host is the same as the target, but is
+    different from the build system. This is why
+    <parameter>CC_FOR_TARGET=$LFS_TGT-gcc</parameter> is put explicitely into
+    the configure options.</para>
+    <para>Upon entering the chroot environment in <xref
+    linkend="chapter-chroot-temporary-tools"/>, the first task is to install
+    libstdc++. Then temporary installations of programs needed for the proper
+    operation of the toolchain are performed. Programs needed for testing
+    other programs are also built. From this point onwards, the
+    core toolchain is self-contained and self-hosted.  In
+    <xref linkend="chapter-building-system"/>, final versions of all the
+    packages needed for a fully functional system are built, tested and
+    installed.</para>
+  </sect2>
 </sect1>

chapter06/bash.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-bash" role="wrap">
+<sect1 id="ch-tools-bash" role="wrap">
   <?dbhtml filename="bash.html"?>
 …
   <title>Bash-&bash-version;</title>
   <indexterm zone="ch-system-bash">
+  <indexterm zone="ch-tools-bash">
     <primary sortas="a-Bash">Bash</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Bash package contains the Bourne-Again SHell.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/bash.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&bash-ch6-sbu;</seg>
         <seg>&bash-ch6-du;</seg>
+        <seg>&bash-tmp-sbu;</seg>
+        <seg>&bash-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <title>Installation of Bash</title>
-    <para>Incorporate some upstream fixes:</para>
-<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
     <para>Prepare Bash for compilation:</para>
 <screen><userinput remap="configure">./configure --prefix=/usr                    \
             --docdir=/usr/share/doc/bash-&bash-version; \
             --without-bash-malloc            \
             --with-installed-readline</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr                   \
+            --build=$(support/config.guess) \
+            --host=$LFS_TGT                 \
+            --without-bash-malloc</userinput></screen>
     <variablelist>
       <title>The meaning of the new configure option:</title>
+      <title>The meaning of the configure options:</title>
       <varlistentry>
         <term><parameter>--with-installed-readline</parameter></term>
+        <term><parameter>--without-bash-malloc</parameter></term>
         <listitem>
+          <para>This option tells Bash to use the <filename
+          class="libraryfile">readline</filename> library that is already
+          installed on the system rather than using its own readline
+          version.</para>
+          <para>This option turns off the use of Bash's memory allocation
+          (<function>malloc</function>) function which is known to cause
+          segmentation faults. By turning this option off, Bash will use
+          the <function>malloc</function> functions from Glibc which are
+          more stable.</para>
         </listitem>
       </varlistentry>
 …
 <screen><userinput remap="make">make</userinput></screen>
+    <para>Skip down to <quote>Install the
+    package</quote> if not running the test suite.</para>
+    <para>Install the package:</para>
     <para>To prepare the tests, ensure that the <systemitem class="username">tester</systemitem> user can write to the sources tree:</para>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 <screen><userinput remap="test">chown -Rv tester .</userinput></screen>
+    <para>Move the excutable to where it is expected:</para>
+    <para>Now, run the tests as the <systemitem
+    class="username">tester</systemitem> user:</para>
+<screen><userinput remap="install">mv $LFS/usr/bin/bash $LFS/bin/bash</userinput></screen>
+<screen><userinput remap="test">su tester &lt;&lt; EOF
+PATH=$PATH make tests &lt; $(tty)
+EOF</userinput></screen>
+<!--
+    <para>The <systemitem class="username">tester</systemitem>
+    user does not have enough permissions for all the tests to pass. This shows
+    up in some <quote>diff</quote> output in four test results. Portions of the
+    run-execscript, run-lastpipe, run-read, and run-test programs
+    are known to fail in the LFS chroot environment, but pass if the tests
+    are run in a full system.</para>
+-->
+    <para>Install the package and move the main executable to
+    <filename class='directory'>/bin</filename>:</para>
+    <para>Make a link for the programs that use <command>sh</command> for
+    a shell:</para>
+<screen><userinput remap="install">make install
+mv -vf /usr/bin/bash /bin</userinput></screen>
+    <para>Run the newly compiled <command>bash</command> program (replacing the one that is
+    currently being executed):</para>
+<screen role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
+    <note>
+      <para>The parameters used make the <command>bash</command>
+      process an interactive login shell and continue to disable hashing so
+      that new programs are found as they become available.</para>
+    </note>
+<screen><userinput remap="install">ln -sv bash $LFS/bin/sh</userinput></screen>
   </sect2>
   <sect2 id="contents-bash" role="content">
     <title>Contents of Bash</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
+      <seglistitem>
+        <seg>bash, bashbug, and sh (link to bash)</seg>
+        <seg>/usr/include/bash, /usr/lib/bash, and
+        /usr/share/doc/bash-&bash-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="bash">
+        <term><command>bash</command></term>
+        <listitem>
+          <para>A widely-used command interpreter; it performs many types of
+          expansions and substitutions on a given command line before executing
+          it, thus making this interpreter a powerful tool</para>
+          <indexterm zone="ch-system-bash bash">
+            <primary sortas="b-bash">bash</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="bashbug">
+        <term><command>bashbug</command></term>
+        <listitem>
+          <para>A shell script to help the user compose and mail standard
+          formatted bug reports concerning <command>bash</command></para>
+          <indexterm zone="ch-system-bash bashbug">
+            <primary sortas="b-bashbug">bashbug</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sh">
+        <term><command>sh</command></term>
+        <listitem>
+          <para>A symlink to the <command>bash</command> program; when invoked
+          as <command>sh</command>, <command>bash</command> tries to mimic the
+          startup behavior of historical versions of <command>sh</command> as
+          closely as possible, while conforming to the POSIX standard as
+          well</para>
+          <indexterm zone="ch-system-bash sh">
+            <primary sortas="b-sh">sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-bash" role="."/></para>
   </sect2>

chapter06/chapter06.xml

-              r560065f
+              r675606b
 ]>
 <chapter id="chapter-building-system" xreflabel="Chapter&nbsp;6">
+<chapter id="chapter-temporary-tools" xreflabel="Chapter&nbsp;6">
   <?dbhtml dir="chapter06"?>
   <?dbhtml filename="chapter06.html"?>
   <title>Installing Basic System Software</title>
+  <title>Cross Compiling Temporary Tools</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="bzip2.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="zstd.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="ncurses.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="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="file.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="m4.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="flex.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="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="shadow.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="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="sed.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="gettext.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="findutils.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="grep.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="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="kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libelf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.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="check.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="man-db.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="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"/>
+  <!-- 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="dbus.xml"/>
+  <!-- sysv only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
+  <!-- Both sysv on systemd builds -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  <!-- Both sysv and systemd builds -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.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="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"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils-pass2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-pass2.xml"/>
 </chapter>

chapter06/coreutils.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-coreutils" role="wrap">
+<sect1 id="ch-tools-coreutils" role="wrap">
   <?dbhtml filename="coreutils.html"?>
 …
   <title>Coreutils-&coreutils-version;</title>
   <indexterm zone="ch-system-coreutils">
+  <indexterm zone="ch-tools-coreutils">
     <primary sortas="a-Coreutils">Coreutils</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Coreutils package contains utilities for showing and setting the
+    basic system characteristics.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/coreutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&coreutils-ch6-sbu;</seg>
         <seg>&coreutils-ch6-du;</seg>
+        <seg>&coreutils-tmp-sbu;</seg>
+        <seg>&coreutils-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <title>Installation of Coreutils</title>
+    <para>POSIX requires that programs from Coreutils recognize character
+    boundaries correctly even in multibyte locales. The following patch fixes
+    this non-compliance and other internationalization-related bugs.</para>
+    <para>Prepare Coreutils for compilation:</para>
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
+    <note>
+      <para>In the past, many bugs were found in this patch. When reporting new
+      bugs to Coreutils maintainers, please check first if they are reproducible
+      without this patch.</para>
+    </note>
+   <!-- this has been fixed in upstream gnulib, when a new version of
+   coreutils is released, please check #4055 to see if the change has been
+   picked up in this package -->
+   <para>Suppress a test which on some machines can loop forever:</para>
+<screen><userinput remap="pre">sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk</userinput></screen>
+    <para>Now prepare Coreutils for compilation:</para>
+<screen><userinput remap="configure">autoreconf -fiv
+FORCE_UNSAFE_CONFIGURE=1 ./configure \
+            --prefix=/usr            \
+<screen><userinput remap="configure">./configure --prefix=/usr                     \
+            --host=$LFS_TGT                   \
+            --build=$(build-aux/config.guess) \
+            --enable-install-program=hostname \
             --enable-no-install-program=kill,uptime</userinput></screen>
 …
       <varlistentry>
         <term><command>autoreconf</command></term>
+        <term><envar>--enable-install-program=hostname</envar></term>
         <listitem>
+          <para>This command updates generated configuration files
+          consistent with the latest version of automake.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
+        <listitem>
+          <para>This environment variable allows the package to be
+          built as the root user.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--enable-no-install-program=kill,uptime</parameter></term>
+        <listitem>
+          <para>The purpose of this switch is to prevent Coreutils from
+          installing binaries that will be installed by other packages later.
+          </para>
+          <para>This enables the <command>hostname</command> binary to be built
+          and installed &ndash; it is disabled by default but is required by the
+          Perl test suite.</para>
         </listitem>
       </varlistentry>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>Skip down to <quote>Install the
-    package</quote> if not running the test suite.</para>
-    <para>Now the test suite is ready to be run. First, run the tests that are
-    meant to be run as user <systemitem class="username">root</systemitem>:</para>
-<screen><userinput remap="test">make NON_ROOT_USERNAME=tester check-root</userinput></screen>
-    <para>We're going to run the remainder of the tests as the
-    <systemitem class="username">tester</systemitem> user. Certain tests,
-    however, require that the user be a member of more than one group. So that
-    these tests are not skipped we'll add a temporary group and make the
-    user <systemitem class="username">tester</systemitem> a part of it:</para>
-<screen><userinput remap="test">echo "dummy:x:102:tester" &gt;&gt; /etc/group</userinput></screen>
-    <para>Fix some of the permissions so that the non-root user can compile and
-    run the tests:</para>
-<screen><userinput remap="test">chown -Rv tester . </userinput></screen>
-    <para>Now run the tests. Make sure the PATH in the <userinput>su</userinput>
-    environment includes /tools/bin.</para>
-<screen><userinput remap="test">su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
-<!--
-    <para>The test program test-getlogin is known to fail in a
-    partially built system environment like the chroot environment here, but
-    passes if run at the end of this chapter.  The test program tty.sh is
-    also known to fail.</para>
--->
-    <para>Remove the temporary group:</para>
-<screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
     <para>Install the package:</para>
+<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+<!--
+    <para>The above command refuses to install <filename>su</filename>
+    because the program cannot be installed setuid root as a non-privileged
+    user. By manually installing it, we can use it for running tests in the
+    final system as a non-privileged user. Install it with:</para>
+    <para>Move programs to the locations specified by the FHS:</para>
+<screen><userinput remap="install">cp -v src/su /tools/bin</userinput></screen>
+-->
+    <para>Move programs to their final expected locations. Although this is
+    not necessary in this temporary environment, we must do so because some
+    programs harcode executable locations:</para>
+<screen><userinput remap="install">mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
+mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
+mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
+mv -v /usr/bin/chroot /usr/sbin
+mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8
+sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8</userinput></screen>
+    <para revision="sysv">Some of the scripts in the LFS-Bootscripts package
+    depend on <command>head</command>, <command>nice</command>,
+    <command>sleep</command>, and <command>touch</command>.  As <filename
+    class="directory">/usr</filename> may not be available during the early and
+    late stages of booting, those binaries need to be on the root partition to
+    maintain FHS compliance:</para>
+<screen><userinput remap="install">mv -v /usr/bin/{head,nice,sleep,touch} /bin</userinput></screen>
+<screen><userinput remap="install">mv -v $LFS/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} $LFS/bin
+mv -v $LFS/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm}        $LFS/bin
+mv -v $LFS/usr/bin/{rmdir,stty,sync,true,uname}               $LFS/bin
+mv -v $LFS/usr/bin/{head,nice,sleep,touch}                    $LFS/bin
+mv -v $LFS/usr/bin/chroot                                     $LFS/usr/sbin
+mkdir -pv $LFS/usr/share/man/man8
+mv -v $LFS/usr/share/man/man1/chroot.1                        $LFS/usr/share/man/man8/chroot.8
+sed -i 's/"1"/"8"/'                                           $LFS/usr/share/man/man8/chroot.8</userinput></screen>
   </sect2>
   <sect2 id="contents-coreutils" role="content">
     <title>Contents of Coreutils</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
+      <segtitle>Installed directory</segtitle>
+      <seglistitem>
+        <seg>[, b2sum, base32, base64, basename, basenc, cat, chcon, chgrp, chmod, chown,
+        chroot, cksum, comm, cp, csplit, cut, date, dd, df, dir, dircolors,
+        dirname, du, echo, env, expand, expr, factor, false, fmt, fold, groups,
+        head, hostid, id, install, join, link, ln, logname, ls, md5sum, mkdir,
+        mkfifo, mknod, mktemp, mv, nice, nl, nohup, nproc, numfmt, od, paste,
+        pathchk, pinky, pr, printenv, printf, ptx, pwd, readlink, realpath, rm,
+        rmdir, runcon, seq, sha1sum, sha224sum, sha256sum, sha384sum,
+        sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum,
+        sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort,
+        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and
+        yes</seg>
+        <seg>libstdbuf.so (in /usr/libexec/coreutils)</seg>
+        <seg>/usr/libexec/coreutils</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="base32">
+        <term><command>base32</command></term>
+        <listitem>
+          <para>Encodes and decodes data according to the base32 specification
+          (RFC 4648)</para>
+          <indexterm zone="ch-system-coreutils base64">
+            <primary sortas="b-base64">base64</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="base64">
+        <term><command>base64</command></term>
+        <listitem>
+          <para>Encodes and decodes data according to the base64 specification
+          (RFC 4648)</para>
+          <indexterm zone="ch-system-coreutils base64">
+            <primary sortas="b-base64">base64</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="b2sum">
+        <term><command>b2sum</command></term>
+        <listitem>
+          <para>Prints or checks BLAKE2 (512-bit) checksums</para>
+          <indexterm zone="ch-system-coreutils b2sum">
+            <primary sortas="b-b2sum">b2sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="basename">
+        <term><command>basename</command></term>
+        <listitem>
+          <para>Strips any path and a given suffix from a file name</para>
+          <indexterm zone="ch-system-coreutils basename">
+            <primary sortas="b-basename">basename</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="basenc">
+        <term><command>basenc</command></term>
+        <listitem>
+          <para>Encodes or decodes data using various algorithms</para>
+          <indexterm zone="ch-system-coreutils basenc">
+            <primary sortas="b-basenc">basenc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="cat">
+        <term><command>cat</command></term>
+        <listitem>
+          <para>Concatenates files to standard output</para>
+          <indexterm zone="ch-system-coreutils cat">
+            <primary sortas="b-cat">cat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="chcon">
+        <term><command>chcon</command></term>
+        <listitem>
+          <para>Changes security context for files and directories</para>
+          <indexterm zone="ch-system-coreutils chcon">
+            <primary sortas="b-chcon">chcon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="chgrp">
+        <term><command>chgrp</command></term>
+        <listitem>
+          <para>Changes the group ownership of files and directories</para>
+          <indexterm zone="ch-system-coreutils chgrp">
+            <primary sortas="b-chgrp">chgrp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="chmod">
+        <term><command>chmod</command></term>
+        <listitem>
+          <para>Changes the permissions of each file to the given mode; the mode
+          can be either a symbolic representation of the changes to make or an
+          octal number representing the new permissions</para>
+          <indexterm zone="ch-system-coreutils chmod">
+            <primary sortas="b-chmod">chmod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="chown">
+        <term><command>chown</command></term>
+        <listitem>
+          <para>Changes the user and/or group ownership of files and
+          directories</para>
+          <indexterm zone="ch-system-coreutils chown">
+            <primary sortas="b-chown">chown</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="chroot">
+        <term><command>chroot</command></term>
+        <listitem>
+          <para>Runs a command with the specified directory as the
+          <filename class="directory">/</filename> directory</para>
+          <indexterm zone="ch-system-coreutils chroot">
+            <primary sortas="b-chroot">chroot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="cksum">
+        <term><command>cksum</command></term>
+        <listitem>
+          <para>Prints the Cyclic Redundancy Check (CRC) checksum and the byte
+          counts of each specified file</para>
+          <indexterm zone="ch-system-coreutils cksum">
+            <primary sortas="b-cksum">cksum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="comm">
+        <term><command>comm</command></term>
+        <listitem>
+          <para>Compares two sorted files, outputting in three columns the lines
+          that are unique and the lines that are common</para>
+          <indexterm zone="ch-system-coreutils comm">
+            <primary sortas="b-comm">comm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="cp">
+        <term><command>cp</command></term>
+        <listitem>
+          <para>Copies files</para>
+          <indexterm zone="ch-system-coreutils cp">
+            <primary sortas="b-cp">cp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="csplit">
+        <term><command>csplit</command></term>
+        <listitem>
+          <para>Splits a given file into several new files, separating them
+          according to given patterns or line numbers and outputting the byte
+          count of each new file</para>
+          <indexterm zone="ch-system-coreutils csplit">
+            <primary sortas="b-csplit">csplit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="cut">
+        <term><command>cut</command></term>
+        <listitem>
+          <para>Prints sections of lines, selecting the parts according to given
+          fields or positions</para>
+          <indexterm zone="ch-system-coreutils cut">
+            <primary sortas="b-cut">cut</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="date">
+        <term><command>date</command></term>
+        <listitem>
+          <para>Displays the current time in the given format, or sets the
+          system date</para>
+          <indexterm zone="ch-system-coreutils date">
+            <primary sortas="b-date">date</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="dd">
+        <term><command>dd</command> </term>
+        <listitem>
+          <para>Copies a file using the given block size and count, while
+          optionally performing conversions on it</para>
+          <indexterm zone="ch-system-coreutils dd">
+            <primary sortas="b-dd">dd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="df">
+        <term><command>df</command></term>
+        <listitem>
+          <para>Reports the amount of disk space available (and used) on all
+          mounted file systems, or only on the file systems holding the selected
+          files</para>
+          <indexterm zone="ch-system-coreutils df">
+            <primary sortas="b-df">df</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="dir">
+        <term><command>dir</command></term>
+        <listitem>
+          <para>Lists the contents of each given directory (the same as
+          the <command>ls</command> command)</para>
+          <indexterm zone="ch-system-coreutils dir">
+            <primary sortas="b-dir">dir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="dircolors">
+        <term><command>dircolors</command></term>
+        <listitem>
+          <para>Outputs commands to set the <envar>LS_COLOR</envar>
+          environment variable to change the color scheme used by
+          <command>ls</command></para>
+          <indexterm zone="ch-system-coreutils dircolors">
+            <primary sortas="b-dircolors">dircolors</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="dirname">
+        <term><command>dirname</command></term>
+        <listitem>
+          <para>Strips the non-directory suffix from a file name</para>
+          <indexterm zone="ch-system-coreutils dirname">
+            <primary sortas="b-dirname">dirname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="du">
+        <term><command>du</command></term>
+        <listitem>
+          <para>Reports the amount of disk space used by the current directory,
+          by each of the given directories (including all subdirectories) or by
+          each of the given files</para>
+          <indexterm zone="ch-system-coreutils du">
+            <primary sortas="b-du">du</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="echo">
+        <term><command>echo</command></term>
+        <listitem>
+          <para>Displays the given strings</para>
+          <indexterm zone="ch-system-coreutils echo">
+            <primary sortas="b-echo">echo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="env">
+        <term><command>env</command></term>
+        <listitem>
+          <para>Runs a command in a modified environment</para>
+          <indexterm zone="ch-system-coreutils env">
+            <primary sortas="b-env">env</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="expand">
+        <term><command>expand</command></term>
+        <listitem>
+          <para>Converts tabs to spaces</para>
+          <indexterm zone="ch-system-coreutils expand">
+            <primary sortas="b-expand">expand</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="expr">
+        <term><command>expr</command></term>
+        <listitem>
+          <para>Evaluates expressions</para>
+          <indexterm zone="ch-system-coreutils expr">
+            <primary sortas="b-expr">expr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="factor">
+        <term><command>factor</command></term>
+        <listitem>
+          <para>Prints the prime factors of all specified integer numbers</para>
+          <indexterm zone="ch-system-coreutils factor">
+            <primary sortas="b-factor">factor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="false">
+        <term><command>false</command></term>
+        <listitem>
+          <para>Does nothing, unsuccessfully; it always exits with a status code
+          indicating failure</para>
+          <indexterm zone="ch-system-coreutils false">
+            <primary sortas="b-false">false</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="fmt">
+        <term><command>fmt</command></term>
+        <listitem>
+          <para>Reformats the paragraphs in the given files</para>
+          <indexterm zone="ch-system-coreutils fmt">
+            <primary sortas="b-fmt">fmt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="fold">
+        <term><command>fold</command></term>
+        <listitem>
+          <para>Wraps the lines in the given files</para>
+          <indexterm zone="ch-system-coreutils fold">
+            <primary sortas="b-fold">fold</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="groups">
+        <term><command>groups</command></term>
+        <listitem>
+          <para>Reports a user's group memberships</para>
+          <indexterm zone="ch-system-coreutils groups">
+            <primary sortas="b-groups">groups</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="head">
+        <term><command>head</command></term>
+        <listitem>
+          <para>Prints the first ten lines (or the given number of lines)
+          of each given file</para>
+          <indexterm zone="ch-system-coreutils head">
+            <primary sortas="b-head">head</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="hostid">
+        <term><command>hostid</command></term>
+        <listitem>
+          <para>Reports the numeric identifier (in hexadecimal) of the host</para>
+          <indexterm zone="ch-system-coreutils hostid">
+            <primary sortas="b-hostid">hostid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="id">
+        <term><command>id</command></term>
+        <listitem>
+          <para>Reports the effective user ID, group ID, and group memberships
+          of the current user or specified user</para>
+          <indexterm zone="ch-system-coreutils id">
+            <primary sortas="b-id">id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="install">
+        <term><command>install</command> </term>
+        <listitem>
+          <para>Copies files while setting their permission modes and, if
+          possible, their owner and group</para>
+          <indexterm zone="ch-system-coreutils install">
+            <primary sortas="b-install">install</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="join">
+        <term><command>join</command></term>
+        <listitem>
+          <para>Joins the lines that have identical join fields from two
+          separate files</para>
+          <indexterm zone="ch-system-coreutils join">
+            <primary sortas="b-join">join</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="link">
+        <term><command>link</command></term>
+        <listitem>
+          <para>Creates a hard link with the given name to a file</para>
+          <indexterm zone="ch-system-coreutils link">
+            <primary sortas="b-link">link</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="ln">
+        <term><command>ln</command></term>
+        <listitem>
+          <para>Makes hard links or soft (symbolic) links between files</para>
+          <indexterm zone="ch-system-coreutils ln">
+            <primary sortas="b-ln">ln</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="logname">
+        <term><command>logname</command></term>
+        <listitem>
+          <para>Reports the current user's login name</para>
+          <indexterm zone="ch-system-coreutils logname">
+            <primary sortas="b-logname">logname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="ls">
+        <term><command>ls</command></term>
+        <listitem>
+          <para>Lists the contents of each given directory</para>
+          <indexterm zone="ch-system-coreutils ls">
+            <primary sortas="b-ls">ls</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="md5sum">
+        <term><command>md5sum</command></term>
+        <listitem>
+          <para>Reports or checks Message Digest 5 (MD5) checksums</para>
+          <indexterm zone="ch-system-coreutils md5sum">
+            <primary sortas="b-md5sum">md5sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="mkdir">
+        <term><command>mkdir</command></term>
+        <listitem>
+          <para>Creates directories with the given names</para>
+          <indexterm zone="ch-system-coreutils mkdir">
+            <primary sortas="b-mkdir">mkdir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="mkfifo">
+        <term><command>mkfifo</command></term>
+        <listitem>
+          <para>Creates First-In, First-Outs (FIFOs), a "named
+          pipe" in UNIX parlance, with the given names</para>
+          <indexterm zone="ch-system-coreutils mkfifo">
+            <primary sortas="b-mkfifo">mkfifo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="mknod">
+        <term><command>mknod</command></term>
+        <listitem>
+          <para>Creates device nodes with the given names; a device node is a
+          character special file, a block special file, or a FIFO</para>
+          <indexterm zone="ch-system-coreutils mknod">
+            <primary sortas="b-mknod">mknod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="mktemp">
+        <term><command>mktemp</command></term>
+        <listitem>
+          <para>Creates temporary files in a secure manner; it is used in scripts</para>
+        <indexterm zone="ch-system-coreutils mktemp">
+          <primary sortas="b-mktemp">mktemp</primary>
+        </indexterm>
+       </listitem>
+     </varlistentry>
+      <varlistentry id="mv">
+        <term><command>mv</command></term>
+        <listitem>
+          <para>Moves or renames files or directories</para>
+          <indexterm zone="ch-system-coreutils mv">
+            <primary sortas="b-mv">mv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="nice">
+        <term><command>nice</command></term>
+        <listitem>
+          <para>Runs a program with modified scheduling priority</para>
+          <indexterm zone="ch-system-coreutils nice">
+            <primary sortas="b-nice">nice</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="nl">
+        <term><command>nl</command></term>
+        <listitem>
+          <para>Numbers the lines from the given files</para>
+          <indexterm zone="ch-system-coreutils nl">
+            <primary sortas="b-nl">nl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="nohup">
+        <term><command>nohup</command></term>
+        <listitem>
+          <para>Runs a command immune to hangups, with its output redirected to
+          a log file</para>
+          <indexterm zone="ch-system-coreutils nohup">
+            <primary sortas="b-nohup">nohup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="nproc">
+        <term><command>nproc</command></term>
+        <listitem>
+          <para>Prints the number of processing units available to a
+          process</para>
+          <indexterm zone="ch-system-coreutils nproc">
+            <primary sortas="b-nproc">nproc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="numfmt">
+        <term><command>numfmt</command></term>
+        <listitem>
+          <para>Converts numbers to or from human-readable strings</para>
+          <indexterm zone="ch-system-coreutils numfmt">
+            <primary sortas="b-numfmt">numfmt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="od">
+        <term><command>od</command></term>
+        <listitem>
+          <para>Dumps files in octal and other formats</para>
+          <indexterm zone="ch-system-coreutils od">
+            <primary sortas="b-od">od</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="paste">
+        <term><command>paste</command></term>
+        <listitem>
+          <para>Merges the given files, joining sequentially corresponding lines
+          side by side, separated by tab characters</para>
+          <indexterm zone="ch-system-coreutils paste">
+            <primary sortas="b-paste">paste</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="pathchk">
+        <term><command>pathchk</command></term>
+        <listitem>
+          <para>Checks if file names are valid or portable</para>
+          <indexterm zone="ch-system-coreutils pathchk">
+            <primary sortas="b-pathchk">pathchk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="pinky">
+        <term><command>pinky</command></term>
+        <listitem>
+          <para>Is a lightweight finger client; it reports some information
+          about the given users</para>
+          <indexterm zone="ch-system-coreutils pinky">
+            <primary sortas="b-pinky">pinky</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="pr">
+        <term><command>pr</command></term>
+        <listitem>
+          <para>Paginates and columnates files for printing</para>
+          <indexterm zone="ch-system-coreutils pr">
+            <primary sortas="b-pr">pr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="printenv">
+        <term><command>printenv</command></term>
+        <listitem>
+          <para>Prints the environment</para>
+          <indexterm zone="ch-system-coreutils printenv">
+            <primary sortas="b-printenv">printenv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="printf">
+        <term><command>printf</command></term>
+        <listitem>
+          <para>Prints the given arguments according to the given format, much
+          like the C printf function</para>
+          <indexterm zone="ch-system-coreutils printf">
+            <primary sortas="b-printf">printf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="ptx">
+        <term><command>ptx</command></term>
+        <listitem>
+          <para>Produces a permuted index from the contents of the given files,
+          with each keyword in its context</para>
+          <indexterm zone="ch-system-coreutils ptx">
+            <primary sortas="b-ptx">ptx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="pwd">
+        <term><command>pwd</command></term>
+        <listitem>
+          <para>Reports the name of the current working directory</para>
+          <indexterm zone="ch-system-coreutils pwd">
+            <primary sortas="b-pwd">pwd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="readlink">
+        <term><command>readlink</command></term>
+        <listitem>
+          <para>Reports the value of the given symbolic link</para>
+          <indexterm zone="ch-system-coreutils readlink">
+            <primary sortas="b-readlink">readlink</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="realpath">
+        <term><command>realpath</command></term>
+        <listitem>
+          <para>Prints the resolved path</para>
+          <indexterm zone="ch-system-coreutils realpath">
+            <primary sortas="b-realpath">realpath</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="rm">
+        <term><command>rm</command></term>
+        <listitem>
+          <para>Removes files or directories</para>
+          <indexterm zone="ch-system-coreutils rm">
+            <primary sortas="b-rm">rm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="rmdir">
+        <term><command>rmdir</command></term>
+        <listitem>
+          <para>Removes directories if they are empty</para>
+          <indexterm zone="ch-system-coreutils rmdir">
+            <primary sortas="b-rmdir">rmdir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="runcon">
+        <term><command>runcon</command></term>
+        <listitem>
+          <para>Runs a command with specified security context</para>
+          <indexterm zone="ch-system-coreutils runcon">
+            <primary sortas="b-runcon">runcon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="seq">
+        <term><command>seq</command></term>
+        <listitem>
+          <para>Prints a sequence of numbers within a given range and with a
+          given increment</para>
+          <indexterm zone="ch-system-coreutils seq">
+            <primary sortas="b-seq">seq</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sha1sum">
+        <term><command>sha1sum</command></term>
+        <listitem>
+          <para>Prints or checks 160-bit Secure Hash Algorithm 1 (SHA1)
+          checksums</para>
+          <indexterm zone="ch-system-coreutils sha1sum">
+            <primary sortas="b-sha1sum">sha1sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sha224sum">
+        <term><command>sha224sum</command></term>
+        <listitem>
+          <para>Prints or checks 224-bit Secure Hash Algorithm checksums</para>
+          <indexterm zone="ch-system-coreutils sha224sum">
+            <primary sortas="b-sha224sum">sha224sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sha256sum">
+        <term><command>sha256sum</command></term>
+        <listitem>
+          <para>Prints or checks 256-bit Secure Hash Algorithm checksums</para>
+          <indexterm zone="ch-system-coreutils sha256sum">
+            <primary sortas="b-sha256sum">sha256sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sha384sum">
+        <term><command>sha384sum</command></term>
+        <listitem>
+          <para>Prints or checks 384-bit Secure Hash Algorithm checksums</para>
+          <indexterm zone="ch-system-coreutils sha384sum">
+            <primary sortas="b-sha384sum">sha384sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sha512sum">
+        <term><command>sha512sum</command></term>
+        <listitem>
+          <para>Prints or checks 512-bit Secure Hash Algorithm checksums</para>
+          <indexterm zone="ch-system-coreutils sha512sum">
+            <primary sortas="b-sha512sum">sha512sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="shred">
+        <term><command>shred</command></term>
+        <listitem>
+          <para>Overwrites the given files repeatedly with complex patterns,
+          making it difficult to recover the data</para>
+          <indexterm zone="ch-system-coreutils shred">
+            <primary sortas="b-shred">shred</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="shuf">
+        <term><command>shuf</command></term>
+        <listitem>
+          <para>Shuffles lines of text</para>
+          <indexterm zone="ch-system-coreutils shuf">
+            <primary sortas="b-shuf">shuf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sleep">
+        <term><command>sleep</command></term>
+        <listitem>
+          <para>Pauses for the given amount of time</para>
+          <indexterm zone="ch-system-coreutils sleep">
+            <primary sortas="b-sleep">sleep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sort">
+        <term><command>sort</command></term>
+        <listitem>
+          <para>Sorts the lines from the given files</para>
+          <indexterm zone="ch-system-coreutils sort">
+            <primary sortas="b-sort">sort</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="split">
+        <term><command>split</command></term>
+        <listitem>
+          <para>Splits the given file into pieces, by size or by number of
+          lines</para>
+          <indexterm zone="ch-system-coreutils split">
+            <primary sortas="b-split">split</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="stat">
+        <term><command>stat</command></term>
+        <listitem>
+          <para>Displays file or filesystem status</para>
+          <indexterm zone="ch-system-coreutils stat">
+            <primary sortas="b-stat">stat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="stdbuf">
+        <term><command>stdbuf</command></term>
+        <listitem>
+          <para>Runs commands with altered buffering operations for its standard
+          streams</para>
+          <indexterm zone="ch-system-coreutils stdbuf">
+            <primary sortas="b-stdbuf">stdbuf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="stty">
+        <term><command>stty</command></term>
+        <listitem>
+          <para>Sets or reports terminal line settings</para>
+          <indexterm zone="ch-system-coreutils stty">
+            <primary sortas="b-stty">stty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sum">
+        <term><command>sum</command></term>
+        <listitem>
+          <para>Prints checksum and block counts for each given file</para>
+          <indexterm zone="ch-system-coreutils sum">
+            <primary sortas="b-sum">sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sync">
+        <term><command>sync</command></term>
+        <listitem>
+          <para>Flushes file system buffers; it forces changed blocks to disk
+          and updates the super block</para>
+          <indexterm zone="ch-system-coreutils sync">
+            <primary sortas="b-sync">sync</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tac">
+        <term><command>tac</command></term>
+        <listitem>
+          <para>Concatenates the given files in reverse</para>
+          <indexterm zone="ch-system-coreutils tac">
+            <primary sortas="b-tac">tac</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tail">
+        <term><command>tail</command></term>
+        <listitem>
+          <para>Prints the last ten lines (or the given number of lines) of each
+          given file</para>
+          <indexterm zone="ch-system-coreutils tail">
+            <primary sortas="b-tail">tail</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tee">
+        <term><command>tee</command></term>
+        <listitem>
+          <para>Reads from standard input while writing both to standard output
+          and to the given files</para>
+          <indexterm zone="ch-system-coreutils tee">
+            <primary sortas="b-tee">tee</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="test">
+        <term><command>test</command></term>
+        <listitem>
+          <para>Compares values and checks file types</para>
+          <indexterm zone="ch-system-coreutils test">
+            <primary sortas="b-test">test</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="timeout">
+        <term><command>timeout</command></term>
+        <listitem>
+          <para>Runs a command with a time limit</para>
+          <indexterm zone="ch-system-coreutils timeout">
+            <primary sortas="b-timeout">timeout</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="touch">
+        <term><command>touch</command></term>
+        <listitem>
+          <para>Changes file timestamps, setting the access and modification
+          times of the given files to the current time; files that do not exist
+          are created with zero length</para>
+          <indexterm zone="ch-system-coreutils touch">
+            <primary sortas="b-touch">touch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tr">
+        <term><command>tr</command></term>
+        <listitem>
+          <para>Translates, squeezes, and deletes the given characters from
+          standard input</para>
+          <indexterm zone="ch-system-coreutils tr">
+            <primary sortas="b-tr">tr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="true">
+        <term><command>true</command></term>
+        <listitem>
+          <para>Does nothing, successfully; it always exits with a status code
+          indicating success</para>
+          <indexterm zone="ch-system-coreutils true">
+            <primary sortas="b-true">true</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="truncate">
+        <term><command>truncate</command></term>
+        <listitem>
+          <para>Shrinks or expands a file to the specified size</para>
+          <indexterm zone="ch-system-coreutils truncate">
+            <primary sortas="b-truncate">truncate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tsort">
+        <term><command>tsort</command></term>
+        <listitem>
+          <para>Performs a topological sort; it writes a completely ordered list
+          according to the partial ordering in a given file</para>
+          <indexterm zone="ch-system-coreutils tsort">
+            <primary sortas="b-tsort">tsort</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tty">
+        <term><command>tty</command></term>
+        <listitem>
+          <para>Reports the file name of the terminal connected to standard
+          input</para>
+          <indexterm zone="ch-system-coreutils tty">
+            <primary sortas="b-tty">tty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="uname">
+        <term><command>uname</command></term>
+        <listitem>
+          <para>Reports system information</para>
+          <indexterm zone="ch-system-coreutils uname">
+            <primary sortas="b-uname">uname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="unexpand">
+        <term><command>unexpand</command></term>
+        <listitem>
+          <para>Converts spaces to tabs</para>
+          <indexterm zone="ch-system-coreutils unexpand">
+            <primary sortas="b-unexpand">unexpand</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="uniq">
+        <term><command>uniq</command></term>
+        <listitem>
+          <para>Discards all but one of successive identical lines</para>
+          <indexterm zone="ch-system-coreutils uniq">
+            <primary sortas="b-uniq">uniq</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="unlink">
+        <term><command>unlink</command></term>
+        <listitem>
+          <para>Removes the given file</para>
+          <indexterm zone="ch-system-coreutils unlink">
+            <primary sortas="b-unlink">unlink</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="users">
+        <term><command>users</command></term>
+        <listitem>
+          <para>Reports the names of the users currently logged on</para>
+          <indexterm zone="ch-system-coreutils users">
+            <primary sortas="b-users">users</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="vdir">
+        <term><command>vdir</command></term>
+        <listitem>
+          <para>Is the same as <command>ls -l</command></para>
+          <indexterm zone="ch-system-coreutils vdir">
+            <primary sortas="b-vdir">vdir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="wc">
+        <term><command>wc</command></term>
+        <listitem>
+          <para>Reports the number of lines, words, and bytes for each given
+          file, as well as a total line when more than one file is given</para>
+          <indexterm zone="ch-system-coreutils wc">
+            <primary sortas="b-wc">wc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="who">
+        <term><command>who</command></term>
+        <listitem>
+          <para>Reports who is logged on</para>
+          <indexterm zone="ch-system-coreutils who">
+            <primary sortas="b-who">who</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="whoami">
+        <term><command>whoami</command></term>
+        <listitem>
+          <para>Reports the user name associated with the current effective
+          user ID</para>
+          <indexterm zone="ch-system-coreutils whoami">
+            <primary sortas="b-whoami">whoami</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="yes">
+        <term><command>yes</command></term>
+        <listitem>
+          <para>Repeatedly outputs <quote>y</quote> or a given string until
+          killed</para>
+          <indexterm zone="ch-system-coreutils yes">
+            <primary sortas="b-yes">yes</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="libstdbuf">
+        <term><filename class="libraryfile">libstdbuf</filename></term>
+        <listitem>
+          <para>Library used by <command>stdbuf</command></para>
+          <indexterm zone="ch-system-coreutils libstdbuf">
+            <primary sortas="c-libstdbuf">libstdbuf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-coreutils" role="."/></para>
   </sect2>

chapter06/diffutils.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-diffutils" role="wrap">
+<sect1 id="ch-tools-diffutils" role="wrap">
   <?dbhtml filename="diffutils.html"?>
 …
   <title>Diffutils-&diffutils-version;</title>
   <indexterm zone="ch-system-diffutils">
+  <indexterm zone="ch-tools-diffutils">
     <primary sortas="a-Diffutils">Diffutils</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Diffutils package contains programs that show the differences
+    between files or directories.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/diffutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&diffutils-ch6-sbu;</seg>
         <seg>&diffutils-ch6-du;</seg>
+        <seg>&diffutils-tmp-sbu;</seg>
+        <seg>&diffutils-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <para>Prepare Diffutils for compilation:</para>
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT</userinput></screen>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
     <para>Install the package:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
+  <sect2 role="content">
+    <title/>
+  <sect2 id="contents-diffutils" role="content">
+    <title>Contents of Diffutils</title>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <seglistitem>
+        <seg>cmp, diff, diff3, and sdiff</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="cmp">
+        <term><command>cmp</command></term>
+        <listitem>
+          <para>Compares two files and reports whether or in which bytes they
+          differ</para>
+          <indexterm zone="ch-system-diffutils cmp">
+            <primary sortas="b-cmp">cmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="diff">
+        <term><command>diff</command></term>
+        <listitem>
+          <para>Compares two files or directories and reports which lines in
+          the files differ</para>
+          <indexterm zone="ch-system-diffutils diff">
+            <primary sortas="b-diff">diff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="diff3">
+        <term><command>diff3</command></term>
+        <listitem>
+            <para>Compares three files line by line</para>
+            <indexterm zone="ch-system-diffutils diff3">
+              <primary sortas="b-diff3">diff3</primary>
+            </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sdiff">
+        <term><command>sdiff</command></term>
+        <listitem>
+          <para>Merges two files and interactively outputs the results</para>
+          <indexterm zone="ch-system-diffutils sdiff">
+            <primary sortas="b-sdiff">sdiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-diffutils" role="."/></para>
   </sect2>

chapter06/file.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-file" role="wrap">
+<sect1 id="ch-tools-file" role="wrap">
   <?dbhtml filename="file.html"?>
 …
   <title>File-&file-version;</title>
   <indexterm zone="ch-system-file">
+  <indexterm zone="ch-tools-file">
     <primary sortas="a-File">File</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The File package contains a utility for determining the type of a given
+    file or files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/file.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&file-ch6-sbu;</seg>
         <seg>&file-ch6-du;</seg>
+        <seg>&file-tmp-sbu;</seg>
+        <seg>&file-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <para>Prepare File for compilation:</para>
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT</userinput></screen>
+<!-- devs: if using - -build here, the build system wants to compile
+     the signature file with "file" on the build system, but stops if it is not
+     the same version. One possibility would be to build "file" on the build
+     system first, but it is simpler to have the system think it is not
+     cross-compiling, and use the just built "file". -->
     <para>Compile the package:</para>
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
     <para>Install the package:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
+  <sect2 id="contents-file" role="content">
+    <title>Contents of File</title>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
+      <seglistitem>
+        <seg>file</seg>
+        <seg>libmagic.so</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="file">
+        <term><command>file</command></term>
+        <listitem>
+          <para>Tries to classify each given file; it does this by performing
+          several tests&mdash;file system tests, magic number tests, and language
+          tests</para>
+          <indexterm zone="ch-system-file file">
+            <primary sortas="b-file">file</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="libmagic">
+        <term><filename class="libraryfile">libmagic</filename></term>
+        <listitem>
+          <para>Contains routines for magic number recognition, used by the
+          <command>file</command> program</para>
+          <indexterm zone="ch-system-file libmagic">
+            <primary sortas="c-libmagic">libmagic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  <sect2 role="content">
+    <title/>
+    <para>Details on this package are located in<!-- TODO
+    <xref linkend="contents-file" role="."/>      --></para>
   </sect2>

chapter06/findutils.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-findutils" role="wrap">
+<sect1 id="ch-tools-findutils" role="wrap">
   <?dbhtml filename="findutils.html"?>
 …
   <title>Findutils-&findutils-version;</title>
   <indexterm zone="ch-system-findutils">
+  <indexterm zone="ch-tools-findutils">
     <primary sortas="a-Findutils">Findutils</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Findutils package contains programs to find files. These programs
+    are provided to recursively search through a directory tree and to
+    create, maintain, and search a database (often faster than the recursive
+    find, but unreliable if the database has not been recently updated).</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/findutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&findutils-ch6-sbu;</seg>
         <seg>&findutils-ch6-du;</seg>
+        <seg>&findutils-tmp-sbu;</seg>
+        <seg>&findutils-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <para>Prepare Findutils for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr --localstatedir=/var/lib/locate</userinput></screen>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+      <varlistentry>
+        <term><parameter>--localstatedir</parameter></term>
+        <listitem>
+          <para>This option changes the location of the <command>locate</command>
+          database to be in <filename class="directory">/var/lib/locate</filename>,
+          which is FHS-compliant.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --host=$LFS_TGT \
+            --build=$(build-aux/config.guess)</userinput></screen>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results, issue:</para>
-<screen><userinput remap="test">chown -Rv tester .
-su tester -c "PATH=$PATH make check"</userinput></screen>
     <para>Install the package:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+    <para revision="sysv">Some of the scripts in the LFS-Bootscripts package
+    depend on <command>find</command>.  As <filename
+    class="directory">/usr</filename> may not be available during the early
+    stages of booting, this program needs to be on the root partition.  The
+    <command>updatedb</command> script also needs to be modified to correct an
+    explicit path:</para>
+    <para>Move the excutable to its final expected location:</para>
+    <para revision="systemd"> Some packages in BLFS and beyond expect the
+    <command>find</command> program in <filename
+    class="directory">/bin</filename>, so make sure it's placed there:</para>
+<screen><userinput remap="install">mv -v /usr/bin/find /bin
+sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
+<screen><userinput remap="install">mv -v $LFS/usr/bin/find $LFS/bin
+sed -i 's|find:=${BINDIR}|find:=/bin|' $LFS/usr/bin/updatedb</userinput></screen>
   </sect2>
   <sect2 id="contents-findutils" role="content">
     <title>Contents of Findutils</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
+      <seglistitem>
+        <seg>find, locate, updatedb, and xargs</seg>
+        <seg>/var/lib/locate</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="find">
+        <term><command>find</command></term>
+        <listitem>
+          <para>Searches given directory trees for files matching the specified
+          criteria</para>
+          <indexterm zone="ch-system-findutils find">
+            <primary sortas="b-find">find</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="locate">
+        <term><command>locate</command></term>
+        <listitem>
+          <para>Searches through a database of file names and reports the names
+          that contain a given string or match a given pattern</para>
+          <indexterm zone="ch-system-findutils locate">
+            <primary sortas="b-locate">locate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="updatedb">
+      <term><command>updatedb</command></term>
+        <listitem>
+          <para>Updates the <command>locate</command> database; it scans the
+          entire file system (including other file systems that are currently
+          mounted, unless told not to) and puts every file name it finds into
+          the database</para>
+          <indexterm zone="ch-system-findutils updatedb">
+            <primary sortas="b-updatedb">updatedb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xargs">
+        <term><command>xargs</command></term>
+        <listitem>
+          <para>Can be used to apply a given command to a list of files</para>
+          <indexterm zone="ch-system-findutils xargs">
+            <primary sortas="b-xargs">xargs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-findutils" role="."/></para>
   </sect2>

chapter06/gawk.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-gawk" role="wrap">
+<sect1 id="ch-tools-gawk" role="wrap">
   <?dbhtml filename="gawk.html"?>
 …
   <title>Gawk-&gawk-version;</title>
   <indexterm zone="ch-system-gawk">
+  <indexterm zone="ch-tools-gawk">
     <primary sortas="a-Gawk">Gawk</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Gawk package contains programs for manipulating text files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/gawk.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&gawk-ch6-sbu;</seg>
         <seg>&gawk-ch6-du;</seg>
+        <seg>&gawk-tmp-sbu;</seg>
+        <seg>&gawk-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <para>Prepare Gawk for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --host=$LFS_TGT \
+            --build=$(./config.guess)</userinput></screen>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
     <para>Install the package:</para>
+<screen><userinput remap="install">make install</userinput></screen>
+    <para>If desired, install the documentation:</para>
+<screen><userinput remap="install">mkdir -v /usr/share/doc/gawk-&gawk-version;
+cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
   <sect2 id="contents-gawk" role="content">
     <title>Contents of Gawk</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+      <seglistitem>
+        <seg>awk (link to gawk), gawk, and awk-&gawk-version;</seg>
+        <seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, intdiv.so, ordchr.so,
+        readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
+        and time.so (all in /usr/lib/gawk)</seg>
+        <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, and
+        /usr/share/doc/gawk-&gawk-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="awk">
+        <term><command>awk</command></term>
+        <listitem>
+          <para>A link to <command>gawk</command></para>
+          <indexterm zone="ch-system-gawk awk">
+            <primary sortas="b-awk">awk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="gawk">
+        <term><command>gawk</command></term>
+        <listitem>
+          <para>A program for manipulating text files; it is the GNU
+          implementation of <command>awk</command></para>
+          <indexterm zone="ch-system-gawk gawk">
+            <primary sortas="b-gawk">gawk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="gawk-version">
+        <term><command>gawk-&gawk-version;</command></term>
+        <listitem>
+          <para>A hard link to <command>gawk</command></para>
+          <indexterm zone="ch-system-gawk gawk-version">
+            <primary sortas="b-gawk-&gawk-version;">gawk-&gawk-version;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-gawk" role="."/></para>
   </sect2>

chapter06/grep.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-grep" role="wrap">
+<sect1 id="ch-tools-grep" role="wrap">
   <?dbhtml filename="grep.html"?>
 …
   <title>Grep-&grep-version;</title>
   <indexterm zone="ch-system-grep">
+  <indexterm zone="ch-tools-grep">
     <primary sortas="a-Grep">Grep</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Grep package contains programs for searching through files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/grep.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&grep-ch6-sbu;</seg>
         <seg>&grep-ch6-du;</seg>
+        <seg>&grep-tmp-sbu;</seg>
+        <seg>&grep-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <para>Prepare Grep for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --host=$LFS_TGT \
+            --bindir=/bin</userinput></screen>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
     <para>Install the package:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
   <sect2 id="contents-grep" role="content">
     <title>Contents of Grep</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <seglistitem>
+        <seg>egrep, fgrep, and grep</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="egrep">
+        <term><command>egrep</command></term>
+        <listitem>
+          <para>Prints lines matching an extended regular expression</para>
+          <indexterm zone="ch-system-grep egrep">
+            <primary sortas="b-egrep">egrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="fgrep">
+        <term><command>fgrep</command></term>
+        <listitem>
+          <para>Prints lines matching a list of fixed strings</para>
+          <indexterm zone="ch-system-grep fgrep">
+            <primary sortas="b-fgrep">fgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grep">
+        <term><command>grep</command></term>
+        <listitem>
+          <para>Prints lines matching a basic regular expression</para>
+          <indexterm zone="ch-system-grep grep">
+            <primary sortas="b-grep">grep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-grep" role="."/></para>
   </sect2>

chapter06/gzip.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-gzip" role="wrap">
+<sect1 id="ch-tools-gzip" role="wrap">
   <?dbhtml filename="gzip.html"?>
 …
   <title>Gzip-&gzip-version;</title>
   <indexterm zone="ch-system-gzip">
+  <indexterm zone="ch-tools-gzip">
     <primary sortas="a-Gzip">Gzip</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Gzip package contains programs for compressing and decompressing
+    files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/gzip.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&gzip-ch6-sbu;</seg>
         <seg>&gzip-ch6-du;</seg>
+        <seg>&gzip-tmp-sbu;</seg>
+        <seg>&gzip-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <para>Prepare Gzip for compilation:</para>
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT</userinput></screen>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
-    <para>Two tests are known to fail in the LFS environment:
-    help-version and zmore.</para>
     <para>Install the package:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
     <para>Move a program that needs to be on the root filesystem:</para>
+    <para>Move the excutable to its final expected location:</para>
 <screen><userinput remap="install">mv -v /usr/bin/gzip /bin</userinput></screen>
+<screen><userinput remap="install">mv -v $LFS/usr/bin/gzip $LFS/bin</userinput></screen>
   </sect2>
   <sect2 id="contents-gzip" role="content">
     <title>Contents of Gzip</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <seglistitem>
+        <seg>gunzip, gzexe, gzip, uncompress (hard link with gunzip), zcat, zcmp,
+        zdiff, zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="gunzip">
+        <term><command>gunzip</command></term>
+        <listitem>
+          <para>Decompresses gzipped files</para>
+          <indexterm zone="ch-system-gzip gunzip">
+            <primary sortas="b-gunzip">gunzip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="gzexe">
+        <term><command>gzexe</command></term>
+        <listitem>
+          <para>Creates self-decompressing executable files</para>
+          <indexterm zone="ch-system-gzip gzexe">
+            <primary sortas="b-gzexe">gzexe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="gzip">
+        <term><command>gzip</command></term>
+        <listitem>
+          <para>Compresses the given files using Lempel-Ziv (LZ77) coding</para>
+          <indexterm zone="ch-system-gzip gzip">
+            <primary sortas="b-gzip">gzip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="uncompress">
+        <term><command>uncompress</command></term>
+        <listitem>
+          <para>Decompresses compressed files</para>
+          <indexterm zone="ch-system-gzip uncompress">
+            <primary sortas="b-uncompress">uncompress</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zcat">
+        <term><command>zcat</command></term>
+        <listitem>
+          <para>Decompresses the given gzipped files to standard output</para>
+          <indexterm zone="ch-system-gzip zcat">
+            <primary sortas="b-zcat">zcat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zcmp">
+        <term><command>zcmp</command></term>
+        <listitem>
+          <para>Runs <command>cmp</command> on gzipped files</para>
+          <indexterm zone="ch-system-gzip zcmp">
+            <primary sortas="b-zcmp">zcmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zdiff">
+        <term><command>zdiff</command></term>
+        <listitem>
+          <para>Runs <command>diff</command> on gzipped files</para>
+          <indexterm zone="ch-system-gzip zdiff">
+            <primary sortas="b-zdiff">zdiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zegrep">
+        <term><command>zegrep</command></term>
+        <listitem>
+          <para>Runs <command>egrep</command> on gzipped files</para>
+          <indexterm zone="ch-system-gzip zegrep">
+            <primary sortas="b-zegrep">zegrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zfgrep">
+        <term><command>zfgrep</command></term>
+        <listitem>
+          <para>Runs <command>fgrep</command> on gzipped files</para>
+          <indexterm zone="ch-system-gzip zfgrep">
+            <primary sortas="b-zfgrep">zfgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zforce">
+        <term><command>zforce</command></term>
+        <listitem>
+          <para>Forces a <filename class="extension">.gz</filename> extension on
+          all given files that are gzipped files, so that <command>gzip</command>
+          will not compress them again; this can be useful when file names were
+          truncated during a file transfer</para>
+          <indexterm zone="ch-system-gzip zforce">
+            <primary sortas="b-zforce">zforce</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zgrep">
+        <term><command>zgrep</command></term>
+        <listitem>
+          <para>Runs <command>grep</command> on gzipped files</para>
+          <indexterm zone="ch-system-gzip zgrep">
+            <primary sortas="b-zgrep">zgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zless">
+        <term><command>zless</command></term>
+        <listitem>
+          <para>Runs <command>less</command> on gzipped files</para>
+          <indexterm zone="ch-system-gzip zless">
+            <primary sortas="b-zless">zless</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="zmore">
+        <term><command>zmore</command></term>
+        <listitem>
+          <para>Runs <command>more</command> on gzipped files</para>
+          <indexterm zone="ch-system-gzip zmore">
+            <primary sortas="b-zmore">zmore</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="znew">
+        <term><command>znew</command></term>
+        <listitem>
+          <para>Re-compresses files from <command>compress</command> format to
+          <command>gzip</command> format&mdash;<filename
+          class="extension">.Z</filename> to <filename
+          class="extension">.gz</filename></para>
+          <indexterm zone="ch-system-gzip znew">
+            <primary sortas="b-znew">znew</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-gzip" role="."/></para>
   </sect2>

chapter06/introduction.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-introduction">
+<sect1 id="ch-tools-introduction-cross">
   <?dbhtml filename="introduction.html"?>
   <title>Introduction</title>
+  <para>In this chapter, we enter the building site and start constructing the
+  LFS system in earnest. That is, we chroot into the temporary mini Linux system,
+  make a few final preparations, and then begin installing the packages.</para>
+  <para>This chapter shows how to cross-compile basic utilities using
+  the just built cross-toolchain. Those utilities are installed into
+  their final location, but cannot be used yet. Basic tasks still rely on
+  the host's tools. Nevertheless, the installed libraries are used when
+  linking.</para>
+  <para>The installation of this software is straightforward. Although in many
+  cases the installation instructions could be made shorter and more generic,
+  we have opted to provide the full instructions for every package to minimize
+  the possibilities for mistakes.  The key to learning what makes a Linux system
+  work is to know what each package is used for and why you (or the system)
+  may need it.</para>
+  <para>Using the utilities will be possible in next chapter after entering
+  the <quote>chroot</quote> environment. But all the packages built in the
+  present chapter need to be built before we do that. Therefore we cannot be
+  independent of the host system yet.</para>
+  <para>We do not recommend using optimizations.  They can make
+  a program run slightly faster, but they may also cause compilation
+  difficulties and problems when running the program.  If a package refuses to
+  compile when using optimization, try to compile it without optimization and
+  see if that fixes the problem. Even if the package does compile when using
+  optimization, there is the risk it may have been compiled incorrectly because
+  of the complex interactions between the code and build tools.  Also note that
+  the <option>-march</option> and <option>-mtune</option> options using values
+  not specified in the book have not been tested. This may cause problems with
+  the toolchain packages (Binutils, GCC and Glibc).  The small potential gains
+  achieved in using compiler optimizations are often outweighed by the risks.
+  First-time builders of LFS are encouraged to build without custom
+  optimizations. The subsequent system will still run very fast and be stable
+  at the same time.</para>
+  <para>The order that packages are installed in this chapter needs to be
+  strictly followed to ensure that no program accidentally acquires a path
+  referring to <filename class="directory">/tools</filename> hard-wired into
+  it.  For the same reason, do not compile separate packages in parallel.
+  Compiling in parallel may save time (especially on dual-CPU machines), but it
+  could result in a program containing a hard-wired path to <filename
+  class="directory">/tools</filename>, which will cause the program to stop
+  working when that directory is removed.</para>
+  <para>Before the installation instructions, each installation page provides
+  information about the package, including a concise description of what it
+  contains, approximately how long it will take to build, and how much disk
+  space is required during this building process. Following the installation
+  instructions, there is a list of programs and libraries (along with brief
+  descriptions of these) that the package installs.</para>
+  <note><para>The SBU values and required disk space includes
+  test suite data for all applicable packages in Chapter&nbsp;6.</para></note>
+  <sect2>
+    <title>About libraries</title>
+    <para>In general, the LFS editors discourage building and installing static
+    libraries.  The original purpose for most static libraries has been made
+    obsolete in a modern Linux system.  In addition linking a static library
+    into a program can be detrimental.  If an update to the library is needed
+    to remove a security problem, all programs that use the static library will
+    need to be relinked to the new library.  Since the use of static libraries
+    is not always obvious, the relevant programs (and the procedures needed to
+    do the linking) may not even be known.</para>
+    <para>In the procedures in Chapter&nbsp;6, we remove or disable installation of
+    most static libraries. Usually this is done by passing a
+    <option>--disable-static</option> option to <command>configure</command>.
+    In other cases, alternate means are needed. In a few cases, especially
+    glibc and gcc, the use of static libraries remains essential to the general
+    package building process. </para>
+    <para>For a more complete discussion of libraries, see the discussion
+    <ulink url="&blfs-root;/view/&short-version;/introduction/libraries.html">
+    Libraries: Static or shared?</ulink> in the BLFS book.</para>
+  </sect2>
+  <para>Once again, let us recall that improper setting of <envar>LFS</envar>
+  together with building as root, may render your computer unusable.
+  This whole chapter must be done as user <systemitem
+  class="username">lfs</systemitem>, with the enviroment as described in
+  <xref linkend="ch-preps-settingenviron"/>.</para>
 </sect1>

chapter06/m4.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-m4" role="wrap">
+<sect1 id="ch-tools-m4" role="wrap">
   <?dbhtml filename="m4.html"?>
 …
   <title>M4-&m4-version;</title>
   <indexterm zone="ch-system-m4">
+  <indexterm zone="ch-tools-m4">
     <primary sortas="a-M4">M4</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The M4 package contains a macro processor.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/m4.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&m4-ch6-sbu;</seg>
         <seg>&m4-ch6-du;</seg>
+        <seg>&m4-tmp-sbu;</seg>
+        <seg>&m4-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <title>Installation of M4</title>
     <para>First, make some fixes required by glibc-2.28:</para>
+    <para>First, make some fixes introduced by glibc-2.28:</para>
 <screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
 …
     <para>Prepare M4 for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --host=$LFS_TGT \
+            --build=$(build-aux/config.guess)</userinput></screen>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
     <para>Install the package:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
+  <sect2 id="contents-m4" role="content">
+    <title>Contents of M4</title>
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <seglistitem>
+        <seg>m4</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="m4">
+         <!-- Don't remove the extra space, it prevet a FOP warning. -->
+        <term><command>m4 </command></term>
+        <listitem>
+          <para>Copies the given files while expanding the macros that they
+          contain [These macros are either built-in or user-defined and can
+          take any number of arguments. Besides performing macro expansion,
+          <command>m4</command> has built-in functions for including named
+          files, running Unix commands, performing integer arithmetic,
+          manipulating text, recursion, etc. The <command>m4</command> program
+          can be used either as a front-end to a compiler or as a macro processor
+          in its own right.]</para>
+          <indexterm zone="ch-system-m4 m4">
+            <primary sortas="b-m4">m4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  <sect2 role="content">
+    <title/>
+    <para>Details on this package are located in
+    <xref linkend="contents-m4" role="."/></para>
   </sect2>

chapter06/make.xml

-              r560065f
+              r675606b
   %general-entities;
 ]>
+<sect1 id="ch-system-make" role="wrap">
+<sect1 id="ch-tools-make" role="wrap">
   <?dbhtml filename="make.html"?>
 …
   <title>Make-&make-version;</title>
   <indexterm zone="ch-system-make">
+  <indexterm zone="ch-tools-make">
     <primary sortas="a-Make">Make</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Make package contains a program for compiling packages.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/make.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&make-ch6-sbu;</seg>
         <seg>&make-ch6-du;</seg>
+        <seg>&make-tmp-sbu;</seg>
+        <seg>&make-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
   <sect2 role="installation">
     <title>Installation of Make</title>
-<!--
-    <para>Again, work around an error caused by glibc-2.27 and later:</para>
-<screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
--->
     <para>Prepare Make for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --without-guile \
+            --host=$LFS_TGT \
+            --build=$(build-aux/config.guess)</userinput></screen>
+    <variablelist>
+      <title>The meaning of the new configure option:</title>
+      <varlistentry>
+        <term><parameter>--without-guile</parameter></term>
+        <listitem>
+          <para>Although we are cross-compiling, configure tries to use
+          guile from the build host if it finds it. This makes compilation
+          fail, so this switch prevents using it.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>The test suite needs to know where supporting perl files are located.
-    We use an environment variable to accomplish this.  To test the
-    results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
     <para>Install the package:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
+  <sect2 role="content">
+    <title/>
+  <sect2 id="contents-make" role="content">
+    <title>Contents of Make</title>
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <seglistitem>
+        <seg>make</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="make">
+        <term><command>make</command></term>
+        <listitem>
+          <para>Automatically determines which pieces of a package need to
+          be (re)compiled and then issues the relevant commands</para>
+          <indexterm zone="ch-system-make make">
+            <primary sortas="b-make">make</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-make" role="."/></para>
   </sect2>

chapter06/ncurses.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-ncurses" role="wrap">
+<sect1 id="ch-tools-ncurses" role="wrap">
   <?dbhtml filename="ncurses.html"?>
 …
   <title>Ncurses-&ncurses-version;</title>
   <indexterm zone="ch-system-ncurses">
+  <indexterm zone="ch-tools-ncurses">
     <primary sortas="a-Ncurses">Ncurses</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Ncurses package contains libraries for terminal-independent
+    handling of character screens.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/ncurses.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&ncurses-ch6-sbu;</seg>
         <seg>&ncurses-ch6-du;</seg>
+        <seg>&ncurses-tmp-sbu;</seg>
+        <seg>&ncurses-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <title>Installation of Ncurses</title>
     <para>Don't install a static library that is not handled by configure:</para>
+    <para>First, ensure that <command>gawk</command> is found first during configuration:</para>
+<screen><userinput remap="pre">sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in</userinput></screen>
+<screen><userinput remap="pre">sed -i s/mawk// configure</userinput></screen>
+    <para>Then, run the following commands to build the <quote>tic</quote>
+    program on the build host:</para>
+<screen><userinput remap="pre">mkdir build
+pushd build
+  ../configure
+  make -C include
+  make -C progs tic
+popd</userinput></screen>
     <para>Prepare Ncurses for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr           \
+            --mandir=/usr/share/man \
+            --with-shared           \
+            --without-debug         \
+            --without-normal        \
+            --enable-pc-files       \
+<screen><userinput remap="configure">./configure --prefix=/usr                \
+            --host=$LFS_TGT              \
+            --build=$(./config.guess)    \
+            --mandir=/usr/share/man      \
+            --with-manpage-format=normal \
+            --with-shared                \
+            --without-debug              \
+            --without-ada                \
+            --without-normal             \
             --enable-widec</userinput></screen>
     <variablelist>
       <title>The meaning of the new configure options:</title>
+      <varlistentry>
+        <term><parameter>--with-manpage-format=normal</parameter></term>
+        <listitem>
+          <para>This prevents Ncurses installing compressed manual
+          pages, which may happen if the host distribution itself
+          has compressed manual pages.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--without-ada</parameter></term>
+        <listitem>
+          <para>This ensures that Ncurses does not build support for the Ada
+          compiler which may be present on the host but will not be available
+          once we enter the <command>chroot</command> environment.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
 …
           only in 8-bit locales. Wide-character and normal libraries are
           source-compatible, but not binary-compatible.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>--enable-pc-files</parameter></term>
-        <listitem>
-          <para>This switch generates and installs .pc files for pkg-config.
-          </para>
         </listitem>
       </varlistentry>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>This package has a test suite, but it can only be run after the
-    package has been installed.  The tests reside in the
-    <filename class="directory">test/</filename> directory.  See the
-    <filename>README</filename> file in that directory for further details.
-    </para>
     <para>Install the package:</para>
+<screen><userinput remap="install">make install</userinput></screen>
+<!-- TODO: check and document -->
+<screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
+ln -s libncursesw.so $LFS/usr/lib/libncurses.so</userinput></screen>
     <para>Move the shared libraries to the
 …
     expected to reside:</para>
 <screen><userinput remap="install">mv -v /usr/lib/libncursesw.so.6* /lib</userinput></screen>
+<screen><userinput remap="install">mv -v $LFS/usr/lib/libncursesw.so.6* $LFS/lib</userinput></screen>
     <para>Because the libraries have been moved, one symlink points to
     a non-existent file. Recreate it:</para>
 <screen><userinput remap="install">ln -sfv ../../lib/$(readlink /usr/lib/libncursesw.so) /usr/lib/libncursesw.so</userinput></screen>
+<screen><userinput remap="install">ln -sfv ../../lib/$(readlink $LFS/usr/lib/libncursesw.so) $LFS/usr/lib/libncursesw.so</userinput></screen>
-    <para>Many applications still expect the linker to be able to find
-    non-wide-character Ncurses libraries. Trick such applications into linking with
-    wide-character libraries by means of symlinks and linker scripts:</para>
-<screen><userinput remap="install">for lib in ncurses form panel menu ; do
-    rm -vf                    /usr/lib/lib${lib}.so
-    echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
-    ln -sfv ${lib}w.pc        /usr/lib/pkgconfig/${lib}.pc
-done</userinput></screen>
-    <para>Finally, make sure that old applications that look for
-    <filename class="libraryfile">-lcurses</filename> at build time are still
-    buildable:</para>
-<screen><userinput remap="install">rm -vf                     /usr/lib/libcursesw.so
-echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
-ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
-    <para>If desired, install the Ncurses documentation:</para>
-<screen><userinput remap="install">mkdir -v       /usr/share/doc/ncurses-&ncurses-version;
-cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version;</userinput></screen>
-    <note>
-      <para>The instructions above don't create non-wide-character Ncurses
-      libraries since no package installed by compiling from sources would link
-      against them at runtime. However, the only known binary-only
-      applications that link against non-wide-character Ncurses libraries
-      require version 5.  If you must have such libraries because of some binary-only
-      application or to be compliant with LSB, build the package again with the
-      following commands:</para>
-<screen role="nodump"><userinput>make distclean
-./configure --prefix=/usr    \
-            --with-shared    \
-            --without-normal \
-            --without-debug  \
-            --without-cxx-binding \
-            --with-abi-version=5
-make sources libs
-cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
-    </note>
   </sect2>
   <sect2 id="contents-ncurses" role="content">
     <title>Contents of Ncurses</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+      <seglistitem>
+        <seg>
+           captoinfo (link to tic),
+           clear,
+           infocmp,
+           infotocap (link to tic),
+           ncursesw6-config,
+           reset (link to tset),
+           tabs,
+           tic,
+           toe,
+           tput, and
+           tset
+        </seg>
+        <seg>
+           libcursesw.so (symlink and linker script to libncursesw.so),
+           libformw.so,
+           libmenuw.so,
+           libncursesw.so,
+           libncurses++w.a,
+           libpanelw.so, and their non-wide-character counterparts without "w"
+              in the library names.</seg>
+        <seg>
+           /usr/share/tabset,
+           /usr/share/terminfo, and
+           /usr/share/doc/ncurses-&ncurses-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="captoinfo">
+        <term><command>captoinfo</command></term>
+        <listitem>
+          <para>Converts a termcap description into a terminfo description</para>
+          <indexterm zone="ch-system-ncurses captoinfo">
+            <primary sortas="b-captoinfo">captoinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="clear">
+        <term><command>clear</command></term>
+        <listitem>
+          <para>Clears the screen, if possible</para>
+          <indexterm zone="ch-system-ncurses clear">
+            <primary sortas="b-clear">clear</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="infocmp">
+        <term><command>infocmp</command></term>
+        <listitem>
+          <para>Compares or prints out terminfo descriptions</para>
+          <indexterm zone="ch-system-ncurses infocmp">
+            <primary sortas="b-infocmp">infocmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="infotocap">
+        <term><command>infotocap</command></term>
+        <listitem>
+          <para>Converts a terminfo description into a termcap description</para>
+          <indexterm zone="ch-system-ncurses infotocap">
+            <primary sortas="b-infotocap">infotocap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="ncursesw6-config">
+        <term><command>ncursesw6-config</command></term>
+        <listitem>
+          <para>Provides configuration information for ncurses</para>
+          <indexterm zone="ch-system-ncurses ncursesw6-config">
+            <primary sortas="b-ncursesw6-config">ncursesw6-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="reset">
+        <term><command>reset</command></term>
+        <listitem>
+          <para>Reinitializes a terminal to its default values</para>
+          <indexterm zone="ch-system-ncurses reset">
+            <primary sortas="b-reset">reset</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tabs">
+        <term><command>tabs</command></term>
+        <listitem>
+          <para>Clears and sets tab stops on a terminal</para>
+          <indexterm zone="ch-system-ncurses tabs">
+            <primary sortas="b-tabs">tabs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tic">
+        <term><command>tic</command></term>
+        <listitem>
+          <para>The terminfo entry-description compiler that translates a
+          terminfo file from source format into the binary format needed for the
+          ncurses library routines [A terminfo file contains information on the
+          capabilities of a certain terminal.]</para>
+          <indexterm zone="ch-system-ncurses tic">
+            <primary sortas="b-tic">tic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="toe">
+        <term><command>toe</command></term>
+        <listitem>
+          <para>Lists all available terminal types, giving the primary name and
+          description for each</para>
+          <indexterm zone="ch-system-ncurses toe">
+            <primary sortas="b-toe">toe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tput">
+        <term><command>tput</command></term>
+        <listitem>
+          <para>Makes the values of terminal-dependent capabilities available to
+          the shell; it can also be used to reset or initialize a terminal or
+          report its long name</para>
+          <indexterm zone="ch-system-ncurses tput">
+            <primary sortas="b-tput">tput</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="tset">
+        <term><command>tset</command></term>
+        <listitem>
+          <para>Can be used to initialize terminals</para>
+          <indexterm zone="ch-system-ncurses tset">
+            <primary sortas="b-tset">tset</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="libcursesw">
+        <term><filename class="libraryfile">libcursesw</filename></term>
+        <listitem>
+          <para>A link to <filename>libncursesw</filename></para>
+          <indexterm zone="ch-system-ncurses libcursesw">
+            <primary sortas="c-libcursesw">libcursesw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="libncursesw">
+        <term><filename class="libraryfile">libncursesw</filename></term>
+        <listitem>
+          <para>Contains functions to display text in many complex ways on a
+          terminal screen; a good example of the use of these functions is the
+          menu displayed during the kernel's <command>make
+          menuconfig</command></para>
+          <indexterm zone="ch-system-ncurses libncursesw">
+            <primary sortas="c-libncursesw">libncursesw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="libformw">
+        <term><filename class="libraryfile">libformw</filename></term>
+        <listitem>
+          <para>Contains functions to implement forms</para>
+          <indexterm zone="ch-system-ncurses libformw">
+            <primary sortas="c-libformw">libformw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="libmenuw">
+        <term><filename class="libraryfile">libmenuw</filename></term>
+        <listitem>
+          <para>Contains functions to implement menus</para>
+          <indexterm zone="ch-system-ncurses libmenuw">
+            <primary sortas="c-libmenuw">libmenuw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="libpanelw">
+        <term><filename class="libraryfile">libpanelw</filename></term>
+        <listitem>
+          <para>Contains functions to implement panels</para>
+          <indexterm zone="ch-system-ncurses libpanelw">
+            <primary sortas="c-libpanelw">libpanelw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-ncurses" role="."/></para>
   </sect2>

chapter06/patch.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-patch" role="wrap">
+<sect1 id="ch-tools-patch" role="wrap">
   <?dbhtml filename="patch.html"?>
 …
   <title>Patch-&patch-version;</title>
   <indexterm zone="ch-system-patch">
+  <indexterm zone="ch-tools-patch">
     <primary sortas="a-Patch">Patch</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
     <para>The Patch package contains a program for modifying or creating files
     by applying a <quote>patch</quote> file typically created by the
     <command>diff</command> program.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/patch.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&patch-ch6-sbu;</seg>
         <seg>&patch-ch6-du;</seg>
+        <seg>&patch-tmp-sbu;</seg>
+        <seg>&patch-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <para>Prepare Patch for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --host=$LFS_TGT \
+            --build=$(build-aux/config.guess)</userinput></screen>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
     <para>Install the package:</para>
 <screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
   <sect2 id="contents-patch" role="content">
     <title>Contents of Patch</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <seglistitem>
+        <seg>patch</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="patch">
+        <term><command>patch</command></term>
+        <listitem>
+          <para>Modifies files according to a patch file [A patch file is
+          normally a difference listing created with the <command>diff</command>
+          program. By applying these differences to the original files,
+          <command>patch</command> creates the patched versions.]</para>
+          <indexterm zone="ch-system-patch patch">
+            <primary sortas="b-patch">patch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-patch" role="."/></para>
   </sect2>

chapter06/sed.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-sed" role="wrap">
+<sect1 id="ch-tools-sed" role="wrap">
   <?dbhtml filename="sed.html"?>
 …
   <title>Sed-&sed-version;</title>
   <indexterm zone="ch-system-sed">
+  <indexterm zone="ch-tools-sed">
     <primary sortas="a-Sed">Sed</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Sed package contains a stream editor.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/sed.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
+    <segtitle>&buildtime;</segtitle>
       <segtitle>&diskspace;</segtitle>
       <seglistitem>
         <seg>&sed-ch6-sbu;</seg>
         <seg>&sed-ch6-du;</seg>
+        <seg>&sed-tmp-sbu;</seg>
+        <seg>&sed-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <title>Installation of Sed</title>
-    <para>First fix an issue in the LFS environment:</para>
-<screen><userinput remap="pre">sed -i 's/usr/tools/' build-aux/help2man</userinput></screen>
     <para>Prepare Sed for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --host=$LFS_TGT \
+            --bindir=/bin</userinput></screen>
     <para>Compile the package and generate the HTML documentation:</para>
+    <para>Compile the package:</para>
+<screen><userinput remap="make">make
+make html</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
     <para>To test the results, issue:</para>
+    <para>Install the package:</para>
+<screen><userinput remap="test">chown -Rv tester .
+su tester -c "PATH=$PATH make check"</userinput></screen>
+    <para>Install the package and its documentation:</para>
+<screen><userinput remap="install">make install
+install -d -m755           /usr/share/doc/sed-&sed-version;
+install -m644 doc/sed.html /usr/share/doc/sed-&sed-version;</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
   <sect2 id="contents-sed" role="content">
     <title>Contents of Sed</title>
+  <sect2 role="content">
+    <title/>
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <segtitle>Installed directory</segtitle>
+      <seglistitem>
+        <seg>sed</seg>
+        <seg>/usr/share/doc/sed-&sed-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="sed">
+        <term><command>sed</command></term>
+        <listitem>
+          <para>Filters and transforms text files in a single pass</para>
+          <indexterm zone="ch-system-sed sed">
+            <primary sortas="b-sed">sed</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-sed" role="."/></para>
   </sect2>

chapter06/tar.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-tar" role="wrap">
+<sect1 id="ch-tools-tar" role="wrap">
   <?dbhtml filename="tar.html"?>
 …
   <title>Tar-&tar-version;</title>
   <indexterm zone="ch-system-tar">
+  <indexterm zone="ch-tools-tar">
     <primary sortas="a-Tar">Tar</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Tar package contains an archiving program.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/tar.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&tar-ch6-sbu;</seg>
         <seg>&tar-ch6-du;</seg>
+        <seg>&tar-tmp-sbu;</seg>
+        <seg>&tar-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <para>Prepare Tar for compilation:</para>
+<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1  \
+./configure --prefix=/usr \
+<screen><userinput remap="configure">./configure --prefix=/usr                     \
+            --host=$LFS_TGT                   \
+            --build=$(build-aux/config.guess) \
             --bindir=/bin</userinput></screen>
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-      <varlistentry>
-        <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
-        <listitem>
-          <para>This forces the test for <function>mknod</function> to be run
-          as root.  It is generally considered dangerous to run this test as
-          the root user, but as it is being run on a system that has only been
-          partially built, overriding it is OK.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
     <para>Compile the package:</para>
 …
 <screen><userinput remap="make">make</userinput></screen>
-    <para>To test the results (about 3 SBU), issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
-<!-- Seems to pass for version 1.31. Keeping as a comment just in case...
-    <para>One test, link mismatch, is known to fail.</para>
--->
     <para>Install the package:</para>
+<screen><userinput remap="install">make install
+make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
   </sect2>
+  <sect2 role="content">
+    <title/>
+  <sect2 id="contents-tar" role="content">
+    <title>Contents of Tar</title>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
+      <seglistitem>
+        <seg>tar</seg>
+        <seg>/usr/share/doc/tar-&tar-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="tar">
+        <term><command>tar</command></term>
+        <listitem>
+          <para>Creates, extracts files from, and lists the contents of archives,
+          also known as tarballs</para>
+          <indexterm zone="ch-system-tar tar">
+            <primary sortas="b-tar">tar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Details on this package are located in <xref linkend="contents-tar" role="."/></para>
   </sect2>

chapter06/xz.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-system-xz" role="wrap">
+<sect1 id="ch-tools-xz" role="wrap">
   <?dbhtml filename="xz.html"?>
 …
   <title>Xz-&xz-version;</title>
   <indexterm zone="ch-system-xz">
+  <indexterm zone="ch-tools-xz">
     <primary sortas="a-xz">Xz</primary>
+    <secondary>tools</secondary>
   </indexterm>
 …
     <title/>
+    <para>The Xz package contains programs for compressing and decompressing
+    files. It provides capabilities for the lzma and the newer xz compression
+    formats.  Compressing text files with <command>xz</command> yields a better
+    compression percentage than with the traditional <command>gzip</command> or
+    <command>bzip2</command> commands.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/xz.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
     <segmentedlist>
 …
       <seglistitem>
         <seg>&xz-ch6-sbu;</seg>
         <seg>&xz-ch6-du;</seg>
+        <seg>&xz-tmp-sbu;</seg>
+        <seg>&xz-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
 …
     <title>Installation of Xz</title>
     <para>Prepare Xz for compilation with:</para>
+    <para>Prepare Xz for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr    \
+            --disable-static \
+<screen><userinput remap="configure">./configure --prefix=/usr                     \
+            --host=$LFS_TGT                   \
+            --build=$(build-aux/config.guess) \
+            --disable-static                  \
             --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
     <para>Compile the package:</para>
+   <para>Compile the package:</para>
 <screen><userinput remap="make">make</userinput></screen>
     <para>To test the results, issue:</para>
+    <para>Install the package:</para>
 <screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+  <para>Install the package and make sure that all essential files are in the
+  correct directory:</para>
+    <para>Make sure that all essential files are in the correct directory:</para>
+<screen><userinput remap="install">make install
+mv -v   /usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat} /bin
+mv -v /usr/lib/liblzma.so.* /lib
+ln -svf ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
+<screen><userinput remap="install">mv -v $LFS/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat}  $LFS/bin
+mv -v $LFS/usr/lib/liblzma.so.*                       $LFS/lib
+ln -svf ../../lib/$(readlink $LFS/usr/lib/liblzma.so) $LFS/usr/lib/liblzma.so</userinput></screen>
   </sect2>
+  <sect2 id="contents-xz" role="content">
+    <title>Contents of Xz</title>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+      <seglistitem>
+        <seg>
+          lzcat (link to xz),
+          lzcmp (link to xzdiff),
+          lzdiff (link to xzdiff),
+          lzegrep (link to xzgrep),
+          lzfgrep (link to xzgrep),
+          lzgrep (link to xzgrep),
+          lzless (link to xzless),
+          lzma (link to xz),
+          lzmadec,
+          lzmainfo,
+          lzmore (link to xzmore),
+          unlzma (link to xz),
+          unxz (link to xz),
+          xz,
+          xzcat (link to xz),
+          xzcmp (link to xzdiff),
+          xzdec,
+          xzdiff,
+          xzegrep (link to xzgrep),
+          xzfgrep (link to xzgrep),
+          xzgrep,
+          xzless, and
+          xzmore</seg>
+        <seg>
+          liblzma.so
+        </seg>
+        <seg>
+          /usr/include/lzma and
+          /usr/share/doc/xz-&xz-version;
+         </seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="lzcat">
+        <term><command>lzcat</command></term>
+        <listitem>
+          <para>Decompresses to standard output</para>
+          <indexterm zone="ch-system-xz lzcat">
+            <primary sortas="b-lzcat">lzcat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzcmp">
+        <term><command>lzcmp</command></term>
+        <listitem>
+          <para>Runs <command>cmp</command> on LZMA compressed files</para>
+          <indexterm zone="ch-system-xz lzcmp">
+            <primary sortas="b-lzcmp">lzcmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzdiff">
+        <term><command>lzdiff</command></term>
+        <listitem>
+          <para>Runs <command>diff</command> on LZMA compressed files</para>
+          <indexterm zone="ch-system-xz lzdiff">
+            <primary sortas="b-lzdiff">lzdiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzegrep">
+        <term><command>lzegrep</command></term>
+        <listitem>
+          <para>Runs <command>egrep</command> on LZMA compressed files</para>
+          <indexterm zone="ch-system-xz lzegrep">
+            <primary sortas="b-lzegrep">lzegrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzfgrep">
+        <term><command>lzfgrep</command></term>
+        <listitem>
+          <para>Runs <command>fgrep</command> on LZMA compressed files</para>
+          <indexterm zone="ch-system-xz lzfgrep">
+            <primary sortas="b-lzfgrep">lzfgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzgrep">
+        <term><command>lzgrep</command></term>
+        <listitem>
+          <para>Runs <command>grep</command> on LZMA compressed files</para>
+          <indexterm zone="ch-system-xz lzgrep">
+            <primary sortas="b-lzgrep">lzgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzless">
+        <term><command>lzless</command></term>
+        <listitem>
+          <para>Runs <command>less</command> on LZMA compressed files</para>
+          <indexterm zone="ch-system-xz lzless">
+            <primary sortas="b-lzless">lzless</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzma">
+        <term><command>lzma</command></term>
+        <listitem>
+          <para>Compresses or decompresses files using the LZMA format</para>
+          <indexterm zone="ch-system-xz lzma">
+            <primary sortas="b-lzma">lzma</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzmadec">
+        <term><command>lzmadec</command></term>
+        <listitem>
+          <para>A small and fast decoder for LZMA compressed files</para>
+          <indexterm zone="ch-system-xz lzmadec">
+            <primary sortas="b-lzmadec">lzmadec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzmainfo">
+        <term><command>lzmainfo</command></term>
+        <listitem>
+          <para>Shows information stored in the LZMA compressed file header</para>
+          <indexterm zone="ch-system-xz lzmainfo">
+            <primary sortas="b-lzmainfo">lzmainfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lzmore">
+        <term><command>lzmore</command></term>
+        <listitem>
+          <para>Runs <command>more</command> on LZMA compressed files</para>
+          <indexterm zone="ch-system-xz lzmore">
+            <primary sortas="b-lzmamore">lzmore</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="unlzma">
+        <term><command>unlzma</command></term>
+        <listitem>
+          <para>Decompresses files using the LZMA format</para>
+          <indexterm zone="ch-system-xz unlzma">
+            <primary sortas="b-unlzma">unlzma</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="unxz">
+        <term><command>unxz</command></term>
+        <listitem>
+          <para>Decompresses files using the XZ format</para>
+          <indexterm zone="ch-system-xz unxz">
+            <primary sortas="b-unxz">unxz</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xz">
+        <term><command>xz</command></term>
+        <listitem>
+          <para>Compresses or decompresses files using the XZ format</para>
+          <indexterm zone="ch-system-xz xz">
+            <primary sortas="b-xz">xz</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzcat">
+        <term><command>xzcat</command></term>
+        <listitem>
+          <para>Decompresses to standard output</para>
+          <indexterm zone="ch-system-xz xzcat">
+            <primary sortas="b-xzcat">xzcat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzcmp">
+        <term><command>xzcmp</command></term>
+        <listitem>
+          <para>Runs <command>cmp</command> on XZ compressed files</para>
+          <indexterm zone="ch-system-xz xzcmp">
+            <primary sortas="b-xzcmp">xzcmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzdec">
+        <term><command>xzdec</command></term>
+        <listitem>
+          <para>A small and fast decoder for XZ compressed files</para>
+          <indexterm zone="ch-system-xz xzdec">
+            <primary sortas="b-xzdec">xzdec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzdiff">
+        <term><command>xzdiff</command></term>
+        <listitem>
+          <para>Runs <command>diff</command> on XZ compressed files</para>
+          <indexterm zone="ch-system-xz xzdiff">
+            <primary sortas="b-xzdiff">xzdiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzegrep">
+        <term><command>xzegrep</command></term>
+        <listitem>
+          <para>Runs <command>egrep</command> on XZ compressed files</para>
+          <indexterm zone="ch-system-xz xzegrep">
+            <primary sortas="b-xzegrep">xzegrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzfgrep">
+        <term><command>xzfgrep</command></term>
+        <listitem>
+          <para>Runs <command>fgrep</command> on XZ compressed files</para>
+          <indexterm zone="ch-system-xz xzfgrep">
+            <primary sortas="b-xzfgrep">xzfgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzgrep">
+        <term><command>xzgrep</command></term>
+        <listitem>
+          <para>Runs <command>grep</command> on XZ compressed files</para>
+          <indexterm zone="ch-system-xz xzgrep">
+            <primary sortas="b-xzgrep">xzgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzless">
+        <term><command>xzless</command></term>
+        <listitem>
+          <para>Runs <command>less</command> on XZ compressed files</para>
+          <indexterm zone="ch-system-xz xzless">
+            <primary sortas="b-xzless">xzless</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="xzmore">
+        <term><command>xzmore</command></term>
+        <listitem>
+          <para>Runs <command>more</command> on XZ compressed files</para>
+          <indexterm zone="ch-system-xz xzmore">
+            <primary sortas="b-xzmore">xzmore</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="liblzma">
+        <term><filename class="libraryfile">liblzma</filename></term>
+        <listitem>
+          <para>The library implementing lossless, block-sorting data
+          compression, using the Lempel-Ziv-Markov chain algorithm</para>
+          <indexterm zone="ch-system-xz liblzma">
+            <primary sortas="c-liblzma">liblzma</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  <sect2 role="content">
+    <title/>
+    <para>Details on this package are located in <xref linkend="contents-xz" role="."/></para>
   </sect2>

chapter07/chapter07.xml

-              r560065f
+              r675606b
 ]>
 <chapter id="chapter-config" xreflabel="Chapter&nbsp;7">
+<chapter id="chapter-chroot-temporary-tools" xreflabel="Chapter&nbsp;7">
   <?dbhtml dir="chapter07"?>
   <?dbhtml filename="chapter07.html"?>
   <title>System Configuration</title>
+  <title>Entering Chroot and Building Additional Tools</title>
-  <!-- sysv -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts.xml"/>
+  <!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introductiond.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
+  <!-- common -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinks.xml"/>
+  <!-- sysv -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
+  <!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consoled.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
+  <!-- common -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
+  <!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-custom.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changingowner.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="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="libstdc++-pass2.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="gettext.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="python.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="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
 </chapter>

chapter07/introduction.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-config-introduction" revision="sysv">
+<sect1 id="ch-tools-introduction-chroot">
   <?dbhtml filename="introduction.html"?>
   <title>Introduction</title>
+    <para>Booting a Linux system involves several tasks.  The process must
+    mount both virtual and real file systems, initialize devices, activate swap,
+    check file systems for integrity, mount any swap partitions or files, set
+    the system clock, bring up networking, start any daemons required by the
+    system, and accomplish any other custom tasks needed by the user.  This
+    process must be organized to ensure the tasks are performed in the correct
+    order but, at the same time, be executed as fast as possible.</para>
+  <para>This chapter shows how to build the last missing bits of the temporary
+  system: first, the tools needed by the build machinery of various packages,
+  then three packages needed to run tests.  Now that all circular dependencies
+  have been resolved, we can use a <quote>chroot</quote> environment,
+  completely isolated the host operating system used for the build, except
+  for the running kernel.</para>
+<!--    <para>In the packages that were installed in Chapter&nbsp;6, there were two
     different boot systems installed.  LFS provides the ability to easily
     select which system the user wants to use and to compare and contrast the
     two systems by actually running each system on the local computer.  The
     advantages and disadvantages of these systems is presented below.</para>-->
+  <para>For proper operation of the isolated environment, some communication
+  with the running kernel must be established. This is done through the
+  so-called <emphasis>Virtual Kernel File Systems</emphasis>, which must be
+  mounted when entering the chroot environment. You may want to check
+  that they are mounted by issuing <command>findmnt</command>.</para>
+  <sect2 id='sysv-desc'>
+    <title>System V</title>
+  <para>Until <xref linkend="ch-tools-chroot"/>, the commands must be
+  run as <systemitem class="username">root</systemitem>, with the
+  <envar>LFS</envar> variable set. After entering chroot, all commands
+  are run as root, fortunately without access to the OS of the computer
+  you built LFS on. Be careful anyway, as it is easy to destroy the whole
+  LFS system with badly formed commands.</para>
-    <para>System V is the classic boot process that has been used in Unix and
-    Unix-like systems such as Linux since about 1983.  It consists of a small
-    program, <command>init</command>, that sets up basic programs such as
-    <command>login</command> (via getty) and runs a script.  This script,
-    usually named <command>rc</command>,  controls the execution of a set of
-    additional scripts that perform the tasks required to initialize the
-    system.</para>
-    <para>The <command>init</command> program is controlled by the
-    <filename>/etc/inittab</filename> file and is organized into run levels that
-    can be run by the user:</para>
-<literallayout>
-&mdash; halt
-&mdash; Single user mode
-&mdash; Multiuser, without networking
-&mdash; Full multiuser mode
-&mdash; User definable
-&mdash; Full multiuser mode with display manager
-&mdash; reboot
-</literallayout>
-    <para>The usual default run level is 3 or 5.</para>
-    <bridgehead renderas="sect3">Advantages</bridgehead>
-    <itemizedlist>
-      <listitem>
-          <para>Established, well understood system.</para>
-      </listitem>
-      <listitem>
-          <para>Easy to customize.</para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">Disadvantages</bridgehead>
-    <itemizedlist>
-      <listitem>
-          <para>Slower to boot.  A medium speed base LFS system
-          takes 8-12 seconds where the boot time is measured from the
-          first kernel message to the login prompt.  Network
-          connectivity is typically established about 2 seconds
-          after the login prompt.</para>
-      </listitem>
-      <listitem>
-          <para>Serial processing of boot tasks. This is related to the previous
-          point.  A delay in any process such as a file system check, will
-          delay the entire boot process.</para>
-      </listitem>
-      <listitem>
-          <para>Does not directly support advanced features like
-          control groups (cgroups), and per-user fair share scheduling.</para>
-      </listitem>
-      <listitem>
-          <para>Adding scripts requires manual, static sequencing decisions.</para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-<!--
-  <sect2 id='sysd-desc'>
-    <title>Systemd</title>
-    <para>Systemd is a group of interconnected programs that handles system and
-    individual process requests.  It provides a dependency system between
-    various entities called "units".  It automatically addresses dependencies
-    between units and can execute several startup tasks in parallel.  It
-    provides login, inetd, logging, time, and networking services. </para>
-    <bridgehead renderas="sect3">Advantages</bridgehead>
-    <itemizedlist>
-      <listitem>
-          <para>Used on many established distributions by default.</para>
-      </listitem>
-      <listitem>
-          <para>There is extensive documentation.
-          See <ulink url="http://www.freedesktop.org/wiki/Software/systemd/"/>.</para>
-      </listitem>
-      <listitem>
-          <para>Parallel execution of boot processes. A medium speed
-          base LFS system takes 6-10 seconds from kernel start to a
-          login prompt.  Network connectivity is typically established
-          about 2 seconds after the login prompt.  More complex startup
-          procedures may show a greater speedup when compared to System V.</para>
-      </listitem>
-      <listitem>
-          <para>Implements advanced features such as control groups to
-          manage related processes.</para>
-      </listitem>
-      <listitem>
-          <para>Maintains backward compatibility with System V programs
-          and scripts.</para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">Disadvantages</bridgehead>
-    <itemizedlist>
-      <listitem>
-          <para>There is a substantial learning curve.</para>
-      </listitem>
-      <listitem>
-          <para>Some advanced features such as dbus or cgroups cannot be
-          disabled if they are not otherwise needed.</para>
-      </listitem>
-      <listitem>
-          <para>Although implemented as several executable programs
-          the user cannot choose to implement only the portions desired.</para>
-      </listitem>
-      <listitem>
-          <para>Due to the nature of using compiled programs, systemd is
-          more difficult to debug.</para>
-      </listitem>
-      <listitem>
-          <para>Logging is done in a binary format.  Extra tools must
-          be used to process logs or additional processes must be implemented
-          to duplicate traditional logging programs.</para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
--->
-<!--
-  <sect2 id='sysv'>
-    <title>Selecting a Boot Method</title>
-    <para>Selecting a boot method in LFS is relatively easy.
-    Both systems are installed side-by-side.  The only task needed is to
-    ensure the files that are needed by the system have the correct names.
-    The following scripts do that.</para>
-<screen><userinput remap="install">cat &gt; /usr/sbin/set-systemd &lt;&lt; "EOF"
-#! /bin/bash
-ln -svfn init-systemd   /sbin/init
-ln -svfn init.d-systemd /etc/init.d
-for tool in halt poweroff reboot runlevel shutdown telinit; do
-  ln -sfvn  ${tool}-systemd   /sbin/${tool}
-  ln -svfn  ${tool}-systemd.8 /usr/share/man/man8/${tool}.8
-done
-echo "Now reboot with /sbin/reboot-sysv"
-EOF
-chmod 0744 /usr/sbin/set-systemd
-cat &gt; /usr/sbin/set-sysv &lt;&lt; "EOF"
-#! /bin/bash
-ln -sfvn init-sysv    /sbin/init
-ln -svfn init.d-sysv  /etc/init.d
-for tool in halt poweroff reboot runlevel shutdown telinit; do
-  ln -sfvn  ${tool}-sysv   /sbin/${tool}
-  ln -svfn  ${tool}-sysv.8 /usr/share/man/man8/${tool}.8
-done
-echo "Now reboot with /sbin/reboot-systemd"
-EOF
-chmod 0744 /usr/sbin/set-sysv</userinput></screen>
-  <note><para>The comment about the correct command to reboot in the
-  above scripts is correct.  The reboot command for the current boot
-  system must be used after the script changes the default reboot command.
-  </para></note>
-  <para>Now set the desired boot system.  The default is System V:</para>
-<screen><userinput remap="install">/usr/sbin/set-sysv</userinput></screen>
-  <para>Changing the boot system can be done at any time by running the
-  appropriate script above and rebooting.</para>
-  </sect2>
--->
 </sect1>

chapter08/chapter08.xml

-              r560065f
+              r675606b
 ]>
 <chapter id="chapter-bootable" xreflabel="Chapter&nbsp;8">
+<chapter id="chapter-building-system" xreflabel="Chapter&nbsp;8">
   <?dbhtml dir="chapter08"?>
   <?dbhtml filename="chapter08.html"?>
   <title>Making the LFS System Bootable</title>
+  <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="fstab.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kernel.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="man-pages.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="glibc.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="bzip2.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="zstd.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="readline.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="bc.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="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="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="shadow.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="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="sed.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="gettext.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="grep.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="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="kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libelf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.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="check.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="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"/>
+  <!-- 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="dbus.xml"/>
+  <!-- sysv only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
+  <!-- Both sysv on systemd builds -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  <!-- Both sysv and systemd builds -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.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="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>

chapter08/grub.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-bootable-grub" role="wrap">
+<sect1 id="ch-system-grub" role="wrap">
   <?dbhtml filename="grub.html"?>
 …
   </sect1info>
+  <title>Using GRUB to Set Up the Boot Process</title>
+  <sect2>
+    <title>Introduction</title>
+    <warning><para>Configuring GRUB incorrectly can render your system
+    inoperable without an alternate boot device such as a CD-ROM.  This
+    section is not required to boot your LFS system.  You may just
+    want to modify your current boot loader, e.g. Grub-Legacy, GRUB2, or
+    LILO.</para></warning>
+    <para> Ensure that an emergency boot disk is ready to <quote>rescue</quote>
+    the computer if the computer becomes unusable (un-bootable).  If you do not
+    already have a boot device, you can create one.  In order for the procedure
+    below to work, you need to jump ahead to BLFS and install
+    <userinput>xorriso</userinput> from the <ulink
+    url="&blfs-book;multimedia/libisoburn.html">
+    libisoburn</ulink> package.</para>
+<screen role="nodump"><userinput>cd /tmp
+grub-mkrescue --output=grub-img.iso
+xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></screen>
+    <note>
+      <para>
+        To boot LFS on host systems that have UEFI enabled, the kernel needs to
+        have been built with the CONFIG_EFI_STUB capabality described in the
+        previous section.  However, LFS can be booted using GRUB2 without such
+        an addition. To do this, the UEFI Mode and Secure Boot capabilities in
+        the host system's BIOS need to be turned off.  For details, see <ulink
+        url="&hints-root;lfs-uefi.txt">
+        the lfs-uefi.txt hint</ulink> at
+        &hints-root;lfs-uefi.txt.
+      </para>
+    </note>
+  <title>GRUB-&grub-version;</title>
+  <indexterm zone="ch-system-grub">
+    <primary sortas="a-Grub">GRUB</primary>
+  </indexterm>
+  <sect2 role="package">
+    <title/>
+    <para>The GRUB package contains the GRand Unified Bootloader.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+      <seglistitem>
+        <seg>&grub-fin-sbu;</seg>
+        <seg>&grub-fin-du;</seg>
+      </seglistitem>
+    </segmentedlist>
   </sect2>
+  <sect2>
+    <title>GRUB Naming Conventions</title>
+    <para>GRUB uses its own naming structure for drives and partitions in
+    the form of <emphasis>(hdn,m)</emphasis>, where <emphasis>n</emphasis>
+    is the hard drive number and <emphasis>m</emphasis> is the partition
+    number. The hard drive number starts from zero, but the partition number
+    starts from one for normal partitions and five for extended partitions.
+    Note that this is different from earlier versions where
+    both numbers started from zero. For example, partition <filename
+    class="partition">sda1</filename> is <emphasis>(hd0,1)</emphasis> to
+    GRUB and <filename class="partition">sdb3</filename> is
+    <emphasis>(hd1,3)</emphasis>. In contrast to Linux, GRUB does not
+    consider CD-ROM drives to be hard drives. For example, if using a CD
+    on <filename class="partition">hdb</filename> and a second hard drive
+    on <filename class="partition">hdc</filename>, that second hard drive
+    would still be <emphasis>(hd1)</emphasis>.</para>
+  <sect2 role="installation">
+    <title>Installation of GRUB</title>
+    <para>Prepare GRUB for compilation:</para>
+<screen><userinput remap="configure">./configure --prefix=/usr          \
+            --sbindir=/sbin        \
+            --sysconfdir=/etc      \
+            --disable-efiemu       \
+            --disable-werror</userinput></screen>
+    <variablelist>
+      <title>The meaning of the new configure options:</title>
+      <varlistentry>
+        <term><parameter>--disable-werror</parameter></term>
+        <listitem>
+          <para>This allows the build to complete with warnings introduced
+          by more recent Flex versions.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--disable-efiemu</parameter></term>
+        <listitem>
+          <para>This option minimizes what is built by disabling a feature and
+          testing programs not needed for LFS.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>Compile the package:</para>
+<screen><userinput remap="make">make</userinput></screen>
+    <para>This package does not come with a test suite.</para>
+    <para>Install the package:</para>
+<screen><userinput remap="install">make install
+mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userinput></screen>
+  <para>Using GRUB to make your LFS system bootable will be discussed in
+  <xref linkend="ch-bootable-grub"/>.</para>
   </sect2>
+  <sect2>
+    <title>Setting Up the Configuration</title>
+    <para>GRUB works by writing data to the first physical track of the
+    hard disk.  This area is not part of any file system.  The programs
+    there access GRUB modules in the boot partition.  The default location
+    is /boot/grub/.</para>
+    <para>The location of the boot partition is a choice of the user that
+    affects the configuration.  One recommendation is to have a separate small
+    (suggested size is 100 MB) partition just for boot information.  That way
+    each build, whether LFS or some commercial distro, can access the same boot
+    files and access can be made from any booted system.  If you choose to do
+    this, you will need to mount the separate partition, move all files in the
+    current <filename class="directory">/boot</filename> directory (e.g. the
+    linux kernel you just built in the previous section) to the new partition.
+    You will then need to unmount the partition and remount it as <filename
+    class="directory">/boot</filename>.  If you do this, be sure to update
+    <filename>/etc/fstab</filename>.</para>
+    <para>Using the current lfs partition will also work, but configuration
+    for multiple systems is more difficult.</para>
+    <para>Using the above information, determine the appropriate
+    designator for the root partition (or boot partition, if a separate
+    one is used). For the following example, it is assumed that the root
+    (or separate boot) partition is <filename
+    class="partition">sda2</filename>.</para>
+    <para>Install the GRUB files into <filename
+    class="directory">/boot/grub</filename> and set up the boot track:</para>
+    <warning>
+      <para>The following command will overwrite the current boot loader. Do not
+      run the command if this is not desired, for example, if using a third party
+      boot manager to manage the Master Boot Record (MBR).</para>
+    </warning>
+<screen role="nodump"><userinput>grub-install /dev/sda</userinput></screen>
+    <note>
+      <para>If the system has been booted using UEFI,
+      <command>grub-install</command> will try to install files for the
+      <emphasis>x86_64-efi</emphasis> target, but those files
+      have not been installed in chapter 6. If this is the case, add
+      <option>--target i386-pc</option> to the command above.</para>
+    </note>
+<!-- This does not seem to be true any more
+    <note><para><application>grub-install</application> is a script and calls another
+    program, grub-probe, that may fail with a message "cannot stat `/dev/root'".
+    If so, create a temporary symbolic link from your root partition to /dev/root:</para>
+<screen role="nodump"><userinput>ln -sv /dev/sda2 /dev/root</userinput></screen>
+    <para>The symbolic link will only be present until the system is rebooted.
+    The link is only needed for the installation procedure.
+    </para></note>
+-->
+  <sect2 id="contents-gRUB" role="content">
+    <title>Contents of GRUB</title>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directories</segtitle>
+      <seglistitem>
+       <seg>grub-bios-setup,      grub-editenv,    grub-file,        grub-fstest,
+            grub-glue-efi,        grub-install,    grub-kbdcomp,     grub-macbless,
+            grub-menulst2cfg,     grub-mkconfig,
+                                  grub-mkimage,    grub-mklayout,    grub-mknetdir,
+            grub-mkpasswd-pbkdf2, grub-mkrelpath,  grub-mkrescue,    grub-mkstandalone,
+            grub-ofpathname,      grub-probe,      grub-reboot,      grub-render-label,
+            grub-script-check,
+            grub-set-default,     grub-sparc64-setup, and grub-syslinux2cfg</seg>
+        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, and /boot/grub (when grub-install
+        is first run)</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="grub-bios-setup">
+        <term><command>grub-bios-setup</command></term>
+        <listitem>
+          <para>Is a helper program for grub-install</para>
+          <indexterm zone="ch-system-grub grub-bios-setup">
+            <primary sortas="b-grub-bios-setup">grub-bios-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-editenv">
+        <term><command>grub-editenv</command></term>
+        <listitem>
+          <para>A tool to edit the environment block</para>
+          <indexterm zone="ch-system-grub grub-editenv">
+            <primary sortas="b-grub-editenv">grub-editenv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-file">
+        <term><command>grub-file</command></term>
+        <listitem>
+          <para>Checks if FILE is of the specified type.</para>
+          <indexterm zone="ch-system-grub grub-file">
+            <primary sortas="b-grub-file">grub-file</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-fstest">
+        <term><command>grub-fstest</command></term>
+        <listitem>
+          <para>Tool to debug the filesystem driver</para>
+          <indexterm zone="ch-system-grub grub-fstest">
+            <primary sortas="b-grub-fstest">grub-fstest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-glue-efi">
+        <term><command>grub-glue-efi</command></term>
+        <listitem>
+          <para>Processes ia32 and amd64 EFI images and glues them
+          according to Apple format.</para>
+          <indexterm zone="ch-system-grub grub-glue-efi">
+            <primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-install">
+        <term><command>grub-install</command></term>
+        <listitem>
+          <para>Install GRUB on your drive</para>
+          <indexterm zone="ch-system-grub grub-install">
+            <primary sortas="b-grub-install">grub-install</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-kbdcomp">
+        <term><command>grub-kbdcomp</command></term>
+        <listitem>
+          <para>Script that converts an xkb layout into one recognized by
+          GRUB</para>
+          <indexterm zone="ch-system-grub grub-kbdcomp">
+            <primary sortas="b-grub-kbdcomp">grub-kbdcomp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-macbless">
+        <term><command>grub-macbless</command></term>
+        <listitem>
+          <para>Mac-style bless on HFS or HFS+ files</para>
+          <indexterm zone="ch-system-grub grub-macbless">
+            <primary sortas="b-grub-macbless">grub-macbless</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-menulst2cfg">
+        <term><command>grub-menulst2cfg</command></term>
+        <listitem>
+          <para>Converts a GRUB Legacy <filename>menu.lst</filename>
+          into a <filename>grub.cfg</filename> for use with GRUB 2</para>
+          <indexterm zone="ch-system-grub grub-menulst2cfg">
+            <primary sortas="b-grub-menulst2cfg">grub-menulst2cfg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-mkconfig">
+        <term><command>grub-mkconfig</command></term>
+        <listitem>
+          <para>Generate a grub config file</para>
+          <indexterm zone="ch-system-grub grub-mkconfig">
+            <primary sortas="b-grub-mkconfig">grub-mkconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-mkimage">
+        <term><command>grub-mkimage</command></term>
+        <listitem>
+          <para>Make a bootable image of GRUB</para>
+          <indexterm zone="ch-system-grub grub-mkimage">
+            <primary sortas="b-grub-mkimage">grub-mkimage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-mklayout">
+        <term><command>grub-mklayout</command></term>
+        <listitem>
+          <para>Generates a GRUB keyboard layout file</para>
+          <indexterm zone="ch-system-grub grub-mklayout">
+            <primary sortas="b-grub-mklayout">grub-mklayout</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-mknetdir">
+        <term><command>grub-mknetdir</command></term>
+        <listitem>
+          <para>Prepares a GRUB netboot directory</para>
+          <indexterm zone="ch-system-grub grub-mknetdir">
+            <primary sortas="b-grub-mknetdir">grub-mknetdir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-mkpasswd-pbkdf2">
+        <term><command>grub-mkpasswd-pbkdf2</command></term>
+        <listitem>
+          <para>Generates an encrypted PBKDF2 password for use in the boot
+          menu</para>
+          <indexterm zone="ch-system-grub grub-mkpasswd-pbkdf2">
+            <primary sortas="b-grub-mkpasswd-pbkdf2">grub-mkpasswd-pbkdf2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-mkrelpath">
+        <term><command>grub-mkrelpath</command></term>
+        <listitem>
+          <para>Makes a system pathname relative to its root</para>
+          <indexterm zone="ch-system-grub grub-mkrelpath">
+            <primary sortas="b-grub-mkrelpath">grub-mkrelpath</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-mkrescue">
+        <term><command>grub-mkrescue</command></term>
+        <listitem>
+          <para>Make a bootable image of GRUB suitable for a floppy disk or CDROM/DVD</para>
+          <indexterm zone="ch-system-grub grub-mkrescue">
+            <primary sortas="b-grub-mkrescue">grub-mkrescue</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-mkstandalone">
+        <term><command>grub-mkstandalone</command></term>
+        <listitem>
+          <para>Generates a standalone image</para>
+          <indexterm zone="ch-system-grub grub-mkstandalone">
+            <primary sortas="b-grub-mkstandalone">grub-mkstandalone</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-ofpathname">
+        <term><command>grub-ofpathname</command></term>
+        <listitem>
+          <para>Is a helper program that prints the path of a GRUB device</para>
+          <indexterm zone="ch-system-grub grub-ofpathname">
+            <primary sortas="b-grub-ofpathname">grub-ofpathname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-probe">
+        <term><command>grub-probe</command></term>
+        <listitem>
+          <para>Probe device information for a given path or device</para>
+          <indexterm zone="ch-system-grub grub-probe">
+            <primary sortas="b-grub-probe">grub-probe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-reboot">
+        <term><command>grub-reboot</command></term>
+        <listitem>
+          <para>Sets the default boot entry for GRUB for the next boot only</para>
+          <indexterm zone="ch-system-grub grub-reboot">
+            <primary sortas="b-grub-reboot">grub-reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-render-label">
+        <term><command>grub-render-label</command></term>
+        <listitem>
+          <para>Render Apple .disk_label for Apple Macs</para>
+          <indexterm zone="ch-system-grub grub-render-label">
+            <primary sortas="b-grub-render-label">grub-render-label</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-script-check">
+        <term><command>grub-script-check</command></term>
+        <listitem>
+          <para>Checks GRUB configuration script for syntax errors</para>
+          <indexterm zone="ch-system-grub grub-script-check">
+            <primary sortas="b-grub-script-check">grub-script-check</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-set-default">
+        <term><command>grub-set-default</command></term>
+        <listitem>
+          <para>Sets the default boot entry for GRUB</para>
+          <indexterm zone="ch-system-grub grub-set-default">
+            <primary sortas="b-grub-set-default">grub-set-default</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-sparc64-setup">
+        <term><command>grub-sparc64-setup</command></term>
+        <listitem>
+          <para>Is a helper program for grub-setup</para>
+          <indexterm zone="ch-system-grub grub-sparc64-setup">
+            <primary sortas="b-grub-sparc64-setup">grub-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="grub-syslinux2cfg">
+        <term><command>grub-syslinux2cfg</command></term>
+        <listitem>
+          <para>Transform a syslinux config file into grub.cfg format</para>
+          <indexterm zone="ch-system-grub grub-syslinux2cfg">
+            <primary sortas="b-grub-syslinux2cfg">grub-syslinux2cfg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </sect2>
-  <sect2 id="grub-cfg">
-    <title>Creating the GRUB Configuration File</title>
-    <para>Generate <filename>/boot/grub/grub.cfg</filename>:</para>
-    <screen revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
-<literal># Begin /boot/grub/grub.cfg
-set default=0
-set timeout=5
-insmod ext2
-set root=(hd0,2)
-menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
-        linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
-}</literal>
-EOF</userinput></screen>
-    <screen revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
-<literal># Begin /boot/grub/grub.cfg
-set default=0
-set timeout=5
-insmod ext2
-set root=(hd0,2)
-menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" {
-        linux   /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro
-}</literal>
-EOF</userinput></screen>
-    <note><para>From <application>GRUB</application>'s perspective, the
-    kernel files are relative to the partition used.  If you
-    used a separate /boot partition, remove /boot from the above
-    <emphasis>linux</emphasis> line.  You will also need to change the
-    <emphasis>set root</emphasis> line to point to the boot partition.
-    </para></note>
-    <para>GRUB is an extremely powerful program and it provides a tremendous
-    number of options for booting from a wide variety of devices, operating
-    systems, and partition types.  There are also many options for customization
-    such as graphical splash screens, playing sounds, mouse input, etc.  The
-    details of these options are beyond the scope of this introduction.</para>
-    <caution><para>There is a command, <application>grub-mkconfig</application>, that
-    can write a configuration file automatically.  It uses a set of scripts in
-    /etc/grub.d/ and will destroy any customizations that you make.  These scripts
-    are designed primarily for non-source distributions and are not recommended for
-    LFS.  If you install a commercial Linux distribution, there is a good chance
-    that this program will be run.  Be sure to back up your grub.cfg file.</para></caution>
-   </sect2>
 </sect1>

chapter08/introduction.xml

-              r560065f
+              r675606b
 ]>
 <sect1 id="ch-bootable-introduction">
+<sect1 id="ch-system-introduction">
   <?dbhtml filename="introduction.html"?>
   <title>Introduction</title>
+  <para>It is time to make the LFS system bootable. This chapter
+  discusses creating an <filename>fstab</filename> file, building a
+  kernel for the new LFS system, and installing the GRUB boot loader so
+  that the LFS system can be selected for booting at startup.</para>
+  <para>In this chapter, we start constructing the LFS system in earnest.
+  </para>
+  <para>The installation of this software is straightforward. Although in many
+  cases the installation instructions could be made shorter and more generic,
+  we have opted to provide the full instructions for every package to minimize
+  the possibilities for mistakes.  The key to learning what makes a Linux system
+  work is to know what each package is used for and why you (or the system)
+  may need it.</para>
+  <para>We do not recommend using optimizations.  They can make
+  a program run slightly faster, but they may also cause compilation
+  difficulties and problems when running the program.  If a package refuses to
+  compile when using optimization, try to compile it without optimization and
+  see if that fixes the problem. Even if the package does compile when using
+  optimization, there is the risk it may have been compiled incorrectly because
+  of the complex interactions between the code and build tools.  Also note that
+  the <option>-march</option> and <option>-mtune</option> options using values
+  not specified in the book have not been tested. This may cause problems with
+  the toolchain packages (Binutils, GCC and Glibc).  The small potential gains
+  achieved in using compiler optimizations are often outweighed by the risks.
+  First-time builders of LFS are encouraged to build without custom
+  optimizations. The subsequent system will still run very fast and be stable
+  at the same time.</para>
+  <para>Before the installation instructions, each installation page provides
+  information about the package, including a concise description of what it
+  contains, approximately how long it will take to build, and how much disk
+  space is required during this building process. Following the installation
+  instructions, there is a list of programs and libraries (along with brief
+  descriptions) that the package installs.</para>
+  <note><para>The SBU values and required disk space includes test suite data
+  for all applicable packages in <xref linkend="chapter-building-system"/>. SBU
+  values have been calculated using a single CPU core (-j1) for all
+  operations.</para></note>
+  <sect2>
+    <title>About libraries</title>
+    <para>In general, the LFS editors discourage building and installing static
+    libraries.  The original purpose for most static libraries has been made
+    obsolete in a modern Linux system.  In addition, linking a static library
+    into a program can be detrimental.  If an update to the library is needed
+    to remove a security problem, all programs that use the static library will
+    need to be relinked to the new library.  Since the use of static libraries
+    is not always obvious, the relevant programs (and the procedures needed to
+    do the linking) may not even be known.</para>
+    <para>In the procedures in this chapter, we remove or disable installation of
+    most static libraries. Usually this is done by passing a
+    <option>--disable-static</option> option to <command>configure</command>.
+    In other cases, alternate means are needed. In a few cases, especially
+    glibc and gcc, the use of static libraries remains essential to the general
+    package building process. </para>
+    <para>For a more complete discussion of libraries, see the discussion
+    <ulink url="&blfs-root;/view/&short-version;/introduction/libraries.html">
+    Libraries: Static or shared?</ulink> in the BLFS book.</para>
+  </sect2>
 </sect1>

chapter09/chapter09.xml

-              r560065f
+              r675606b
 ]>
 <chapter id="chapter-finalizing" xreflabel="Chapter&nbsp;9">
+<chapter id="chapter-config" xreflabel="Chapter&nbsp;9">
   <?dbhtml dir="chapter09"?>
   <?dbhtml filename="chapter09.html"?>
   <title>The End</title>
+  <title>System Configuration</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="theend.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="getcounted.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="reboot.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whatnow.xml"/>
+  <!-- sysv -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts.xml"/>
+  <!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introductiond.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
+  <!-- common -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinks.xml"/>
+  <!-- sysv -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
+  <!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consoled.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
+  <!-- common -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
+  <!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-custom.xml"/>
 </chapter>

general.ent

-              r560065f
+              r675606b
 <!ENTITY version         "SVN-20200603">
+<!ENTITY version         "20200616">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 <!ENTITY versiond        "20200603-systemd">
+<!ENTITY versiond        "20200615-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd">
+<!ENTITY generic-versiond "20200615-systemd">
 <!ENTITY releasedate     "June 3rd, 2020">
+<!ENTITY releasedate     "June 16th, 2020">
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->

index.xml

-              r560065f
+              r675606b
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter03/chapter03.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter04/chapter04.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter05/chapter05.xml"/>
 </part>
 <part id="part3">
 <title>Building the LFS System</title>
+<title>Building the LFS Cross Toolchain and Temporary Tools</title>
 <?dbhtml filename="part3.html"?>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter05/chapter05.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter06/chapter06.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter07/chapter07.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter08/chapter08.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter09/chapter09.xml"/>
 </part>
 <part id="part4">
+<title>Building the LFS System</title>
+<?dbhtml filename="part4.html"?>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter08/chapter08.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter09/chapter09.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter10/chapter10.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter11/chapter11.xml"/>
+</part>
+<part id="part5">
 <title>Appendices</title>
 <?dbhtml filename="part4.html"?>
+<?dbhtml filename="part5.html"?>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acknowledgments.xml"/>

packages.ent

-              r560065f
+              r675606b
      Packages sizes allways in KB
      Allowed deviation in SBUs : 10%
+     Allowed deviation in disk usage : 2% -->
+     Allowed deviation in disk usage : 2%
+     Suffixes:
+     *-tmp-*     Package info for Temporary Tools
+     *-fin-*     Package info for Final System
+     *-cfg-*     Package info for System Configuration
+     *-knl-*     Package info for Kernel stuff
+-->
 <!ENTITY acl-version "2.2.53">
 …
 <!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
 <!ENTITY acl-home "&savannah-nongnu;/projects/acl">
 <!ENTITY acl-ch6-du "6.4 MB">
 <!ENTITY acl-ch6-sbu "0.1 SBU">
+<!ENTITY acl-fin-du "6.2 MB">
+<!ENTITY acl-fin-sbu "0.1 SBU">
 <!ENTITY attr-version "2.4.48">
 …
 <!ENTITY attr-md5 "bc1e5cb5c96d99b24886f1f527d3bb3d">
 <!ENTITY attr-home "&savannah-nongnu;/projects/attr">
 <!ENTITY attr-ch6-du "4.2 MB">
 <!ENTITY attr-ch6-sbu "less than 0.1 SBU">
+<!ENTITY attr-fin-du "4.2 MB">
+<!ENTITY attr-fin-sbu "less than 0.1 SBU">
 <!ENTITY autoconf-version "2.69">
 …
 <!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-ch6-du "79 MB">
 <!ENTITY autoconf-ch6-sbu-tests "3.2">
 <!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about &autoconf-ch6-sbu-tests; SBU with tests)">
+<!ENTITY autoconf-fin-du "79 MB">
+<!ENTITY autoconf-fin-sbu-tests "3.3">
+<!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
 <!ENTITY automake-version "1.16.2">
 …
 <!ENTITY automake-md5 "6cb234c86f3f984df29ce758e6d0d1d7">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "107 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 8.1 SBU with tests)">
+<!ENTITY automake-fin-du "107 MB">
+<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 8 SBU with tests)">
 <!ENTITY bash-version "5.0">
 …
 <!ENTITY bash-md5 "2b44b47b905be16f45709648f671820b">
 <!ENTITY bash-home "&gnu-software;bash/">
 <!ENTITY bash-ch5-du "67 MB">
 <!ENTITY bash-ch5-sbu "0.4 SBU">
 <!ENTITY bash-ch6-du "62 MB">
 <!ENTITY bash-ch6-sbu "1.9 SBU">
+<!ENTITY bash-tmp-du "64 MB">
+<!ENTITY bash-tmp-sbu "0.4 SBU">
+<!ENTITY bash-fin-du "48 MB">
+<!ENTITY bash-fin-sbu "1.8 SBU">
 <!ENTITY bc-version "2.7.2">
 …
 <!ENTITY bc-md5 "28235ceaf2280b909591ace7a3a4f051">
 <!ENTITY bc-home "https://github.com/gavinhoward/bc">
 <!ENTITY bc-ch6-du "2.9 MB">
 <!ENTITY bc-ch6-sbu "0.1 SBU">
+<!ENTITY bc-fin-du "3.2 MB">
+<!ENTITY bc-fin-sbu "0.1 SBU">
 <!ENTITY binutils-version "2.34">
 …
 <!ENTITY binutils-md5 "664ec3a2df7805ed3464639aaae332d6">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-ch5p1-du "625 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
 <!ENTITY binutils-ch5p2-du "651 MB">
 <!ENTITY binutils-ch5p2-sbu "1.1 SBU">
 <!ENTITY binutils-ch6-du "5.1 GB">
 <!ENTITY binutils-ch6-sbu "6.7 SBU">
+<!ENTITY binutils-tmpp1-du "611 MB">
+<!ENTITY binutils-tmpp1-sbu "1 SBU">
+<!ENTITY binutils-tmpp2-du "492 MB">
+<!ENTITY binutils-tmpp2-sbu "1.2 SBU">
+<!ENTITY binutils-fin-du "4.7 GB">
+<!ENTITY binutils-fin-sbu "6.6 SBU">
 <!ENTITY bison-version "3.6.3">
 …
 <!ENTITY bison-md5 "ca0513e77de1de46b9f2419d175cb3b4">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!ENTITY bison-ch5-du "43 MB">
 <!ENTITY bison-ch5-sbu "0.3 SBU">
 <!ENTITY bison-ch6-du "52 MB">
 <!ENTITY bison-ch6-sbu "5.8 SBU">
+<!ENTITY bison-tmp-du "47 MB">
+<!ENTITY bison-tmp-sbu "0.3 SBU">
+<!ENTITY bison-fin-du "50 MB">
+<!ENTITY bison-fin-sbu "5.6 SBU">
 <!ENTITY bzip2-version "1.0.8">
 …
 <!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz">
 <!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5">
+<!ENTITY bzip2-home " ">
 <!--<!ENTITY bzip2-home "http://www.bzip.org/">-->
+<!ENTITY bzip2-ch5-du "6.4 MB">
+<!ENTITY bzip2-ch5-sbu "less than 0.1 SBU">
+<!ENTITY bzip2-ch6-du "7.7 MB">
+<!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
+<!-- No more bzip2 in temp tools
+<!ENTITY bzip2-tmp-du "6.4 MB">
+<!ENTITY bzip2-tmp-sbu "less than 0.1 SBU">-->
+<!ENTITY bzip2-fin-du "7.7 MB">
+<!ENTITY bzip2-fin-sbu "less than 0.1 SBU">
+<!-- Does not seem to be used in this book
 <!ENTITY ref5-version "&version;">
 …
 <!ENTITY ref6-url "&anduin-sources;/reference-files/chapter6-files-&version;.ref">
 <!ENTITY ref6-md5 "REF6-MD5SUM">
+-->
 <!ENTITY check-version "0.14.0">
 <!ENTITY check-size "753 KB">
 …
 <!ENTITY check-md5 "270e82a445be6026040267a5e11cc94b">
 <!ENTITY check-home "https://libcheck.github.io/check">
 <!ENTITY check-ch5-du "13 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU (about 3.5 SBU with tests)">
+<!ENTITY check-fin-du "12 MB">
+<!ENTITY check-fin-sbu "0.1 SBU (about 3.3 SBU with tests)">
 <!ENTITY coreutils-version "8.32">
 …
 <!ENTITY coreutils-md5 "022042695b7d5bcf1a93559a9735e668">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "157 MB">
 <!ENTITY coreutils-ch5-sbu "0.7 SBU">
 <!ENTITY coreutils-ch6-du "202 MB">
 <!ENTITY coreutils-ch6-sbu "2.3 SBU">
+<!ENTITY coreutils-tmp-du "170 MB">
+<!ENTITY coreutils-tmp-sbu "0.6 SBU">
+<!ENTITY coreutils-fin-du "157 MB">
+<!ENTITY coreutils-fin-sbu "2.6 SBU">
 <!ENTITY dbus-version "1.12.18">
 …
 <!ENTITY dbus-md5 "4ca570c281be35d0b30ab83436712242">
 <!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-ch6-du "18 MB">
 <!ENTITY dbus-ch6-sbu "0.2 SBU">
+<!ENTITY dbus-fin-du "18 MB">
+<!ENTITY dbus-fin-sbu "0.2 SBU">
 <!ENTITY dejagnu-version "1.6.2">
 …
 <!ENTITY dejagnu-md5 "e1b07516533f351b3aba3423fafeffd6">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu/">
 <!ENTITY dejagnu-ch5-du "3.2 MB">
 <!ENTITY dejagnu-ch5-sbu "less than 0.1 SBU">
+<!ENTITY dejagnu-tmp-du "4.6 MB">
+<!ENTITY dejagnu-tmp-sbu "less than 0.1 SBU">
 <!ENTITY diffutils-version "3.7">
 …
 <!ENTITY diffutils-md5 "4824adc0e95dbbf11dfbdfaad6a1e461">
 <!ENTITY diffutils-home "&gnu-software;diffutils/">
 <!ENTITY diffutils-ch5-du "26 MB">
 <!ENTITY diffutils-ch5-sbu "0.2 SBU">
 <!ENTITY diffutils-ch6-du "36 MB">
 <!ENTITY diffutils-ch6-sbu "0.4 SBU">
+<!ENTITY diffutils-tmp-du "26 MB">
+<!ENTITY diffutils-tmp-sbu "0.2 SBU">
+<!ENTITY diffutils-fin-du "33 MB">
+<!ENTITY diffutils-fin-sbu "0.4 SBU">
 <!ENTITY e2fsprogs-version "1.45.6">
 …
 <!ENTITY e2fsprogs-md5 "cccfb706d162514e4f9dbfbc9e5d65ee">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "108 MB">
 <!ENTITY e2fsprogs-ch6-sbu "1.6 SBU">
+<!ENTITY e2fsprogs-fin-du "106 MB">
+<!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.7 SBU on an SSD">
 <!ENTITY elfutils-version "0.179">
 …
 <!ENTITY elfutils-md5 "8ee56b371b5a7ea081284c44e5164600">
 <!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/">
 <!ENTITY elfutils-ch6-du "124 MB">
 <!ENTITY elfutils-ch6-sbu "0.9 SBU">
+<!ENTITY elfutils-fin-du "121 MB">
+<!ENTITY elfutils-fin-sbu "1.0 SBU">
 <!ENTITY eudev-version "3.2.9">
 …
 <!ENTITY eudev-url "https://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
 <!ENTITY eudev-md5 "dedfb1964f6098fe9320de827957331f">
 <!ENTITY eudev-ch6-du "83 MB">
 <!ENTITY eudev-ch6-sbu "0.2 SBU">
+<!ENTITY eudev-fin-du "82 MB">
+<!ENTITY eudev-fin-sbu "0.2 SBU">
 <!ENTITY expat-version "2.2.9">
 …
 <!ENTITY expat-md5 "d2384fa607223447e713e1b9bd272376">
 <!ENTITY expat-home "https://libexpat.github.io/">
 <!ENTITY expat-ch6-du "11 MB">
 <!ENTITY expat-ch6-sbu "0.1 SBU">
+<!ENTITY expat-fin-du "14 MB">
+<!ENTITY expat-fin-sbu "0.1 SBU">
 <!ENTITY expect-version "5.45.4">
 …
 <!ENTITY expect-md5 "00fce8de158422f5ccd2666512329bd2">
 <!ENTITY expect-home "https://core.tcl.tk/expect/">
 <!ENTITY expect-ch5-du "4.0 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
+<!ENTITY expect-tmp-du "3.9 MB">
+<!ENTITY expect-tmp-sbu "0.1 SBU">
 <!ENTITY file-version "5.38">
 …
 <!ENTITY file-md5 "3217633ed09c7cd35ed8d04191675574">
 <!ENTITY file-home "https://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "20 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
 <!ENTITY file-ch6-du "20 MB">
 <!ENTITY file-ch6-sbu "0.1 SBU">
+<!ENTITY file-tmp-du "20 MB">
+<!ENTITY file-tmp-sbu "0.1 SBU">
+<!ENTITY file-fin-du "13 MB">
+<!ENTITY file-fin-sbu "0.1 SBU">
 <!ENTITY findutils-version "4.7.0">
 …
 <!ENTITY findutils-md5 "731356dec4b1109b812fecfddfead6b2">
 <!ENTITY findutils-home "&gnu-software;findutils/">
 <!ENTITY findutils-ch5-du "39 MB">
 <!ENTITY findutils-ch5-sbu "0.3 SBU">
 <!ENTITY findutils-ch6-du "57 MB">
 <!ENTITY findutils-ch6-sbu "0.7 SBU">
+<!ENTITY findutils-tmp-du "40 MB">
+<!ENTITY findutils-tmp-sbu "0.2 SBU">
+<!ENTITY findutils-fin-du "51 MB">
+<!ENTITY findutils-fin-sbu "0.7 SBU">
 <!ENTITY flex-version "2.6.4">
 …
 <!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d">
 <!ENTITY flex-home "&github;/westes/flex">
+<!ENTITY flex-ch5-du "15 MB">
+<!ENTITY flex-ch5-sbu "0.1 SBU">
+<!ENTITY flex-ch6-du "36 MB">
+<!ENTITY flex-ch6-sbu "0.4 SBU">
+<!-- only in final system now
+<!ENTITY flex-tmp-du "15 MB">
+<!ENTITY flex-tmp-sbu "0.1 SBU">-->
+<!ENTITY flex-fin-du "36 MB">
+<!ENTITY flex-fin-sbu "0.4 SBU">
 <!ENTITY gawk-version "5.1.0">
 …
 <!ENTITY gawk-md5 "8470c34eeecc41c1aa0c5d89e630df50">
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-ch5-du "46 MB">
 <!ENTITY gawk-ch5-sbu "0.2 SBU">
 <!ENTITY gawk-ch6-du "47 MB">
 <!ENTITY gawk-ch6-sbu "0.4 SBU">
+<!ENTITY gawk-tmp-du "46 MB">
+<!ENTITY gawk-tmp-sbu "0.2 SBU">
+<!ENTITY gawk-fin-du "43 MB">
+<!ENTITY gawk-fin-sbu "0.4 SBU">
 <!ENTITY gcc-version "10.1.0">
 …
 <!ENTITY gcc-md5 "7d48e00245330c48b670ec9a2c518291">
 <!ENTITY gcc-home "https://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "3.9 GB">
 <!ENTITY gcc-ch5p1-sbu "12 SBU">
 <!ENTITY gcc-ch5p2-du "4.3 GB">
 <!ENTITY gcc-ch5p2-sbu "14 SBU">
 <!ENTITY gcc-ch6-du "4.9 GB ">
 <!ENTITY gcc-ch6-sbu "103 SBU (with tests)">
+<!ENTITY gcc-tmpp1-du "3.7 GB">
+<!ENTITY gcc-tmpp1-sbu "11 SBU">
+<!ENTITY gcc-tmpp2-du "3.6 GB">
+<!ENTITY gcc-tmpp2-sbu "11 SBU">
+<!ENTITY gcc-fin-du "4.4 GB ">
+<!ENTITY gcc-fin-sbu "103 SBU (with tests)">
 <!ENTITY libquadmath-version "0.0.0">
 <!ENTITY libstdcpp-version   "6.0.28">
 …
 <!--<!ENTITY libcilkrts-version  "5.0.0">-->
+<!ENTITY libstdcpp-ch5-du "878 MB">
+<!ENTITY libstdcpp-ch5-sbu "0.5 SBU">
+<!ENTITY libstdcpp-tmpp1-du "952 MB">
+<!ENTITY libstdcpp-tmpp1-sbu "0.4 SBU">
+<!ENTITY libstdcpp-tmpp2-du "1.1 GB">
+<!ENTITY libstdcpp-tmpp2-sbu "1.1 SBU">
 <!ENTITY gdbm-version "1.18.1">
 …
 <!ENTITY gdbm-md5 "988dc82182121c7570e0cb8b4fcd5415">
 <!ENTITY gdbm-home "&gnu-software;gdbm/">
 <!ENTITY gdbm-ch6-du "11 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
+<!ENTITY gdbm-fin-du "11 MB">
+<!ENTITY gdbm-fin-sbu "0.1 SBU">
 <!ENTITY gettext-version "0.20.2">
 …
 <!ENTITY gettext-md5 "0cf5f68338d5d941bbf9ac93b847310f">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "300 MB">
 <!ENTITY gettext-ch5-sbu "1.6 SBU">
 <!ENTITY gettext-ch6-du "249 MB">
 <!ENTITY gettext-ch6-sbu "2.7 SBU">
+<!ENTITY gettext-tmp-du "303 MB">
+<!ENTITY gettext-tmp-sbu "1.7 SBU">
+<!ENTITY gettext-fin-du "231 MB">
+<!ENTITY gettext-fin-sbu "2.8 SBU">
 <!ENTITY glibc-version "2.31">
 …
 <!ENTITY glibc-md5 "78a720f17412f3c3282be5a6f3363ec6">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "896 MB">
 <!ENTITY glibc-ch5-sbu "4.5 SBU">
 <!ENTITY glibc-ch6-du "5.5 GB">
 <!ENTITY glibc-ch6-sbu "19 SBU">
+<!ENTITY glibc-tmp-du "750 MB">
+<!ENTITY glibc-tmp-sbu "4.2 SBU">
+<!ENTITY glibc-fin-du "2.6 GB">
+<!ENTITY glibc-fin-sbu "19 SBU">
 <!ENTITY libthread_db-version "1.0">
 …
 <!ENTITY gmp-md5 "a325e3f09e6d91e62101e59f9bda3ec1">
 <!ENTITY gmp-home "&gnu-software;gmp/">
 <!ENTITY gmp-ch6-du "51 MB">
 <!ENTITY gmp-ch6-sbu "1.1 SBU">
+<!ENTITY gmp-fin-du "51 MB">
+<!ENTITY gmp-fin-sbu "1.1 SBU">
 <!ENTITY gperf-version "3.1">
 …
 <!ENTITY gperf-md5 "9e251c0a618ad0824b51117d5d9db87e">
 <!ENTITY gperf-home "&gnu-software;gperf/">
 <!ENTITY gperf-ch6-du "6.3 MB">
 <!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
+<!ENTITY gperf-fin-du "6.4 MB">
+<!ENTITY gperf-fin-sbu "less than 0.1 SBU">
 <!ENTITY grep-version "3.4">
 …
 <!ENTITY grep-md5 "111b117d22d6a7d049d6ae7505e9c4d2">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "25 MB">
 <!ENTITY grep-ch5-sbu "0.2 SBU">
 <!ENTITY grep-ch6-du "39 MB">
 <!ENTITY grep-ch6-sbu "0.7 SBU">
+<!ENTITY grep-tmp-du "26 MB">
+<!ENTITY grep-tmp-sbu "0.2 SBU">
+<!ENTITY grep-fin-du "37 MB">
+<!ENTITY grep-fin-sbu "0.7 SBU">
 <!ENTITY groff-version "1.22.4">
 …
 <!ENTITY groff-md5 "08fb04335e2f5e73f23ea4c3adbf0c5f">
 <!ENTITY groff-home "&gnu-software;groff/">
 <!ENTITY groff-ch6-du "95 MB">
 <!ENTITY groff-ch6-sbu "0.5 SBU">
+<!ENTITY groff-fin-du "96 MB">
+<!ENTITY groff-fin-sbu "0.5 SBU">
 <!ENTITY grub-version "2.04">
 …
 <!ENTITY grub-md5 "5aaca6713b47ca2456d8324a58755ac7">
 <!ENTITY grub-home "&gnu-software;grub/">
 <!ENTITY grub-ch6-du "161 MB">
 <!ENTITY grub-ch6-sbu "0.8 SBU">
+<!ENTITY grub-fin-du "154 MB">
+<!ENTITY grub-fin-sbu "0.8 SBU">
 <!ENTITY gzip-version "1.10">
 …
 <!ENTITY gzip-md5 "691b1221694c3394f1c537df4eee39d3">
 <!ENTITY gzip-home "&gnu-software;gzip/">
 <!ENTITY gzip-ch5-du "10 MB">
 <!ENTITY gzip-ch5-sbu "0.1 SBU">
 <!ENTITY gzip-ch6-du "20 MB">
 <!ENTITY gzip-ch6-sbu "0.1 SBU">
+<!ENTITY gzip-tmp-du "10 MB">
+<!ENTITY gzip-tmp-sbu "0.1 SBU">
+<!ENTITY gzip-fin-du "19 MB">
+<!ENTITY gzip-fin-sbu "0.1 SBU">
 <!ENTITY iana-etc-version "20200429">
 …
 <!ENTITY iana-etc-md5 "f9f7cda56c0ebe6ac2fa69a0be5d5400">
 <!ENTITY iana-etc-home "http://freecode.com/projects/iana-etc">
 <!ENTITY iana-etc-ch6-du "4.7 MB">
 <!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
+<!ENTITY iana-etc-fin-du "4.7 MB">
+<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
 <!ENTITY inetutils-version "1.9.4">
 …
 <!ENTITY inetutils-md5 "87fef1fa3f603aef11c41dcc097af75e">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 <!ENTITY inetutils-ch6-du "29 MB">
 <!ENTITY inetutils-ch6-sbu "0.3 SBU">
+<!ENTITY inetutils-fin-du "29 MB">
+<!ENTITY inetutils-fin-sbu "0.3 SBU">
 <!ENTITY intltool-version "0.51.0">
 …
 <!ENTITY intltool-md5 "12e517cac2b57a0121cda351570f1e63">
 <!ENTITY intltool-home "https://freedesktop.org/wiki/Software/intltool">
 <!ENTITY intltool-ch6-du "1.5 MB">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
+<!ENTITY intltool-fin-du "1.5 MB">
+<!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 <!ENTITY iproute2-version "5.6.0">
 …
 <!ENTITY iproute2-md5 "9da0c352707c34b8b1fec3bf42fcfd09">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "14 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
+<!ENTITY iproute2-fin-du "14 MB">
+<!ENTITY iproute2-fin-sbu "0.2 SBU">
 <!ENTITY kbd-version "2.2.0">
 …
 <!ENTITY kbd-md5 "d1d7ae0b5fb875dc082731e09cd0c8bc">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
 <!ENTITY kbd-ch6-du "36 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
+<!ENTITY kbd-fin-du "36 MB">
+<!ENTITY kbd-fin-sbu "0.1 SBU">
 <!ENTITY kmod-version "27">
 …
 <!ENTITY kmod-md5 "3973a74786670d3062d89a827e266581">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "13 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
+<!ENTITY kmod-fin-du "13 MB">
+<!ENTITY kmod-fin-sbu "0.1 SBU">
 <!ENTITY less-version "551">
 …
 <!ENTITY less-md5 "4ad4408b06d7a6626a055cb453f36819">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
 <!ENTITY less-ch6-du "4.1 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
+<!ENTITY less-fin-du "4.1 MB">
+<!ENTITY less-fin-sbu "less than 0.1 SBU">
 <!ENTITY lfs-bootscripts-version "20191031">      <!-- Scripts depend on this format -->
 …
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">
 <!ENTITY lfs-bootscripts-home " ">
 <!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB">
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
+<!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
+<!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 <!ENTITY libcap-version "2.36">
 …
 <!ENTITY libcap-md5 "3d8cd4a87650cdee130691cb110c2ce2">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-ch6-du "8.5 MB">
 <!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
+<!ENTITY libcap-fin-du "11 MB">
+<!ENTITY libcap-fin-sbu "less than 0.1 SBU">
 <!ENTITY libffi-version "3.3">
 …
 <!ENTITY libffi-md5 "6313289e32f1d38a9df4770b014a2ca7">
 <!ENTITY libffi-home "https://sourceware.org/libffi/">
 <!ENTITY libffi-ch6-du "10 MB">
 <!ENTITY libffi-ch6-sbu "1.9 SBU">
+<!ENTITY libffi-fin-du "10 MB">
+<!ENTITY libffi-fin-sbu "1.9 SBU">
 <!ENTITY libpipeline-version "1.5.2">
 …
 <!ENTITY libpipeline-md5 "169de4cc1f6f7f7d430a5bed858b2fd3">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
 <!ENTITY libpipeline-ch6-du "9.2 MB">
 <!ENTITY libpipeline-ch6-sbu "0.2 SBU">
+<!ENTITY libpipeline-fin-du "10 MB">
+<!ENTITY libpipeline-fin-sbu "0.2 SBU">
 <!ENTITY libtool-version "2.4.6">
 …
 <!ENTITY libtool-md5 "1bfb9b923f2c1339b4d2ce1807064aa5">
 <!ENTITY libtool-home "&gnu-software;libtool/">
 <!ENTITY libtool-ch6-du "43 MB">
 <!ENTITY libtool-ch6-sbu "1.8 SBU">
+<!ENTITY libtool-fin-du "43 MB">
+<!ENTITY libtool-fin-sbu "1.9 SBU">
 <!ENTITY linux-major-version "5">
 …
  allnoconfig extended for a hopefully-bootable build on desktop machine,
  max is allyesconfig which requires openssl -->
+<!ENTITY linux-ch8-du "960 - 4250 MB (typically about 1100 MB)">
+<!ENTITY linux-ch8-sbu "4.4 - 66.0 SBU (typically about 6 SBU)">
+<!ENTITY linux-headers-ch5-du "1 GB">
+<!ENTITY linux-headers-ch5-sbu "0.1 SBU">
+<!ENTITY linux-headers-ch6-du "1 GB">
+<!ENTITY linux-headers-ch6-sbu "0.1 SBU">
+<!ENTITY linux-knl-du "960 - 4250 MB (typically about 1100 MB)">
+<!ENTITY linux-knl-sbu "4.4 - 66.0 SBU (typically about 6 SBU)">
+<!ENTITY linux-headers-tmp-du "1 GB">
+<!ENTITY linux-headers-tmp-sbu "0.1 SBU">
+<!-- Removed in this book
+<!ENTITY linux-headers-fin-du "1 GB">
+<!ENTITY linux-headers-fin-sbu "0.1 SBU">-->
 <!ENTITY m4-version "1.4.18">
 …
 <!ENTITY m4-md5 "730bb15d96fffe47e148d1e09235af82">
 <!ENTITY m4-home "&gnu-software;m4/">
 <!ENTITY m4-ch5-du "20 MB">
 <!ENTITY m4-ch5-sbu "0.2 SBU">
 <!ENTITY m4-ch6-du "33 MB">
 <!ENTITY m4-ch6-sbu "0.4 SBU">
+<!ENTITY m4-tmp-du "22 MB">
+<!ENTITY m4-tmp-sbu "0.1 SBU">
+<!ENTITY m4-fin-du "31 MB">
+<!ENTITY m4-fin-sbu "0.4 SBU">
 <!ENTITY make-version "4.3">
 …
 <!ENTITY make-md5 "fc7a67ea86ace13195b0bce683fd4469">
 <!ENTITY make-home "&gnu-software;make/">
 <!ENTITY make-ch5-du "16 MB">
 <!ENTITY make-ch5-sbu "0.1 SBU">
 <!ENTITY make-ch6-du "16 MB">
 <!ENTITY make-ch6-sbu "0.5 SBU">
+<!ENTITY make-tmp-du "16 MB">
+<!ENTITY make-tmp-sbu "0.1 SBU">
+<!ENTITY make-fin-du "13 MB">
+<!ENTITY make-fin-sbu "0.5 SBU">
 <!ENTITY man-db-version "2.9.2">
 …
 <!ENTITY man-db-md5 "86c7b99ce5969d9b20bf9aeae8d86e0b">
 <!ENTITY man-db-home "https://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "40 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
+<!ENTITY man-db-fin-du "40 MB">
+<!ENTITY man-db-fin-sbu "0.5 SBU">
 <!ENTITY man-pages-version "5.06">
 …
 <!ENTITY man-pages-md5 "df2054d875c83bbc0bc0cfb8f53f3d43">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "31 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
+<!ENTITY man-pages-fin-du "31 MB">
+<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 <!ENTITY meson-version "0.54.2">
 …
 <!ENTITY meson-md5 "6da6600c230d4124a73ca77ffef69cad">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-ch6-du "31 MB">
 <!ENTITY meson-ch6-sbu "less than 0.1 SBU">
+<!ENTITY meson-fin-du "33 MB">
+<!ENTITY meson-fin-sbu "less than 0.1 SBU">
 <!ENTITY mpc-version "1.1.0">
 …
 <!ENTITY mpc-md5 "4125404e41e482ec68282a2e687f6c73">
 <!ENTITY mpc-home "http://www.multiprecision.org/">
 <!ENTITY mpc-ch6-du "22 MB">
 <!ENTITY mpc-ch6-sbu "0.3 SBU">
+<!ENTITY mpc-fin-du "21 MB">
+<!ENTITY mpc-fin-sbu "0.3 SBU">
 <!ENTITY mpfr-version "4.0.2">
 …
 <!ENTITY mpfr-md5 "320fbc4463d4c8cb1e566929d8adc4f8">
 <!ENTITY mpfr-home "https://www.mpfr.org/">
 <!ENTITY mpfr-ch6-du "37 MB">
 <!ENTITY mpfr-ch6-sbu "0.8 SBU">
+<!ENTITY mpfr-fin-du "36 MB">
+<!ENTITY mpfr-fin-sbu "0.8 SBU">
 <!ENTITY ncurses-version "6.2">
 …
 <!ENTITY ncurses-md5 "e812da327b1c2214ac1aed440ea3ae8d">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
 <!ENTITY ncurses-ch5-du "41 MB">
 <!ENTITY ncurses-ch5-sbu "0.6 SBU">
 <!ENTITY ncurses-ch6-du "43 MB">
 <!ENTITY ncurses-ch6-sbu "0.4 SBU">
+<!ENTITY ncurses-tmp-du "48 MB">
+<!ENTITY ncurses-tmp-sbu "0.7 SBU">
+<!ENTITY ncurses-fin-du "32 MB">
+<!ENTITY ncurses-fin-sbu "0.4 SBU">
 <!ENTITY ninja-version "1.10.0">
 …
 <!ENTITY ninja-md5 "cf1d964113a171da42a8940e7607e71a">
 <!ENTITY ninja-home "https://ninja-build.org/">
 <!ENTITY ninja-ch6-du "89 MB">
 <!ENTITY ninja-ch6-sbu "0.3 SBU">
+<!ENTITY ninja-fin-du "78 MB">
+<!ENTITY ninja-fin-sbu "0.3 SBU">
 <!ENTITY openssl-version "1.1.1g">
 …
 <!ENTITY openssl-md5 "76766e98997660138cdaf13a187bd234">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-ch6-du "147 MB">
 <!ENTITY openssl-ch6-sbu "2.2 SBU">
+<!ENTITY openssl-fin-du "150 MB">
+<!ENTITY openssl-fin-sbu "2.1 SBU">
 <!ENTITY patch-version "2.7.6">
 …
 <!ENTITY patch-md5 "78ad9937e4caadcba1526ef1853730d5">
 <!ENTITY patch-home "https://savannah.gnu.org/projects/patch/">
 <!ENTITY patch-ch5-du "13 MB">
 <!ENTITY patch-ch5-sbu "0.2 SBU">
 <!ENTITY patch-ch6-du "13 MB">
 <!ENTITY patch-ch6-sbu "0.2 SBU">
+<!ENTITY patch-tmp-du "13 MB">
+<!ENTITY patch-tmp-sbu "0.1 SBU">
+<!ENTITY patch-fin-du "12 MB">
+<!ENTITY patch-fin-sbu "0.2 SBU">
 <!ENTITY perl-version "5.30.3">
 …
 <!ENTITY perl-md5 "0af2ab0f01ec13e37cc13a27de930936">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-ch5-du "275 MB">
 <!ENTITY perl-ch5-sbu "1.5 SBU">
 <!ENTITY perl-ch6-du "272 MB">
 <!ENTITY perl-ch6-sbu "9.2 SBU">
+<!ENTITY perl-tmp-du "261 MB">
+<!ENTITY perl-tmp-sbu "1.5 SBU">
+<!ENTITY perl-fin-du "240 MB">
+<!ENTITY perl-fin-sbu "8.5 SBU">
 <!ENTITY pkgconfig-version "0.29.2">
 …
 <!ENTITY pkgconfig-md5 "f6e931e319531b736fadc017f470e68a">
 <!ENTITY pkgconfig-home "https://www.freedesktop.org/wiki/Software/pkg-config">
 <!ENTITY pkgconfig-ch6-du "30 MB">
 <!ENTITY pkgconfig-ch6-sbu "0.3 SBU">
+<!ENTITY pkgconfig-fin-du "30 MB">
+<!ENTITY pkgconfig-fin-sbu "0.4 SBU">
 <!ENTITY procps-ng-version "3.3.16">
 …
 <!ENTITY procps-ng-md5 "e8dc8455e573bdc40b8381d572bbb89b">
 <!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
 <!ENTITY procps-ng-ch6-du "17 MB">
 <!ENTITY procps-ng-ch6-sbu "0.1 SBU">
+<!ENTITY procps-ng-fin-du "16 MB">
+<!ENTITY procps-ng-fin-sbu "0.1 SBU">
 <!ENTITY psmisc-version "23.3">
 …
 <!ENTITY psmisc-md5 "573bf80e6b0de86e7f307e310098cf86">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
 <!ENTITY psmisc-ch6-du "4.6 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
+<!ENTITY psmisc-fin-du "4.7 MB">
+<!ENTITY psmisc-fin-sbu "less than 0.1 SBU">
 <!-- If python minor version changes, updates in python and
 …
 <!ENTITY python-md5 "3000cf50aaa413052aef82fd2122ca78">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-ch5-du "409 MB">
 <!ENTITY python-ch5-sbu "1.3 SBU">
 <!ENTITY python-ch6-du "426 MB">
 <!ENTITY python-ch6-sbu "1.2 SBU">
+<!ENTITY python-tmp-du "397 MB">
+<!ENTITY python-tmp-sbu "1.2 SBU">
+<!ENTITY python-fin-du "246 MB">
+<!ENTITY python-fin-sbu "1.2 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
 <!ENTITY python-docs-md5 "2568df23eb5ad90aabab4b1e84b99fd9">
 …
 <!ENTITY readline-md5 "7e6c1f16aee3244a69aba6e438295ca3">
 <!ENTITY readline-home "https://tiswww.case.edu/php/chet/readline/rltop.html">
 <!ENTITY readline-ch6-du "15 MB">
 <!ENTITY readline-ch6-sbu "0.1 SBU">
+<!ENTITY readline-fin-du "15 MB">
+<!ENTITY readline-fin-sbu "0.1 SBU">
 <!ENTITY sed-version "4.8">
 …
 <!ENTITY sed-md5 "6d906edfdb3202304059233f51f9a71d">
 <!ENTITY sed-home "&gnu-software;sed/">
 <!ENTITY sed-ch5-du "21 MB">
 <!ENTITY sed-ch5-sbu "0.2 SBU">
 <!ENTITY sed-ch6-du "34 MB">
 <!ENTITY sed-ch6-sbu "0.4 SBU">
+<!ENTITY sed-tmp-du "21 MB">
+<!ENTITY sed-tmp-sbu "0.1 SBU">
+<!ENTITY sed-fin-du "32 MB">
+<!ENTITY sed-fin-sbu "0.5 SBU">
 <!ENTITY shadow-version "4.8.1">
 …
 <!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45">
 <!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/">
 <!ENTITY shadow-ch6-du "46 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
+<!ENTITY shadow-fin-du "45 MB">
+<!ENTITY shadow-fin-sbu "0.2 SBU">
 <!ENTITY sysklogd-version "1.5.1">
 …
 <!ENTITY sysklogd-md5 "c70599ab0d037fde724f7210c2c8d7f8">
 <!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
 <!ENTITY sysklogd-ch6-du "0.6 MB">
 <!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
+<!ENTITY sysklogd-fin-du "0.6 MB">
+<!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 <!ENTITY systemd-version  "245">
 …
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
 <!ENTITY systemd-man-md5  "ecf8cc4baa33b91ad4212d28e88f8edd">
 <!ENTITY systemd-ch6-du   "176 MB">
 <!ENTITY systemd-ch6-sbu  "1.9 SBU">
+<!ENTITY systemd-fin-du   "249 MB">
+<!ENTITY systemd-fin-sbu  "1.9 SBU">
 <!ENTITY sysvinit-version "2.96">
 …
 <!ENTITY sysvinit-md5 "48cebffebf2a96ab09bec14bf9976016">
 <!ENTITY sysvinit-home "https://savannah.nongnu.org/projects/sysvinit">
 <!ENTITY sysvinit-ch6-du "1.4 MB">
 <!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU">
+<!ENTITY sysvinit-fin-du "1.4 MB">
+<!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
 <!ENTITY tar-version "1.32">
 …
 <!ENTITY tar-md5 "83e38700a80a26e30b2df054e69956e5">
 <!ENTITY tar-home "&gnu-software;tar/">
 <!ENTITY tar-ch5-du "38 MB">
 <!ENTITY tar-ch5-sbu "0.3 SBU">
 <!ENTITY tar-ch6-du "45 MB">
 <!ENTITY tar-ch6-sbu "2.0 SBU">
+<!ENTITY tar-tmp-du "39 MB">
+<!ENTITY tar-tmp-sbu "0.2 SBU">
+<!ENTITY tar-fin-du "39 MB">
+<!ENTITY tar-fin-sbu "2.5 SBU">
 <!ENTITY tcl-version "8.6.10">
 …
 <!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
 <!ENTITY tcl-ch5-du "72 MB">
 <!ENTITY tcl-ch5-sbu "0.9 SBU">
+<!ENTITY tcl-tmp-du "76 MB">
+<!ENTITY tcl-tmp-sbu "0.9 SBU">
 <!ENTITY texinfo-version "6.7">
 …
 <!ENTITY texinfo-md5 "d4c5d8cc84438c5993ec5163a59522a6">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
 <!ENTITY texinfo-ch5-du "104 MB">
 <!ENTITY texinfo-ch5-sbu "0.2 SBU">
 <!ENTITY texinfo-ch6-du "116 MB">
 <!ENTITY texinfo-ch6-sbu "0.7 SBU">
+<!ENTITY texinfo-tmp-du "105 MB">
+<!ENTITY texinfo-tmp-sbu "0.3 SBU">
+<!ENTITY texinfo-fin-du "104 MB">
+<!ENTITY texinfo-fin-sbu "0.7 SBU">
 <!ENTITY tzdata-version "2020a">
 …
 <!ENTITY util-linux-md5 "248a4d0810c9193e0e9a4bb3f26b93d8">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "154 MB">
 <!ENTITY util-linux-ch5-sbu "0.9 SBU">
 <!ENTITY util-linux-ch6-du "289 MB">
 <!ENTITY util-linux-ch6-sbu "1.1 SBU">
+<!ENTITY util-linux-tmp-du "129 MB">
+<!ENTITY util-linux-tmp-sbu "0.7 SBU">
+<!ENTITY util-linux-fin-du "254 MB">
+<!ENTITY util-linux-fin-sbu "1.3 SBU">
 <!ENTITY vim-version "8.2.0814">
 …
 <!ENTITY vim-md5 "02b8b91bd2a9a97879fc60616f4eb767">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-ch6-du "202 MB">
 <!ENTITY vim-ch6-sbu "1.7 SBU">
+<!ENTITY vim-fin-du "198 MB">
+<!ENTITY vim-fin-sbu "3.0 SBU">
 <!ENTITY xml-parser-version "2.46">
 …
 <!ENTITY xml-parser-md5 "80bb18a8e6240fcf7ec2f7b57601c170">
 <!ENTITY xml-parser-home "&github;/chorny/XML-Parser">
 <!ENTITY xml-parser-ch6-du "2.4 MB">
 <!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
+<!ENTITY xml-parser-fin-du "2.4 MB">
+<!ENTITY xml-parser-fin-sbu "less than 0.1 SBU">
 <!ENTITY xz-version "5.2.5">
 …
 <!ENTITY xz-md5 "aa1621ec7013a19abab52a8aff04fe5b">
 <!ENTITY xz-home "https://tukaani.org/xz">
 <!ENTITY xz-ch5-du "18 MB">
 <!ENTITY xz-ch5-sbu "0.2 SBU">
 <!ENTITY xz-ch6-du "16 MB">
 <!ENTITY xz-ch6-sbu "0.2 SBU">
+<!ENTITY xz-tmp-du "16 MB">
+<!ENTITY xz-tmp-sbu "0.1 SBU">
+<!ENTITY xz-fin-du "15 MB">
+<!ENTITY xz-fin-sbu "0.2 SBU">
 <!ENTITY zlib-version "1.2.11">
 …
 <!ENTITY zlib-md5 "85adef240c5f370b308da8c938951a68">
 <!ENTITY zlib-home "https://www.zlib.net/">
 <!ENTITY zlib-ch6-du "5.1 MB">
 <!ENTITY zlib-ch6-sbu "less than 0.1 SBU">
+<!ENTITY zlib-fin-du "5.1 MB">
+<!ENTITY zlib-fin-sbu "less than 0.1 SBU">
 <!ENTITY zstd-version "1.4.5">
 …
 <!ENTITY zstd-md5 "dd0b53631303b8f972dafa6fd34beb0c">
 <!ENTITY zstd-home "https://facebook.github.io/zstd/">
 <!ENTITY zstd-ch6-du "16 MB">
 <!ENTITY zstd-ch6-sbu "0.7 SBU">
+<!ENTITY zstd-fin-du "16 MB">
+<!ENTITY zstd-fin-sbu "0.6 SBU">

patches.ent

-              r560065f
+              r675606b
 <!ENTITY flex-fixes-patch-size "3.4 KB">
 -->
+<!ENTITY gcc-cross-patch "gcc-&gcc-version;-cet_fix-1.patch">
+<!ENTITY gcc-cross-patch-md5 "f37d8a6b4c943a6f8eaf541923fed838">
+<!ENTITY gcc-cross-patch-size "4.3 KB">
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">

prologue/architecture.xml

r560065f	r675606b
33	33	and is 22% larger than the 32-bit build. If you plan to use LFS as a LAMP
34	34	server, or a firewall, a 32-bit CPU may be largely sufficient. On the other
35		hand, several packages in BLFS now need more that 4GB of RAM to be built
	35	hand, several packages in BLFS now need more than 4GB of RAM to be built
36	36	and/or to run, so that if you plan to use LFS as a desktop, the LFS authors
37	37	recommend building on a 64-bit system.</para>

prologue/organization.xml

-              r560065f
+              r675606b
   <sect2>
     <title>Part III - Building the LFS System</title>
+    <title>Part III - Building the LFS Cross Toolchain and Temporary Tools</title>
+    <para>Part III guides the reader through the building of the LFS
+    <para>Part III provides instructions for building the tools
+    needed for constructing the final LFS system.</para>
+  </sect2>
+  <sect2>
+    <title>Part IV - Building the LFS System</title>
+    <para>Part IV guides the reader through the building of the LFS
     system&mdash;compiling and installing all the packages one by one,
     setting up the boot scripts, and installing the kernel. The resulting
 …
   </sect2>
+  <sect2>
+    <title>Part V - Appendices</title>
+    <para>Part V provides information about the book itself including
+    acronyms and terms, acknowledgments, package dependencies,
+    a listing of LFS boot scripts, licenses for the distribution of the
+    book, and a comprehensive index of packages, programs, libraries,
+    and scripts.</para>
+  </sect2>
 </sect1>

prologue/typography.xml

-              r560065f
+              r675606b
   matches <quote>passwd</quote>, which will be
   <filename>/usr/share/man/man1/passwd.1</filename>. For this example, you will
   need to run <command>man 5 passwd</command> in order to read the specific page
   being referred to. It should be noted that most man pages do not have duplicate
+  need to run <command>man 5 passwd</command> in order to read the page
+  being specified. Note that most man pages do not have duplicate
   page names in different sections. Therefore, <command>man <replaceable>&lt;program
   name&gt;</replaceable></command> is generally sufficient.</para>

prologue/why.xml

-              r560065f
+              r675606b
         <para>DejaGNU</para>
+        <para>This package contains a framework for testing other programs.
+        It is only installed in the temporary toolchain.</para>
+        <para>This package contains a framework for testing other programs.</para>
       </listitem>
 …
         <para>Eudev</para>
+        <para>This package is a device manager.  It dynamically controls the entries
+        in the /dev directory as devices are added or removed from the system.
+        <para>This package is a device manager.  It dynamically controls the ownership,
+        permissions, names, and symbolic links of devices in the /dev directory as
+        devices are added or removed from the system.
         </para>
       </listitem>
 …
         <para>This package contains a utility for determining the type of a
         given file or files. A few packages need it to build.</para>
+        given file or files. A few packages need it in their build scripts.</para>
       </listitem>
 …
       <listitem>
         <para>Gcc</para>
+        <para>GCC</para>
         <para>This package is the Gnu Compiler Collection.  It contains the
 …
         <para>Glibc</para>
         <para>This package contains the main C library.  Linux programs would
+        <para>This package contains the main C library.  Linux programs will
         not run without it.</para>
       </listitem>
 …
         <para>This package contains math libraries that provide useful functions
         for arbitrary precision arithmetic.  It is required to build Gcc.</para>
+        for arbitrary precision arithmetic.  It is required to build GCC.</para>
       </listitem>
 …
         <para>This package contains functions for the arithmetic of complex
         numbers. It is required by Gcc.</para>
+        numbers. It is required by GCC.</para>
       </listitem>
 …
         <para>This package contains functions for multiple precision
         arithmetic.  It is required by Gcc.</para>
+        arithmetic.  It is required by GCC.</para>
       </listitem>
 …
         <para>Pkg-config</para>
         <para>This package provides a program to return meta-data about an
+        <para>This package provides a program that returns meta-data about an
         installed library or package.</para>
       </listitem>
 …
         <para>This package contains the Tool Command Language used
+        in many test suites in LFS packages.  It is only installed in
+        the temporary toolchain.</para>
+        in many test suites in LFS packages.</para>
       </listitem>

stylesheets/lfs-xsl/lfs.css

-              r560065f
+              r675606b
+}
 .table table {
+.table table, .informaltable {
   margin-left: auto;
   margin-right: auto;
 …
 .segtitle {
   float: left;
+  padding-left: 1em;
+  width: 14.5em;
+}
+.content .segtitle {
+  width: 12em;
+}
 …
 .content .segbody {
   display: block;
+  padding-left: 12em;
+}
+  padding-left: 13em;
+}
+.content table tr td:first-child
+{
+  width: 9em;
+  padding-right: 0px;
+}
+.content table tr td:first-child p
+{
+  padding-right: 0px;
+}
 /* itemizedlist */

Context Navigation

Changes in / [560065f:675606b]

Legend:

Download in other formats: