Changeset 03e6a40

BOOK/Makefile

-              r88ef769
+              r03e6a40
                    sparc sparc64 sparc64-64 \
                    mips mips64 mips64-64 \
                    ppc ppc64 ppc64-64 \
+                   alpha
+                   ppc ppc64 ppc64-64
+#                  alpha Not tested anymore
 x86_ML          := 32
 …
         @echo "Download-List Targets"
         @echo "  $(FG_GREEN)download-list $(FG_BLUE)$(ARCHS_DLLIST)$(FG_DEFAULT)"
+        @echo
         @echo "md5-List Targets"
         @echo "  $(FG_GREEN)md5-list $(FG_BLUE)$(ARCHS_MD5LIST)$(FG_DEFAULT)"

BOOK/appendices/acronymlist.xml

-              r88ef769
+              r03e6a40
     <varlistentry>
-      <term><emphasis role="bold">ALSA</emphasis></term>
-      <listitem>
-        <para>Advanced Linux Sound Architecture</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
       <term><emphasis role="bold">API</emphasis></term>
       <listitem>

BOOK/appendices/dependencies/alpha.xml

r88ef769	r03e6a40
21	21
22	22	<seglistitem>
23		<seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC,
	23	<seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, GCC,
24	24	Grep, Make, Ncurses, Sed and Patch</seg>
25	25	</seglistitem>

BOOK/appendices/dependencies/common.xml

-              r88ef769
+              r03e6a40
   </para>
+<!-- Begin ACL dependency info -->
+  <bridgehead renderas="sect2" id="acl-dep">ACL</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, GLIBC, GCC, Gettext, Grep,
+         Libtool, Make, and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Coreutils, Gettext, Libcap, Sed, and Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin Attr dependency info -->
+  <bridgehead renderas="sect2" id="attr-dep">Attr</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Gettext, Grep,
+         Libtool, Make, and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>ACL, Coretutils, Gettext, Libcap, Sed, and Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
 <!-- Begin Autoconf dependency info -->
   <bridgehead renderas="sect2" id="autoconf-dep">Autoconf</bridgehead>
 …
         <seglistitem>
           <seg>Bash, Coreutils, Gawk, Grep, M4, Make, Perl, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
       <segmentedlist>
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
           <seg>Automake, Binutils, Diffutils, Findutils, GCC and Libtool</seg>
+          <seg>Bash, Coreutils, Gawk, Grep, M4, Make, Perl, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>Automake, Binutils, Diffutils, Findutils, GCC, Libtool</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
           <seg>Autoconf, Bash, Binutils, Coreutils, Gawk, Grep, M4, Make, Perl,
           Sed and Texinfo</seg>
+          Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
           <seg>Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
           Flex, GCC, Gettext, Gzip, Libtool, XZ-Utils and Tar. Can also use several
+          Flex, GCC, Gettext, Gzip, Libtool, Tar, XZ Utils. Can also use several
           other packages that are not installed in CLFS.</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>Bash, Bison, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, Make,
           Ncurses, Patch, Readline, Sed and Texinfo</seg>
+          <seg>Bash, Bison, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep, Make,
+          Ncurses, Patch, Readline, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
           <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, GCC, Grep, Make,
+          <seg>Bash, Binutils, Bison, Coreutils, GLIBC, GCC, Grep, Make,
           and Readline</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, File, Gawk, GCC,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, File, Gawk, GCC,
          Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC,
          Grep, M4, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
       <segmentedlist>
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
           <seg>Diffutils, Findutils and Gawk</seg>
         </seglistitem>
       </segmentedlist>
       <segmentedlist>
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>Flex, Kbd and Tar</seg>
+         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC,
+         Grep, M4, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>Diffutils, Findutils, Gawk</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Flex, Kbd, Tar</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make</seg>
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Coreutils, Make and Sed</seg>
+         <seg>Bash, Coreutils, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
 …
       </segmentedlist>
 <!-- Begin CLooG-ISL dependency info -->
   <bridgehead renderas="sect2" id="cloog-isl-dep">CLooG-ISL</bridgehead>
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, GMP,
          Make, MPC, MPFR, Sed and Texinfo</seg>
+<!-- Begin CLooG dependency info -->
+  <bridgehead renderas="sect2" id="cloog-dep">CLooG</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
+         GMP, ISL, Make, MPC, MPFR, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, GMP, Grep, Make,
          Patch, Perl, Sed and Texinfo</seg>
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, GMP,
+         Grep, Libcap, Make, Patch, Perl, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
+          <seg>Bash, Diffutils, Findutils, Man and Eudev</seg>
+          <seg>Bash, Diffutils, Findutils, Man</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin D-Bus dependency info -->
+  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
+         Gettext, Grep, Make, Man, Pkg-config, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Systemd</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
 …
       </segmentedlist>
 <!-- Begin EGLIBC dependency info -->
   <bridgehead renderas="sect2" id="eglibc-dep">EGLIBC</bridgehead>
+<!-- Begin GLIBC dependency info -->
+  <bridgehead renderas="sect2" id="glibc-dep">GLIBC</bridgehead>
       <segmentedlist>
 …
       </segmentedlist>
+<!-- Begin Eudev dependency info -->
+  <bridgehead renderas="sect2" id="eudev-dep">Eudev</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
+         Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin Expat dependency info -->
+  <bridgehead renderas="sect2" id="expat-dep">Expat</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, GCC, Grep,
+         Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>D-Bus and XML::Parser</seg>
+        </seglistitem>
+      </segmentedlist>
 <!-- Begin Expect dependency info -->
   <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, GCC, Grep, Make,
          Patch, Sed and Tcl</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
+         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Gettext, Grep, Gzip,
          Make, Pkg-config-lite, Sed, Texinfo and Util-linux</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
          Make, Sed and Zlib</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, CLooG-ISL, Coreutils, Diffutils, EGLIBC,
+         <seg>Bash, Binutils, CLooG, Coreutils, Diffutils, GLIBC,
          Findutils, Gawk, GCC, GMP, Grep, ISL, Make, MPFR, Patch, Perl, Sed,
          Tar and Texinfo</seg>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, Gawk,
          GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
 …
 <!-- Begin Glib dependency info -->
   <bridgehead renderas="sect2" id="glib-dep">Glib</bridgehead>
+<!--  <bridgehead renderas="sect2" id="glib-dep">Glib</bridgehead>
       <segmentedlist>
 …
           <seg>Pkg-config-lite</seg>
         </seglistitem>
       </segmentedlist>
+      </segmentedlist> -->
 <!-- Begin GMP dependency info -->
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>MPFR, GCC</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin Gperf dependency info -->
+  <bridgehead renderas="sect2" id="gperf-dep">Gperf</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
+         Make, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>Intltool</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Systemd</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make, Perl
+         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Grep, Make, Perl
          Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
 …
       </segmentedlist>
+<!-- Begin Intltool dependency info -->
+  <bridgehead renderas="sect2" id="intltool-dep">Intltool</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Binutils, Coreutils, GLIBC, GCC, Make, Perl Sed and XML::Parser</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
 <!-- Begin IProute2 dependency info -->
   <bridgehead renderas="sect2" id="iproute2-dep">IProute2</bridgehead>
 …
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, Findutils, Flex, GCC,
+         <seg>Bash, Binutils, Bison, Coreutils, GLIBC, Findutils, Flex, GCC,
          Make, Linux-Headers and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC and Make</seg>
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Libcap and Make</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
          GMP, Make, MPC, MPFR, Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gzip, Make, and
+         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Gzip, Make, and
          Check</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, Flex, Gawk, GCC,
          Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ-Utils, and Zlib.
+         <seg>Bash, Binutils, Bison, Coreutils, GLIBC, Flex, Gawk, GCC,
+         Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ Utils, and Zlib.
          </seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>Eudev</seg>
+          <seg>Systemd</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
 …
       </segmentedlist>
+<!-- Begin libestr dependency info -->
+  <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
+         GCC, Grep, Libestr, Make, Pkg-config-lite, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Rsyslog</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin libestr dependency info -->
+  <bridgehead renderas="sect2" id="libestr-dep">Libestr</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
+         GCC, Grep, Make, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Libee and Rsyslog</seg>
+<!-- Begin Libcap dependency info -->
+  <bridgehead renderas="sect2" id="libcap-dep">Libcap</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, GLIBC, GCC, Grep and Make</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Coreutils, IPutils, Systemd</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, Gawk,
          GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, GCC, Grep,
          Gzip, Make, KMOD, Ncurses, Perl and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make, Sed
+         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Grep, Make, Sed
          and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
          Make, Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>Perl and Procps</seg>
+          <seg>Perl and Procps-ng</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Bzip2, Coreutils, EGLIBC, Gawk, GCC,
          Grep, Groff, Gzip, Less, XZ-Utils, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
       <segmentedlist>
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
           <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
       <segmentedlist>
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>None</seg>
+         <seg>Bash, Binutils, Bzip2, Coreutils, GLIBC, Gawk, GCC,
+         Grep, Groff, Gzip, Less, XZ Utils, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>D-Bus</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, GMP,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep, GMP,
          Make, MPFR, Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, GMP,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep, GMP,
          Make, Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>GCC</seg>
-        </seglistitem>
-      </segmentedlist>
-<!-- Begin KMOD dependency info -->
-  <bridgehead renderas="sect2" id="module-init-tools-dep">KMOD</bridgehead>
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Findutils, GCC, Grep, Make,
-         Sed and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>Diffutils, File, Gawk and Gzip</seg>
-        </seglistitem>
-      </segmentedlist>
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
+          <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline, Texinfo,
           Util-linux and Vim</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>Gzip, Iana-Etc and Procps, Tar</seg>
+          <seg>Gzip, Iana-Etc and Procps-ng, Tar</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>Util-linux, E2fsprogs</seg>
         </seglistitem>
       </segmentedlist>
 <!-- Begin Procps dependency info -->
   <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Ncurses</seg>
+          <seg>E2fsprogs, Systemd, Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin Procps-ng dependency info -->
+  <bridgehead renderas="sect2" id="procps-ng-dep">Procps-ng</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Make and Ncurses</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make, Ncurses
          and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make, Ncurses,
          Patch, Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>Bash</seg>
-        </seglistitem>
-      </segmentedlist>
-<!-- Begin Rsyslog dependency info -->
-  <bridgehead renderas="sect2" id="rsyslog-dep">Rsyslog</bridgehead>
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-        <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, libee,
-         Libestr, Make, Sed and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
+         Gettext, Grep, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin Sysvinit dependency info -->
+  <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, Diffutils, GLIBC,
+         Findutils, Gawk, GCC, Gettext, Grep, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin systemd dependency info -->
+  <bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, D-Bus, E2fsprogs, GLIBC,
+         Findutils, Gawk, GCC, GPerf, Grep, Intltool, Libcap, Make, Perl,
+         Pkg-config, Sed, Util-linux and XML::Parser</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, GCC,
+         <seg>Bash, Binutils, Bison, Coreutils, GLIBC, GCC,
          Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>Diffutils and Gzip</seg>
-        </seglistitem>
-      </segmentedlist>
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-<!-- Begin Eudev dependency info -->
-  <bridgehead renderas="sect2" id="udev-dep">Eudev</bridgehead>
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-        <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
          Make, Ncurses, Pkg-config-lite, Sed, Texinfo and Zlib</seg>
         </seglistitem>
 …
         <seglistitem>
           <seg>E2fsprogs</seg>
+          <seg>E2fsprogs, Systemd</seg>
         </seglistitem>
       </segmentedlist>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, Gawk, GCC,
          Gettext, Grep, Make, Ncurses, Perl and Sed</seg>
         </seglistitem>
 …
       </segmentedlist>
+<!-- Begin XZ-Utils dependency info -->
+  <bridgehead renderas="sect2" id="xz-utils-dep">XZ-Utils</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
+<!-- Begin XML::Parser dependency info -->
+  <bridgehead renderas="sect2" id="xml-parser-dep">XML::Parser</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Coreutils, Expat, Make and Perl</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Intltool</seg>
+        </seglistitem>
+      </segmentedlist>
+<!-- Begin XZ Utils dependency info -->
+  <bridgehead renderas="sect2" id="xz-utils-dep">XZ Utils</bridgehead>
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, Gawk, GCC,
          Grep, Make and Sed</seg>
         </seglistitem>
 …
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>

BOOK/appendices/dependencies/sparc.xml

r88ef769	r03e6a40
48	48
49	49	<seglistitem>
50		<seg>Binutils, Coreutils, EGLIBC, Elftoaout, Gawk, GCC, Grep, Gzip,
	50	<seg>Binutils, Coreutils, GLIBC, Elftoaout, Gawk, GCC, Grep, Gzip,
51	51	Make, Patch and Sed</seg>
52	52	</seglistitem>

BOOK/appendices/dependencies/x86.xml

r88ef769	r03e6a40
21	21
22	22	<seglistitem>
23		<seg>Bash, Binutils, Bison Coreutils, Diffutils, EGLIBC, Gawk, GCC, Gettext,
	23	<seg>Bash, Binutils, Bison Coreutils, Diffutils, GLIBC, Gawk, GCC, Gettext,
24	24	Grep, Make, Ncurses, Sed and Texinfo</seg>
25	25	</seglistitem>

BOOK/appendices/rationale/common.xml

-              r88ef769
+              r03e6a40
     <listitem>
+      <para>ACL</para>
+      <para>The ACL package allows usage and setting of POSIX Access Control
+      Lists. It can be used by several other packages in CLFS, such as Coreutils
+      and Systemd.</para>
+    </listitem>
+    <listitem>
+      <para>Attr</para>
+      <para>Attr allows setting and viewing extended attributes of filesystem
+      objects. It is required by Systemd..</para>
+    </listitem>
+    <listitem>
       <para>Autoconf</para>
       <para>The Autoconf package contains programs for producing shell scripts
 …
     <listitem>
       <para>Check</para>
+      <para>This package contains a test harness for other programs.</para>
+    </listitem>
+    <listitem>
+      <para>CLooG-ISL</para>
+      <para>This package contains a test harness for other programs. It is
+      used for some packages' testsuites.</para>
+    </listitem>
+    <listitem>
+      <para>CLooG</para>
       <para>This package is used by GCC.</para>
     </listitem>
 …
       <para>This package contains many basic command-line file-management
       tools, required for installation of every package in CLFS.</para>
+    </listitem>
+    <listitem>
+      <para>D-Bus</para>
+      <para>D-Bus is a message bus system, which allows applications to
+      communicate to each other. It is required by Systemd.</para>
     </listitem>
 …
     <listitem>
       <para>EGLIBC</para>
+      <para>GLIBC</para>
       <para>Any dynamically-linked C program (which is nearly everything
       in CLFS) needs a C library to compile and run.</para>
+    </listitem>
+    <listitem>
+      <para>Eudev</para>
+      <para>This is a package that allows for dynamic creation of device nodes.
+      It is a fork of Udev, which is now part of Systemd. It is still
+      used for the "Boot" method in the temp-system, as Systemd is not needed
+      there.</para>
     </listitem>
 …
       <para>GMP</para>
       <para>This package is required by GCC.</para>
+    </listitem>
+    <listitem>
+      <para>Gperf</para>
+      <para>This package is required by Systemd.</para>
     </listitem>
 …
     <listitem>
+      <para>Intltool</para>
+      <para>This package is required by Systemd.</para>
+    </listitem>
+    <listitem>
       <para>IProute2</para>
       <para>This package contains programs for administering network interfaces.</para>
 …
     <listitem>
+      <para>Libee</para>
+      <para>This package contains an event expression library. It is needed by
+      Rsyslog.</para>
+    </listitem>
+    <listitem>
+      <para>Libestr</para>
+      <para>This package contains a library for string essentials. It is needed
+      by Rsyslog.</para>
+      <para>Libcap</para>
+      <para>This package is required by Systemd.</para>
     </listitem>
 …
     <listitem>
       <para>Procps</para>
+      <para>Procps-ng</para>
       <para>Provides a number of small, useful utilities that give information
       about the <filename class="directory">/proc</filename> filesystem.</para>
 …
     <listitem>
-      <para>Rsyslog</para>
-      <para>Rsyslog is an enhanced multi-threaded syslogd that supports
-      multiple backends with very little dependencies. It provides a program
-      that logs various system events into files in
-      <filename class="directory">/var/log</filename>.</para>
-    </listitem>
-    <listitem>
       <para>Sed</para>
       <para>This package contains a stream editor. It is used in the
 …
     <listitem>
       <para>Sysvinit</para>
       <para>Sysvinit is the init daemon that the clfs-bootscripts were written
       to work with.</para>
+      <para>Systemd</para>
+      <para>Systemd provides the init daemon for the system, as well as Udev,
+      which dynamically creates device nodes.</para>
     </listitem>
 …
       converting info pages. It is used in the installation procedures
       of many CLFS packages.</para>
-    </listitem>
-    <listitem>
-      <para>Eudev</para>
-      <para>The Eudev package contains programs for dynamic creation of device
-      nodes.</para>
     </listitem>
 …
     <listitem>
+      <para>XZ-Utils</para>
+      <para>XML::Parser</para>
+      <para>This Perl module is required by Intltool.</para>
+    </listitem>
+    <listitem>
+      <para>XZ Utils</para>
       <para>Useful for compressing files to reduce size. Also needed to
       uncompress tarballs for many CLFS packages</para>

BOOK/boot/64/createfiles.xml

-              r88ef769
+              r03e6a40
   <title>Creating Essential Symlinks</title>
+  <para os="a">Some programs use hard-wired paths to programs which do not exist
+  yet. In order to satisfy these programs, create a number of symbolic
+  links which will be replaced by real files throughout the course of
+  the next chapter after the software has been installed.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
+ln -sv /tools/bin/file ${CLFS}/usr/bin
+ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
+ln -sv bash ${CLFS}/bin/sh
+ln -sv ../run ${CLFS}/var/run</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
   <para os="b">To enable some c++ tests in the Glibc and Binutils testsuites
+  <para os="e">To enable some C++ tests in the Glibc and Binutils testsuites
   to link, create a directory and make some symbolic links:</para>
+<screen><userinput>mkdir -pv ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib64</userinput></screen>
+<screen os="f"><userinput>mkdir -pv ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib64</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 </sect1>

BOOK/boot/64/e2fsprogs.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='f'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
+    LDFLAGS="-Wl,-rpath,/tools/lib"</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='l'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
   </sect2>

BOOK/boot/64/eudev.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-boot-eudev">
     <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>boot</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eudev.xml"
+  href="../common/eudev.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
+    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin --libdir=/lib64 \
+    --disable-introspection --disable-gtk-doc-html --disable-gudev \
+    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
+    KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+    CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET}  --disable-introspection --disable-gtk-doc-html \
+    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
+    --enable-libkmod</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='r1'])"/>
 …
     xpointer="xpointer(//*[@os='r2'])"/>
- </sect2>
-  <sect2 role="content">
-    <title/>
-    <para>Details on this package are located in <xref
-    linkend="contents-eudev" role="."/></para>
   </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
 </sect1>

BOOK/boot/64/grub-build.xml

-              r88ef769
+              r03e6a40
 <screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
+    --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='f'])"/>
+<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
   </sect2>

BOOK/boot/64/shadow.xml

-              r88ef769
+              r03e6a40
 <screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --sysconfdir=/etc</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='l'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
   </sect2>

BOOK/boot/alpha-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>

BOOK/boot/alpha/kernel.xml

-              r88ef769
+              r03e6a40
 <screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='v'])"/>
 <screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/common/bootscripts.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-scripts-boot" role="wrap">
+<sect1 id="ch-scripts-bootscripts" role="wrap">
   <?dbhtml filename="bootscripts.html"?>
   <title>Bootscripts for CLFS &bootscripts-clfs-version;</title>
   <indexterm zone="ch-scripts-boot">
+  <indexterm zone="ch-scripts-bootscripts">
     <primary sortas="a-Bootscripts">Bootscripts</primary>
-    <secondary>boot</secondary>
   </indexterm>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../bootscripts/common/bootscripts.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+  <sect2 role="package">
+    <title/>
+    <para>The Bootscripts package contains a set of scripts to
+    start/stop the CLFS system at bootup/shutdown.</para>
+  </sect2>
   <sect2 role="installation">
     <title>Installation of Bootscripts</title>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootscripts/common/bootscripts.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>make DESTDIR=${CLFS} install-minimal</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootscripts/common/setclock.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+    <para os="c">If you do not know whether or not the hardware clock is set to UTC,
+    you can find out after you have booted the new machine by running the
+    <userinput>hwclock --localtime  --show</userinput> command, and if
+    necessary editing the <filename>/etc/sysconfig/clock</filename> script.
+    The worst that will happen if you make a wrong guess here is that the
+    time displayed will be wrong.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootscripts/common/setclock.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+<screen os="d"><userinput>cat &gt; ${CLFS}/etc/sysconfig/clock &lt;&lt; "EOF"
+<literal># Begin /etc/sysconfig/clock
+    <para os="s1">Update the bootscripts so they can be used in /tools:</para>
+<screen os="s2"><userinput>patch -Np1 -i ../bootscripts-cross-lfs-2.1-pre1-updates-1.patch</userinput></screen>
+    <para os="a">Install the package:</para>
+<screen os="b"><userinput>make DESTDIR=/tools install-minimal</userinput></screen>
+  <para os="c">The <command>setclock</command> script reads the time from the
+  hardware clock, also known as the BIOS or the Complementary Metal Oxide
+  Semiconductor (CMOS) clock. If the hardware clock is set to UTC, this
+  script will convert the hardware clock's time to the local time using
+  the <filename>/etc/localtime</filename> file (which tells the
+  <command>hwclock</command> program which timezone the user is in). There
+  is no way to detect whether or not the hardware clock is set to UTC, so
+  this needs to be configured manually.</para>
+  <para os="d">If you do not know whether or not the hardware clock is set to UTC,
+  you can find out after you have booted the new machine by running the
+  <userinput>hwclock --localtime  --show</userinput> command, and if
+  necessary editing the <filename>/etc/sysconfig/clock</filename> script.
+  The worst that will happen if you make a wrong guess here is that the
+  time displayed will be wrong.</para>
+  <para os="e">Change the value of the <envar>UTC</envar> variable below
+  to a value of <option>0</option> (zero) if the hardware clock
+  is <emphasis>not</emphasis> set to UTC time.</para>
+<screen os="f"><userinput>cat &gt; /tools/etc/sysconfig/clock &lt;&lt; "EOF"
+<literal># Begin /tools/etc/sysconfig/clock
 UTC=1
 # End /etc/sysconfig/clock</literal>
+# End /tools/etc/sysconfig/clock</literal>
 EOF</userinput></screen>
   </sect2>
+  <sect2 role="content">
+    <title/>
+  <para>Details on this package are located in <xref
+  linkend="contents-bootscripts" role="."/></para>
+  <sect2 id="contents-bootscripts" role="content">
+    <title>Contents of Bootscripts</title>
+    <segmentedlist>
+      <segtitle>Installed scripts</segtitle>
+      <seglistitem>
+        <seg>checkfs, cleanfs, functions, halt, localnet, mountfs, mountkernfs,
+        rc, reboot, sendsignals, setclock, swap, and udev.</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="checkfs-bootscripts">
+        <term><command>checkfs</command></term>
+        <listitem>
+          <para>Checks the integrity of the file systems before they are
+          mounted (with the exception of journal and network based file
+          systems)</para>
+          <indexterm zone="ch-scripts-bootscripts checkfs-bootscripts">
+            <primary sortas="d-checkfs">checkfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="cleanfs-bootscripts">
+        <term><command>cleanfs</command></term>
+        <listitem>
+          <para>Removes files that should not be preserved between reboots,
+          such as those in <filename class="directory">/var/run/</filename>
+          and <filename class="directory">/var/lock/</filename>; it re-creates
+          <filename>/var/run/utmp</filename> and removes the possibly present
+          <filename>/etc/nologin</filename>, <filename>/fastboot</filename>,
+          and <filename>/forcefsck</filename> files</para>
+          <indexterm zone="ch-scripts-bootscripts cleanfs-bootscripts">
+            <primary sortas="d-cleanfs">cleanfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="functions-bootscripts">
+        <term><command>functions</command></term>
+        <listitem>
+          <para>Contains common functions, such as error and status checking,
+          that are used by several bootscripts</para>
+          <indexterm zone="ch-scripts-bootscripts functions-bootscripts">
+            <primary sortas="d-functions">functions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="halt-bootscripts">
+        <term><command>halt</command></term>
+        <listitem>
+          <para>Halts the system</para>
+          <indexterm zone="ch-scripts-bootscripts halt-bootscripts">
+            <primary sortas="d-halt">halt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="localnet-bootscripts">
+        <term><command>localnet</command></term>
+        <listitem>
+          <para>Sets up the system's hostname and local loopback device</para>
+          <indexterm zone="ch-scripts-bootscripts localnet-bootscripts">
+            <primary sortas="d-localnet">localnet</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="mountfs-bootscripts">
+        <term><command>mountfs</command></term>
+        <listitem>
+          <para>Mounts all file systems, except ones that are marked
+          <emphasis>noauto</emphasis> or are network based</para>
+          <indexterm zone="ch-scripts-bootscripts mountfs-bootscripts">
+            <primary sortas="d-mountfs">mountfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="mountkernfs-bootscripts">
+        <term><command>mountkernfs</command></term>
+        <listitem>
+          <para>Mounts virtual kernel file systems, such as
+          <systemitem class="filesystem">proc</systemitem></para>
+          <indexterm zone="ch-scripts-bootscripts mountkernfs-bootscripts">
+            <primary sortas="d-mountkernfs">mountkernfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="rc-bootscripts">
+        <term><command>rc</command></term>
+        <listitem>
+          <para>The master run-level control script; it is responsible for
+          running all the other bootscripts one-by-one, in a sequence
+          determined by the name of the symbolic links being processed</para>
+          <indexterm zone="ch-scripts-bootscripts rc-bootscripts">
+            <primary sortas="d-rc">rc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="reboot-bootscripts">
+        <term><command>reboot</command></term>
+        <listitem>
+          <para>Reboots the system</para>
+          <indexterm zone="ch-scripts-bootscripts reboot-bootscripts">
+            <primary sortas="d-reboot">reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="sendsignals-bootscripts">
+        <term><command>sendsignals</command></term>
+        <listitem>
+          <para>Makes sure every process is terminated before the system reboots
+          or halts</para>
+          <indexterm zone="ch-scripts-bootscripts sendsignals-bootscripts">
+            <primary sortas="d-sendsignals">sendsignals</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="setclock-bootscripts">
+        <term><command>setclock</command></term>
+        <listitem>
+          <para>Resets the kernel clock to local time in case the hardware clock
+          is not set to UTC time</para>
+          <indexterm zone="ch-scripts-bootscripts setclock-bootscripts">
+            <primary sortas="d-setclock">setclock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="swap-bootscripts">
+        <term><command>swap</command></term>
+        <listitem>
+          <para>Enables and disables swap files and partitions</para>
+          <indexterm zone="ch-scripts-bootscripts swap-bootscripts">
+            <primary sortas="d-swap">swap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="eudev-bootscripts">
+        <term><command>udev</command></term>
+        <listitem>
+          <para>Starts and stops the Eudev daemon</para>
+          <indexterm zone="ch-scripts-bootscripts eudev-bootscripts">
+            <primary sortas="d-eudev">udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </sect2>

BOOK/boot/common/changingowner.xml

-              r88ef769
+              r03e6a40
   <title>Changing Ownership</title>
+  <para os="a">Currently, the <filename class="directory">${CLFS}</filename>
+  directory and all of its subdirectories  are owned by the user
+  <systemitem class="username">clfs</systemitem>, a user that exists only
+  on the host system. For security reasons, the ${CLFS} root directory and
+  all of its subdirectories should be owned by
+  <systemitem class="username">root</systemitem>. Change the ownership
+  for ${CLFS} and its subdirectories by running this command:</para>
+  <para os="a">Currently, the <filename class="directory">/tools</filename>
+  and <filename class="directory">/cross-tools</filename> directories
+  are owned by the user <emphasis>clfs</emphasis>, a user that
+  exists only on the host system. Although <filename
+  class="directory">/tools</filename> and <filename
+  class="directory">/cross-tools</filename> can be deleted once the CLFS
+  system has been finished, they can be retained to build
+  additional CLFS systems. If the <filename class="directory">/tools</filename>
+  and <filename class="directory">/cross-tools</filename> directories are
+  kept as is, the files are owned by a user ID without a corresponding
+  account. This is dangerous because a user account created later could
+  get this same user ID and would own these directories and all the files
+  therein, thus exposing those files to possible malicious manipulation.</para>
+<screen os="b"><userinput>chown -Rv &uid-root;:&gid-root; ${CLFS}</userinput></screen>
+  <para os="b">One possible fix for this issue might be to add the
+  <systemitem class="username">clfs</systemitem> user to the new CLFS system
+  later when creating the <filename>/etc/passwd</filename> file, taking care
+  to assign it the same user and group IDs as on the host system. Alternatively,
+  assign the contents of the <filename class="directory">/tools</filename>
+  and <filename class="directory">/cross-tools</filename> directories to
+  user <systemitem class="username">root</systemitem> by running the
+  following commands:</para>
+  <para>The following files are to be owned by the group
+  <systemitem class="username">utmp</systemitem> not by
+  <systemitem class="username">root</systemitem>.</para>
+<screen><userinput>chgrp -v &gid-utmp; ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog</userinput></screen>
+<screen os="c"><userinput>chown -Rv 0:0 ${CLFS}/tools
+chown -Rv 0:0 ${CLFS}/cross-tools</userinput></screen>
 </sect1>

BOOK/boot/common/createfiles.xml

-              r88ef769
+              r03e6a40
   the next chapter after the software has been installed.</para>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
+ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
+<screen os="b"><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
 ln -sv bash ${CLFS}/bin/sh
+ln -sv /run ${CLFS}/var/run</userinput></screen>
+ln -sv ../run ${CLFS}/var/run
+ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
+ln -sv /tools/sbin/init ${CLFS}/sbin
+ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
+  <para os="c">Historically, Linux maintains a list of the mounted file systems
+  in the file <filename>/etc/mtab</filename>. Modern kernels maintain this list
+  internally and expose it to the user via the
+  <filename class="directory">/proc</filename> filesystem. To satisfy utilities
+  that expect the presence of <filename>/etc/mtab</filename>, create the
+  following symbolic link:</para>
+<screen os="d"><userinput>ln -sv /proc/self/mounts ${CLFS}/etc/mtab</userinput></screen>
 </sect1>

BOOK/boot/common/creatingdirs.xml

-              r88ef769
+              r03e6a40
   <title>Creating Directories</title>
+  <para os="a">It is time to create some structure in the CLFS file system. Create a
+    <note os="a">
+      <para>The commands in the remainder of the book should be run as
+      the <systemitem class="username">root</systemitem> user. Check
+      that ${CLFS} is set in the
+      <systemitem class="username">root</systemitem> user&rsquo;s environment
+       before proceeding.</para>
+    </note>
+  <para os="b">It is time to create some structure in the CLFS file system. Create a
   standard directory tree by issuing the following commands:</para>
 <screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt}
+<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib/firmware,mnt}
 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
 mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
 …
 mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
 mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
+for dir in ${CLFS}/usr{,/local}; do
+  ln -sv share/{man,doc,info} $dir
+done</userinput></screen>
+mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}</userinput></screen>
   <para os="c">Directories are, by default, created with permission mode 755,
+  <para os="d">Directories are, by default, created with permission mode 755,
   but this is not desirable for all directories. In the commands above,
   two changes are made&mdash;one to the home directory of user
 …
   directories for temporary files.</para>
   <para os="d">The first mode change ensures that not just anybody can enter
+  <para os="e">The first mode change ensures that not just anybody can enter
   the <filename class="directory">/root</filename> directory&mdash;the
   same as a normal user would do with his or her home directory. The
 …
 bit mask.</para>
   <sect2 os="e">
+  <sect2 os="f">
     <title>FHS Compliance Note</title>

BOOK/boot/common/devices.xml

-              r88ef769
+              r03e6a40
     <title>Creating Initial Device Nodes</title>
-    <note os="a">
-      <para>The commands in the remainder of the book should be run as
-      the <systemitem class="username">root</systemitem> user. Check
-      that ${CLFS} is set in the
-      <systemitem class="username">root</systemitem> user&rsquo;s environment
-       before proceeding.</para>
-    </note>
     <para os="b">When the kernel boots the system, it requires the presence
     of a few device nodes, in particular the <filename
 …
     the following commands:</para>
+<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
+mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
+    <para>Before udev starts, a tmpfs filesystem is mounted over
+    <filename class="directory">/dev</filename> and the previous entries are
+    no longer available. The following command creates files that are copied
+    over by the udev bootscript:</para>
+<screen><userinput>mknod -m 600 ${CLFS}/lib/udev/devices/console c 5 1
+mknod -m 666 ${CLFS}/lib/udev/devices/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 0600 ${CLFS}/dev/console c 5 1
+mknod -m 0666 ${CLFS}/dev/null c 1 3</userinput></screen>
   </sect2>

BOOK/boot/common/e2fsprogs.xml

-              r88ef769
+              r03e6a40
       xpointer="xpointer(//*[@os='e2'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../final-system/common/e2fsprogs.xml"
+      xpointer="xpointer(//*[@os='e3'])"/>
     </variablelist>
 …
     xpointer="xpointer(//*[@os='l'])"/>
-    <para os="ad">Create needed symlinks for a bootable system:</para>
-<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin</userinput></screen>
   </sect2>

BOOK/boot/common/eudev.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-boot-eudev">
     <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>boot</secondary>
   </indexterm>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/common/eudev.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+  <sect2 role="package">
+    <title/>
+    <para>The Eudev package contains programs for dynamic creation of device
+    nodes.</para>
+  </sect2>
   <sect2 role="installation">
     <title>Installation of Eudev</title>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+   <para os="a">Prepare Eudev for compilation:</para>
 <screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/usr \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib --bindir=/sbin --sbindir=/sbin --libdir=/usr/lib \
+    --with-rootlibdir=/lib --disable-introspection --disable-gtk-doc-html \
+    KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+    ./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-introspection --disable-gtk-doc-html \
     --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
     --enable-libkmod</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="k"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='r1'])"/>
+    <para os="c">Compile the package:</para>
+<screen os="d"><userinput>make</userinput></screen>
+    <para os="g">Install the package:</para>
+<screen os="j"><userinput>make install</userinput></screen>
+    <para os="i">Create a directory for storing firmware that can be
+    loaded by <command>udev</command>:</para>
+<screen os="k"><userinput>install -dv /tools/lib/firmware</userinput></screen>
+    <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
 <screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \
 > ${CLFS}/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
+> /tools/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
  </sect2>
+  <sect2 role="content">
+    <title/>
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
+  <sect2 id="contents-eudev" role="content">
+    <title>Contents of Eudev</title>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
+      <segtitle>Installed directories</segtitle>
+      <seglistitem>
+        <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
+        firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, usb_id,
+        v4l_id, write_cd_rules, write_net_rules</seg>
+        <seg>libudev</seg>
+        <seg>/tools/etc/udev, /tools/lib/firmware, /tools/lib/udev</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="udevadm">
+        <term><command>udevadm</command></term>
+        <listitem>
+        <para>Controls the runtime behavior of Eudev, requests kernel
+        events, manages the event queue, and provides simple debugging.</para>
+          <indexterm zone="ch-boot-eudev udevadm">
+            <primary sortas="b-udevadm">udevadm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="udevd">
+        <term><command>udevd</command></term>
+        <listitem>
+          <para>A daemon that reorders hotplug events before submitting them to
+          <command>udev</command>,
+          thus avoiding various race conditions</para>
+          <indexterm zone="ch-boot-eudev udevd">
+            <primary sortas="b-udevd">udevd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+ <!-- Start of Helpers -->
+      <varlistentry id="ata_id">
+        <term><command>ata_id</command></term>
+        <listitem>
+          <para>Provides Eudev with a unique string and additional
+          information (uuid, label) for an ATA drive</para>
+          <indexterm zone="ch-boot-eudev ata_id">
+            <primary sortas="b-ata_id">ata_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="cdrom_id">
+        <term><command>cdrom_id</command></term>
+        <listitem>
+          <para>Prints the capabilities of a CDROM or DVDROM drive.</para>
+          <indexterm zone="ch-boot-eudev cdrom_id">
+            <primary sortas="b-cdrom_id">cdrom_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="collect">
+        <term><command>collect</command></term>
+        <listitem>
+          <para>Given an ID for the current uevent and a list of IDs
+(for all target uevents), registers the current ID and indicates whether
+all target IDs have been registered.</para>
+          <indexterm zone="ch-boot-eudev collect">
+            <primary sortas="b-collect">collect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="create_floppy_devices">
+        <term><command>create_floppy_devices</command></term>
+        <listitem>
+          <para>Creates all possible floppy devices based on the CMOS type</para>
+          <indexterm zone="ch-boot-eudev create_floppy_devices">
+            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="edd_id">
+        <term><command>edd_id</command></term>
+        <listitem>
+          <para>Identifies x86 disk drives from Enhanced Disk Drive calls</para>
+          <indexterm zone="ch-boot-eudev edd_id">
+            <primary sortas="b-edd_id">edd_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="firmware.sh">
+        <term><command>firmware.sh</command></term>
+        <listitem>
+          <para>Script to load firmware for a device</para>
+          <indexterm zone="ch-boot-eudev firmware.sh">
+            <primary sortas="b-firmware.sh">firmware.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="fstab_import">
+        <term><command>fstab_import</command></term>
+        <listitem>
+          <para>Finds an entry in <filename>/etc/fstab</filename> that matches
+the current device, and provides its information to Udev.</para>
+          <indexterm zone="ch-boot-eudev fstab_import">
+            <primary sortas="b-fstab_import">fstab_import</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="path_id">
+        <term><command>path_id</command></term>
+        <listitem>
+          <para>Provides the shortest possible unique hardware path to a
+          device</para>
+          <indexterm zone="ch-boot-eudev path_id">
+            <primary sortas="b-path_id">path_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="scsi_id">
+        <term><command>scsi_id</command></term>
+        <listitem>
+          <para>Retrieves or generates a unique SCSI identifier.</para>
+          <indexterm zone="ch-boot-eudev scsi_id">
+            <primary sortas="b-scsi_id">scsi_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="usb_id">
+        <term><command>usb_id</command></term>
+        <listitem>
+          <para>Identifies a USB block device.</para>
+          <indexterm zone="ch-boot-eudev usb_id">
+            <primary sortas="b-usb_id">usb_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="v4l_id">
+        <term><command>v4l_id</command></term>
+        <listitem>
+          <para>Determines V4L capabilities for a given device.</para>
+          <indexterm zone="ch-boot-eudev v4l_id">
+            <primary sortas="b-v4l_id">v4l_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="write_cd_rules">
+        <term><command>write_cd_rules</command></term>
+        <listitem>
+          <para>A script which generates Eudev rules to provide stable names
+for network interfaces.</para>
+          <indexterm zone="ch-boot-eudev write_cd_rules">
+            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="write_net_rules">
+        <term><command>write_net_rules</command></term>
+        <listitem>
+          <para>A script which generates Eudev rules to provide stable names
+for network interfaces.</para>
+          <indexterm zone="ch-boot-eudev write_net_rules">
+            <primary sortas="b-write_net_rules">write_net_rules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+<!-- End of Helpers -->
+      <varlistentry id="libudev">
+        <term><filename class="libraryfile">libudev</filename></term>
+        <listitem>
+          <para>A library interface to eudev device information.</para>
+          <indexterm zone="ch-boot-eudev libudev">
+            <primary sortas="c-libudev">libudev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="etc-eudev">
+        <term><filename class="directory">/etc/udev</filename></term>
+        <listitem>
+          <para>Contains <command>udev</command> configuration files,
+          device permissions, and rules for device naming</para>
+          <indexterm zone="ch-boot-eudev etc-eudev">
+            <primary sortas="e-/etc/udev">/etc/udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="lib-eudev">
+        <term><filename class="directory">/lib/udev</filename></term>
+        <listitem>
+          <para>Contains <command>udev</command> helper programs
+          and static devices which get copied to /dev when booted.</para>
+          <indexterm zone="ch-boot-eudev lib-eudev">
+            <primary sortas="e-/lib/udev">/lib/udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </sect2>

BOOK/boot/common/introduction.xml

-              r88ef769
+              r03e6a40
   build the final system packages.</para>
-  <para>There are a few additional packages that will need to be
-  installed to allow you to boot the minimal system. Some of these
-  packages will be installed onto root or in /usr on the CLFS
-  partition (${CLFS}/bin, ${CLFS}/usr/bin, etc...), rather than /tools, using the
-  "DESTDIR" option with make. This will require the
-  <systemitem class="username">clfs</systemitem> user to have write access to
-  the rest of the CLFS partition, so you will need to temporarily change the
-  ownership of ${CLFS} to the <systemitem class="username">clfs</systemitem> user.
-  Run the following command as <systemitem
-  class="username">root</systemitem>:</para>
-<screen><userinput>chown -v clfs ${CLFS}</userinput></screen>
 </sect1>

BOOK/boot/common/kmod.xml

-              r88ef769
+              r03e6a40
     <title>Installation of Kmod</title>
+    <para os="s1">Tell Kmod to use <filename class="directory">/tools/lib/modules</filename>:</para>
+<screen os="s2"><userinput>cp -v libkmod/libkmod.c{,.orig}
+sed '/dirname_default_prefix /s@/lib/modules@/tools&amp;@' \
+    libkmod/libkmod.c.orig &gt; libkmod/libkmod.c</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/kmod.xml"
 …
 <screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib -llzma" \
 zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
+./configure --prefix=/tools --bindir=/bin \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib \
+    --disable-manpages</userinput></screen>
+./configure --prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
+    <variablelist os="c">
+      <title>The meaning of the new configure options:</title>
+      <varlistentry>
+        <term><parameter>--with-zlib --with-xz</parameter></term>
+        <listitem>
+          <para>These allow the Kmod package to handle zlib and XZ
+            compressed kernel modules.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 href="../../final-system/common/kmod.xml"
 xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/kmod.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="j"><userinput>ln -sv kmod ${CLFS}/bin/lsmod
+ln -sv ../bin/kmod ${CLFS}/sbin/depmod
+ln -sv ../bin/kmod ${CLFS}/sbin/insmod
+ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
+ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
+ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
+<screen os="j"><userinput>ln -sfv kmod /tools/bin/lsmod
+for tool in depmod insmod modprobe modinfo rmmod; do
+    ln -sv ../bin/kmod /tools/sbin/${tool}
+done</userinput></screen>
   </sect2>

BOOK/boot/common/pwdgroup.xml

-              r88ef769
+              r03e6a40
   <?dbhtml filename="pwdgroup.html"?>
   <title>Creating the passwd, group, and log Files</title>
+  <title>Creating the passwd and group Files</title>
   <indexterm zone="ch-boot-pwdgroup">
 …
   <indexterm zone="ch-boot-pwdgroup">
     <primary sortas="e-/etc/group">/etc/group</primary>
-  </indexterm>
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
-  </indexterm>
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
-  </indexterm>
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
-  </indexterm>
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
   </indexterm>
 …
 <screen><userinput>cat &gt; ${CLFS}/etc/passwd &lt;&lt; "EOF"
 <literal>root::&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
+<literal>bin:x:&uid-bin;:&gid-bin;:/bin:/bin/false</literal>
+<literal>daemon:x:&uid-daemon;:&gid-daemon;:/sbin:/bin/false</literal>
+<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
+<literal>nobody:x:&uid-nobody;:&gid-nogroup;:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 …
   <variablelist os="c">
     <title>Additional users you may want to add:</title>
+    <title>Additional users you may want to add if not already included:</title>
-    <varlistentry>
-      <term><literal>bin:x:&uid-bin;:&gid-bin;:bin:/bin:/bin/false</literal></term>
-      <listitem>
-        <para>Can be useful for compatibility with legacy applications.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>daemon:x:&uid-daemon;:&gid-daemon;:daemon:/sbin:/bin/false</literal></term>
-      <listitem>
-        <para>It is often recommended to use an unprivileged User ID/Group ID
-        for daemons to run as, in order to limit their access to the system.</para>
-      </listitem>
-    </varlistentry>
     <varlistentry>
       <term><literal>adm:x:&uid-adm;:&gid-adm;:adm:/var/adm:/bin/false</literal></term>
 …
       </listitem>
     </varlistentry>
-    <varlistentry>
-      <term><literal>nobody:x:&uid-nobody;:&gid-nobody;:nobody:/:/bin/false</literal></term>
-      <listitem>
-        <para>Used by NFS</para>
-      </listitem>
-    </varlistentry>
   </variablelist>
 …
 utmp:x:&gid-utmp;:
 usb:x:&gid-usb;:
+cdrom:x:&gid-cdrom;:</literal>
+cdrom:x:&gid-cdrom;:
+adm:x:&gid-adm;:
+messagebus:x:&gid-messagebus;:
+systemd-journal:x:&gid-systemd-journal;:
+mail:x:&gid-mail;:
+wheel:x:&gid-wheel;:
+nogroup:x:&gid-nogroup;:</literal>
 EOF</userinput></screen>
   <variablelist os="d">
     <title>Additional groups you may want to add</title>
+    <title>Additional groups you may want to add if not already included:</title>
-    <varlistentry>
-      <term><literal>adm:x:&gid-adm;:root,adm,daemon</literal></term>
-      <listitem>
-        <para>All users in this group are allowed to do administrative tasks</para>
-      </listitem>
-    </varlistentry>
     <varlistentry>
       <term><literal>console:x:&gid-console;:</literal></term>
 …
       <listitem>
         <para>This group is allowed to use the CDRW drive</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>mail:x:&gid-mail;:mail</literal></term>
-      <listitem>
-        <para>Used by MTAs (Mail Transport Agents)</para>
       </listitem>
     </varlistentry>
 …
     </varlistentry>
     <varlistentry>
+      <term><literal>nogroup:x:&gid-nogroup;:</literal></term>
+      <listitem>
+        <para>This is a default group used by some programs that do not
+        require a group</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>nobody:x:&gid-nobody;:</literal></term>
+      <term><literal>nobody:x:&gid-nogroup;:</literal></term>
       <listitem>
         <para>This is used by NFS</para>
 …
   <para os="e">The created groups are not part of any standard&mdash;they are
   groups decided on in part by the requirements of the Eudev configuration
+  groups decided on in part by the requirements of the Systemd configuration
   in the final system, and in part by common convention employed by a
   number of existing Linux distributions. The Linux Standard Base (LSB,
 …
   group's name.</para>
-  <para os="f">The <command>login</command>, <command>agetty</command>, and
-  <command>init</command> programs (and others) use a number of log
-  files to record information such as who was logged into the system and
-  when. However, these programs will not write to the log files if they
-  do not already exist. Initialize the log files and give them
-  proper permissions:</para>
-<screen><userinput>touch ${CLFS}/var/run/utmp ${CLFS}/var/log/{btmp,lastlog,wtmp}
-chmod -v 664 ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog
-chmod -v 600 ${CLFS}/var/log/btmp</userinput></screen>
-  <para>The <filename>/var/run/utmp</filename> file records the users
-  that are currently logged in. The <filename>/var/log/wtmp</filename>
-  file records all logins and logouts. The
-  <filename>/var/log/lastlog</filename> file records when
-  each user last logged in. The <filename>/var/log/btmp</filename> file
-  records the bad login attempts.</para>
 </sect1>

BOOK/boot/common/settingenviron.xml

-              r88ef769
+              r03e6a40
   <para>The new instance of the shell that will start when the system is booted is a <emphasis>login</emphasis>
   shell, which will read <filename>.bash_profile</filename> file. Create the
   <filename>.bash_profile</filename> file now:</para>
+  shell, which will read the <filename>.bash_profile</filename> file. Create
+  <filename>.bash_profile</filename> now:</para>
 <screen><userinput>cat &gt; ${CLFS}/root/.bash_profile &lt;&lt; "EOF"

BOOK/boot/common/shadow.xml

-              r88ef769
+              r03e6a40
     <title>Installation of Shadow</title>
+    <para os="b">Disable the installation of the <command>groups</command>
+    program, as Coreutils provides a better version:</para>
+    <para os="b">Disable the installation of the <command>groups</command> and
+    <command>nologin</command> programs, as better versions
+    of these programs are provided by Coreutils and Util-linux:</para>
 <screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
+sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
+sed  -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
+    src/Makefile.in.orig > src/Makefile.in</userinput></screen>
     <para os="d">Prepare Shadow for compilation:</para>
 <screen os="e"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --sysconfdir=/etc</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<para os="f">The meaning of the configure options:</para>
+    <para os="f">Tell Shadow to use <command>passwd</command> in
+    <filename class="directory">/tools/bin</filename>:</para>
+  <variablelist os="g">
+    <varlistentry>
+      <term><parameter>--sysconfdir=/etc</parameter></term>
+      <listitem><para>Tells Shadow to install its configuration files into
+      <filename class="directory">/etc</filename>, rather than
+      <filename class="directory">/tools/etc</filename>.</para></listitem>
+    </varlistentry>
+  </variablelist>
+<screen os="g"><userinput>cp config.h{,.orig}
+sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&amp;@' config.h.orig &gt; config.h</userinput></screen>
+    <para os="h">Prevent Shadow from setting installed programs suid:</para>
+    <para os="h">Compile the package:</para>
+<screen os="i"><userinput>cp -v src/Makefile{,.orig}
+sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.orig &gt; src/Makefile</userinput></screen>
 <screen os="i"><userinput>make</userinput></screen>
+    <para os="j">Compile the package:</para>
     <para os="j">This package does not come with a test suite.</para>
+<screen os="k"><userinput>make</userinput></screen>
     <para os="k">Install the package:</para>
+    <para os="l">Install the package:</para>
 <screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="m"><userinput>make install</userinput></screen>
   </sect2>

BOOK/boot/common/sysvinit.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-boot-sysvinit">
     <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
   </indexterm>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/common/sysvinit.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+  <sect2 role="package">
+    <title/>
+    <para>The Sysvinit package contains programs for controlling the startup,
+    running, and shutdown of the system.</para>
+  </sect2>
   <sect2 role="installation">
     <title>Installation of Sysvinit</title>
+    <para os="aa">The following modifications help locate files specific to this
+    particular build:</para>
+<screen os="ab"><userinput>cp -v src/Makefile{,.orig}
+sed -e 's,/usr/lib,/tools/lib,g' \
+    src/Makefile.orig > src/Makefile</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+    <para os="p1">Apply a patch to prevent installation of unneeded programs,
+    and allow Sysvinit to be installed in
+    <filename class="directory">/tools</filename>:</para>
+<screen os="p2"><userinput>patch -Np1 -i ../sysvinit-&sysvinit-version;-tools_updates-1.patch</userinput></screen>
+    <para os ="c">Compile the package:</para>
 <screen os="ac"><userinput>make -C src clobber
 make -C src CC="${CC}"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+<screen os="ad"><userinput>make -C src ROOT=${CLFS} install</userinput></screen>
+   <para os="e">Install the package:</para>
+<screen os="ad"><userinput>make -C src ROOT=/tools install</userinput></screen>
   </sect2>
 …
     </indexterm>
     <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by running the
+    <para>Create a new file <filename>/tools/etc/inittab</filename> by running the
     following:</para>
 <screen><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
 <literal># Begin /etc/inittab
+<screen><userinput>cat &gt; /tools/etc/inittab &lt;&lt; "EOF"
+<literal># Begin /tools/etc/inittab
 id:3:initdefault:
 si::sysinit:/etc/rc.d/init.d/rc sysinit
 l0:0:wait:/etc/rc.d/init.d/rc 0
 l1:S1:wait:/etc/rc.d/init.d/rc 1
 l2:2:wait:/etc/rc.d/init.d/rc 2
 l3:3:wait:/etc/rc.d/init.d/rc 3
 l4:4:wait:/etc/rc.d/init.d/rc 4
 l5:5:wait:/etc/rc.d/init.d/rc 5
 l6:6:wait:/etc/rc.d/init.d/rc 6
 ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
 su:S016:once:/sbin/sulogin
+si::sysinit:/tools/etc/rc.d/init.d/rc sysinit
+l0:0:wait:/tools/etc/rc.d/init.d/rc 0
+l1:S1:wait:/tools/etc/rc.d/init.d/rc 1
+l2:2:wait:/tools/etc/rc.d/init.d/rc 2
+l3:3:wait:/tools/etc/rc.d/init.d/rc 3
+l4:4:wait:/tools/etc/rc.d/init.d/rc 4
+l5:5:wait:/tools/etc/rc.d/init.d/rc 5
+l6:6:wait:/tools/etc/rc.d/init.d/rc 6
+ca:12345:ctrlaltdel:/tools/sbin/shutdown -t1 -a -r now
+su:S016:once:/tools/sbin/sulogin
 </literal>
 EOF</userinput></screen>
     <para>The following command adds the standard virtual terminals to
     <filename>${CLFS}/etc/inittab</filename>. If your system only has a serial
+    <filename>/tools/etc/inittab</filename>. If your system only has a serial
     console skip the following command:</para>
 <screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
 <literal>1:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty1 9600
 :2345:respawn:/sbin/agetty --noclear -I '\033(K' tty2 9600
 :2345:respawn:/sbin/agetty --noclear -I '\033(K' tty3 9600
 :2345:respawn:/sbin/agetty --noclear -I '\033(K' tty4 9600
 :2345:respawn:/sbin/agetty --noclear -I '\033(K' tty5 9600
 :2345:respawn:/sbin/agetty --noclear -I '\033(K' tty6 9600
+<screen><userinput>cat &gt;&gt; /tools/etc/inittab &lt;&lt; "EOF"
+<literal>1:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty1 9600
+:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty2 9600
+:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty3 9600
+:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty4 9600
+:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty5 9600
+:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty6 9600
 </literal>
 EOF</userinput></screen>
     <para>If your system has a serial console, run the following command to add
     the entry to <filename>${CLFS}/etc/inittab</filename>.</para>
 <screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
 <literal>c0:12345:respawn:/sbin/agetty --noclear 115200 ttyS0 vt100
+    the entry to <filename>/tools/etc/inittab</filename>.</para>
+<screen><userinput>cat &gt;&gt; /tools/etc/inittab &lt;&lt; "EOF"
+<literal>c0:12345:respawn:/tools/sbin/agetty --noclear 115200 ttyS0 vt100
 </literal>
 EOF</userinput></screen>
+   <para>Finally, add the end line to <filename>${CLFS}/etc/inittab</filename>.</para>
+<screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
+<literal># End /etc/inittab</literal>
+EOF</userinput></screen>
+  </sect2>
+  <sect2 role="content">
+    <title/>
+    <para>Details on this package are located in <xref
+    linkend="contents-sysvinit" role="."/></para>
+   <para>Finally, add the end line to <filename>/tools/etc/inittab</filename>.</para>
+<screen><userinput>cat &gt;&gt; /tools/etc/inittab &lt;&lt; "EOF"
+<literal># End /tools/etc/inittab</literal>
+EOF</userinput></screen>
+    <para>The <parameter>-I '\033(K'</parameter> option tells
+    <command>agetty</command> to send this escape sequence to the terminal
+    before doing anything else. This escape sequence switches the console
+    character set to a user-defined one, which can be modified by running
+    the <command>setfont</command> program. The <command>console</command>
+    initscript from the CLFS-Bootscripts package calls the
+    <command>setfont</command> program during system startup. Sending this
+    escape sequence is necessary for people who use non-ISO 8859-1 screen
+    fonts, but it does not affect native English speakers.</para>
+  </sect2>
+  <sect2 id="contents-sysvinit" role="content">
+    <title>Contents of Sysvinit</title>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <seglistitem>
+        <seg>bootlogd, fstab-decode, halt, init, killall5,
+        poweroff (link to halt), reboot (link to halt), runlevel,
+        shutdown, and telinit (link to init)</seg>
+      </seglistitem>
+    </segmentedlist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      <varlistentry id="bootlogd">
+        <term><command>bootlogd</command></term>
+        <listitem>
+          <para>Logs boot messages to a log file</para>
+          <indexterm zone="ch-boot-sysvinit bootlogd">
+            <primary sortas="b-bootlogd">bootlogd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="fstab-decode">
+        <term><command>fstab-decode</command></term>
+        <listitem>
+          <para>Runs a command with fstab-encoded arguments</para>
+          <indexterm zone="ch-boot-sysvinit fstab-decode">
+            <primary sortas="b-fstab-decode">fstab-decode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="halt">
+        <term><command>halt</command></term>
+        <listitem>
+          <para>Normally invokes <command>shutdown</command> with the
+          <parameter>-h</parameter> option, except when already in run-level 0,
+          then it tells the kernel to halt the system; it notes in the
+          file <filename>/var/log/wtmp</filename> that the system is being
+          brought down</para>
+          <indexterm zone="ch-boot-sysvinit halt">
+            <primary sortas="b-halt">halt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="init">
+        <term><command>init</command></term>
+        <listitem>
+          <para>The first process to be started when the kernel has initialized
+          the hardware which takes over the boot process and starts all the
+          proceses it is instructed to</para>
+          <indexterm zone="ch-boot-sysvinit init">
+            <primary sortas="b-init">init</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="killall5">
+        <term><command>killall5</command></term>
+        <listitem>
+          <para>Sends a signal to all processes, except the processes in its own
+          session so it will not kill the shell running the script that called
+          it</para>
+          <indexterm zone="ch-boot-sysvinit killall5">
+            <primary sortas="b-killall5">killall5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="poweroff">
+        <term><command>poweroff</command></term>
+        <listitem>
+          <para>Tells the kernel to halt the system and switch off the computer
+          (see <command>halt</command>)</para>
+          <indexterm zone="ch-boot-sysvinit poweroff">
+            <primary sortas="b-poweroff">poweroff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="reboot">
+        <term><command>reboot</command></term>
+        <listitem>
+          <para>Tells the kernel to reboot the system (see
+          <command>halt</command>)</para>
+          <indexterm zone="ch-boot-sysvinit reboot">
+            <primary sortas="b-reboot">reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="runlevel">
+        <term><command>runlevel</command></term>
+        <listitem>
+          <para>Reports the previous and the current run-level, as noted in
+          the last run-level record in <filename>/var/run/utmp</filename></para>
+          <indexterm zone="ch-boot-sysvinit runlevel">
+            <primary sortas="b-runlevel">runlevel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="shutdown">
+        <term><command>shutdown</command></term>
+        <listitem>
+          <para>Brings the system down in a secure way, signaling all processes
+          and notifying all logged-in users</para>
+          <indexterm zone="ch-boot-sysvinit shutdown">
+            <primary sortas="b-shutdown">shutdown</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="telinit">
+        <term><command>telinit</command></term>
+        <listitem>
+          <para>Tells <command>init</command> which run-level to change to</para>
+          <indexterm zone="ch-boot-sysvinit telinit">
+            <primary sortas="b-telinit">telinit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </sect2>

BOOK/boot/mips-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>

BOOK/boot/mips/bootloaders.xml

r88ef769	r03e6a40
18	18	netbooting can be found at the link below.</para>
19	19
20		<para><ulink url="~~http://documents.jg555.com/n~~etboot"/></para>
	20	<para><ulink url="&hints-root;Category:Netboot"/></para>
21	21
22	22	</sect1>

BOOK/boot/mips/kernel.xml

-              r88ef769
+              r03e6a40
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='v'])"/>
 <screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
 gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/vmlinux-&linux-version;
+gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/mips64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>

BOOK/boot/mips64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>

BOOK/boot/mips64/createfiles.xml

-              r88ef769
+              r03e6a40
   xpointer="xpointer(//*[@os='a'])"/>
 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
 ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
 ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
+ln -sv /tools/lib32/libstd*so* ${CLFS}/usr/lib32
+ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
+ln -sv /tools/lib32/libstdc++.so{.6,} ${CLFS}/usr/lib32
+ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
 ln -sv bash ${CLFS}/bin/sh
+ln -sv ../run ${CLFS}/var/run</userinput></screen>
+ln -sv ../run ${CLFS}/var/run
+ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
+ln -sv /tools/sbin/init ${CLFS}/sbin
+ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 </sect1>

BOOK/boot/mips64/creatingdirs.xml

-              r88ef769
+              r03e6a40
 mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
 install -dv ${CLFS}/usr/lib/locale
 ln -sv ../lib/locale ${CLFS}/usr/lib32

BOOK/boot/mips64/kernel.xml

-              r88ef769
+              r03e6a40
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='v'])"/>
 <screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
 gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/vmlinux-&linux-version;
+gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/multilib/createfiles.xml

-              r88ef769
+              r03e6a40
   xpointer="xpointer(//*[@os='a'])"/>
 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
 ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
+ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
+ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
 ln -sv bash ${CLFS}/bin/sh
+ln -sv ../run ${CLFS}/var/run</userinput></screen>
+ln -sv ../run ${CLFS}/var/run
+ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
+ln -sv /tools/sbin/init ${CLFS}/sbin
+ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 </sect1>

BOOK/boot/multilib/creatingdirs.xml

-              r88ef769
+              r03e6a40
   xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
 mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
 …
 mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
 install -dv ${CLFS}/usr/lib/locale
 ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
   xpointer="xpointer(//*[@os='e'])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 </sect1>

BOOK/boot/multilib/e2fsprogs.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='l'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
   </sect2>

BOOK/boot/multilib/eudev.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-boot-eudev">
     <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>boot</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eudev.xml"
+  href="../common/eudev.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 <screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
+    ./configure --prefix=/usr --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --with-rootprefix='' --enable-split-usr \
+    --sysconfdir=/etc --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin \
+    --libdir=/usr/lib64 --with-rootlibdir=/lib64 --disable-introspection \
+    --disable-gtk-doc-html --disable-gudev --disable-keymap \
+    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+    KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+    CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
+    --disable-introspection --disable-gtk-doc-html --disable-gudev \
+    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='r1'])"/>
 …
   </sect2>
+  <sect2 role="content">
+    <title/>
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
+  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
 </sect1>

BOOK/boot/multilib/grub-build.xml

-              r88ef769
+              r03e6a40
 <screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
+    --libdir=/tools/lib64 --disable-werror \
+    --enable-grub-mkfont=no</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='f'])"/>
+<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
   </sect2>

BOOK/boot/multilib/kmod.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/kmod.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 …
 zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
 CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+    --bindir=/bin --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 --with-xz --with-zlib --disable-manpages</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='g'])"/>
+<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 href="../../final-system/common/kmod.xml"
 xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="j"><userinput>ln -sv kmod ${CLFS}/bin/lsmod
+ln -sv ../bin/kmod ${CLFS}/sbin/depmod
+ln -sv ../bin/kmod ${CLFS}/sbin/insmod
+ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
+ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
+ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
   </sect2>

BOOK/boot/multilib/sysvinit.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-boot-sysvinit">
     <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/sysvinit.xml"
+  href="../common/sysvinit.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sysvinit.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sysvinit.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
   xpointer="xpointer(//*[@role='configuration'])"/>
+  <sect2 role="content">
+    <title/>
+    <para>Details on this package are located in <xref
+    linkend="contents-sysvinit" role="."/></para>
+  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
 </sect1>

BOOK/boot/ppc-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>

BOOK/boot/ppc/kernel.xml

-              r88ef769
+              r03e6a40
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='v'])"/>
 <screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/ppc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/powerpc-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>

BOOK/boot/ppc64-64/powerpc-utils.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/ppc/powerpc-utils.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/ppc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/util-linux-32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/powerpc-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot.xml"/>

BOOK/boot/ppc64/e2fsprogs.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='l'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
   </sect2>

BOOK/boot/ppc64/kernel.xml

-              r88ef769
+              r03e6a40
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='v'])"/>
 <screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/sparc-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>

BOOK/boot/sparc/kernel.xml

-              r88ef769
+              r03e6a40
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='v'])"/>
 <screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/sparc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>

BOOK/boot/sparc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>

BOOK/boot/sparc64/kernel.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='s'])"/>
 <screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=${CLFS} \
+<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=/tools \
    CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
 …
 <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='v'])"/>
 <screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/x86-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>

BOOK/boot/x86/grub-build.xml

-              r88ef769
+              r03e6a40
 <screen os="ab"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --sysconfdir=/etc --disable-werror</userinput></screen>
+    --disable-werror --enable-grub-mkfont=no</userinput></screen>
+<para os="b">The meaning of the new configure option:</para>
+  <variablelist os="bc">
+    <varlistentry>
+      <term><parameter>--enable-grub-mkfont=no</parameter></term>
+      <listitem><para>Prevents GRUB from trying to build
+      <command>grub-mkfont</command>, which requires Freetype.</para></listitem>
+    </varlistentry>
+  </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='f'])"/>
 <screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="ag"><userinput>make install</userinput></screen>
   </sect2>

BOOK/boot/x86/kernel.xml

-              r88ef769
+              r03e6a40
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
     INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+    INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <para os="u">After kernel compilation is complete, additional steps are
     required to complete the installation. Some files need to be copied to
     the <filename class="directory">${CLFS}/boot</filename> directory.</para>
+    the <filename class="directory">/tools/boot</filename> directory.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <para os="v">Issue the following commands to install the kernel:</para>
 <screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='w'])"/>
 <screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='x'])"/>
 <screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version;</userinput></screen>
   </sect2>

BOOK/boot/x86_64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>

BOOK/boot/x86_64-64/kmod.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/kmod.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 …
 <screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib -llzma" \
 zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
+CC="${CC} ${BUILD64}" ./configure --prefix=/tools --bindir=/bin \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib \
+    --disable-manpages</userinput></screen>
+CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='g'])"/>
+<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 href="../../final-system/common/kmod.xml"
 xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="j"><userinput>ln -sv kmod ${CLFS}/bin/lsmod
+ln -sv ../bin/kmod ${CLFS}/sbin/depmod
+ln -sv ../bin/kmod ${CLFS}/sbin/insmod
+ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
+ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
+ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
   </sect2>

BOOK/boot/x86_64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>

BOOK/boot/x86_64/kernel.xml

-              r88ef769
+              r03e6a40
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='v'])"/>
+<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
+<screen><userinput>mkdir -pv /tools/boot
+cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/bootable/alpha/kernel.xml

-              r88ef769
+              r03e6a40
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kc'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/bootable/common/fstab.xml

-              r88ef769
+              r03e6a40
 /dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
 /dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
-proc           /proc        proc   defaults         0     0
-sysfs          /sys         sysfs  defaults         0     0
-devpts         /dev/pts     devpts gid=&gid-tty;,mode=620   0     0
-shm            /dev/shm     tmpfs  defaults         0     0
-tmpfs          /run         tmpfs  defaults         0     0
-devtmpfs       /dev         devtmpfs mode=0755,nosuid 0     0
 # End /etc/fstab</literal>

BOOK/bootable/mips/kernel.xml

-              r88ef769
+              r03e6a40
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kc'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/bootable/ppc/kernel.xml

-              r88ef769
+              r03e6a40
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kc'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/bootable/ppc64/kernel.xml

-              r88ef769
+              r03e6a40
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kc'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/bootable/sparc/kernel.xml

-              r88ef769
+              r03e6a40
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kc'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/bootable/x86/grub.xml

r88ef769	r03e6a40
39	39	</warning>
40	40
41		<para os="e">Instruct GRUB to install itself int othe MBR of
	41	<para os="e">Instruct GRUB to install itself into the MBR of
42	42	<filename class="partition">sda</filename>:</para>
43	43

BOOK/bootable/x86/kernel.xml

-              r88ef769
+              r03e6a40
     un-tarring.</para>
+    <note os="kc"><para>A good starting place for setting up the kernel
+    configuration is to run <command>make defconfig</command>. This will set the    base configuration to a good state that takes your current system
+    architecture into account.</para>
+    <para>Be sure to enable or disable following features or the system might
+    not work correctly or boot at all. Refer to
+    <filename>/usr/share/doc/systemd-&systemd-version;/README</filename>:</para>
+    <screen role="nodump">General setup  ---&gt;
+  [*] open by fhandle syscalls
+  [ ] Auditing support
+  [*] Control Group support
+Processor type and features  ---&gt;
+  [*] Enable seccomp to safely compute untrusted bytecode
+Networking support  ---&gt;
+  Networking options  ---&gt;
+    &lt;*&gt; The IPv6 protocol
+Device Drivers  ---&gt;
+  Generic Driver Options  ---&gt;
+    ()  path to uevent helper
+    [*] Maintain a devtmpfs filesystem to mount at /dev
+    [ ] Fallback user-helper invocation for firmware loading
+File systems  ---&gt;
+  [*] Inotify support for userspace
+  &lt;*&gt; Kernel automounter version 4 support (also supports v3)
+  Pseudo filesystems  ---&gt;
+    [*] Tmpfs POSIX Access Control Lists
+    [*] Tmpfs extended attributes
+Firmware Drivers ---&gt;
+  EFI (Extensible Firmware Interface) Support ---&gt;
+    &lt;*&gt; EFI Variable Support via sysfs
+-*- Enable the block layer ---&gt;
+  Partition Types ---&gt;
+    [*] Advanced partition selection
+    [*]   EFI GUID Partition support
+Kernel Hacking ---&gt;
+  [*] Collect scheduler debugging info
+  [*] Collect scheduler statistics</screen></note>
+    <note os="kd"><para>While "The IPv6 Protocol" is not strictly required, it
+    is highly recommended by the Systemd developers. "EFI Variable support" and
+    "EFI GUID Partition support" are for UEFI systems. "Collect scheduler
+    debugging info" and "Collect scheduler statistics" is for systemd-bootchart.
+    </para></note>
     <para os="h">Configure the kernel via a menu-driven interface.
+    Please note that the udev bootscript requires "rtc", "tmpfs" and "devtmpfs" to be
+    enabled and built into the kernel, not as modules. CBLFS has
+    some information regarding particular kernel configuration requirements of
+    packages outside of CLFS at <ulink
+    CBLFS has some information regarding particular kernel configuration
+    requirements of packages outside of CLFS at <ulink
     url="&cblfs-root;"/>:</para>

BOOK/bootable/x86_64/kernel.xml

-              r88ef769
+              r03e6a40
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kc'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='kd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/bootscripts/alpha-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/common/console.xml

-              r88ef769
+              r03e6a40
   <secondary>configuring</secondary></indexterm>
+  <para>This section discusses how to configure the <command>i18n</command>
+  bootscript that sets up the keyboard map and the console font. If non-ASCII
+  characters (e.g., the British pound sign and Euro character) will not be
+  used and the keyboard is a U.S. one, skip this section. Without the
+  configuration file, the <command>console</command> bootscript will do
+  nothing.</para>
+  <para>This section discusses how to configure the
+  <command>systemd-vconsole-setup</command> system service which configures
+  the virtual console font and console keymap.
+  The <command>systemd-vconsole-setup</command> service reads <filename>
+  /etc/vconsole.conf</filename> for configuration information. Decide which
+  keymap and screen font will be used. Various language-specific HOWTO's can
+  help. with this (see
+  <ulink url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. Examine
+  <command>localectl list-keymaps</command> output for a list of valid console
+  keymaps. Look in
+  <filename class="directory">/usr/share/consolefonts</filename> for valid
+  screen fonts.</para>
+  <para>The <command>i18n</command> script reads the
+  <filename>/etc/sysconfig/i18n</filename> file for configuration
+  information. Decide which keymap and screen font will be used. Various
+  language-specific HOWTO's can also help with this (see <ulink
+  url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. A pre-made
+  <filename>/etc/sysconfig/i18n</filename> file with known settings for
+  several countries was installed with the CLFS-Bootscripts package, so the
+  relevant section can be uncommented if the country is supported. If still
+  in doubt, look in the <filename class="directory">/usr/share/consolefonts</filename>
+  for valid screen fonts and <filename class="directory">/usr/share/keymaps</filename>
+  for valid keymaps.</para>
+  <para>The <filename>/etc/vconsole.conf</filename> file should contain lines
+  of the form: VARIABLE="value". The following variables are recognized:</para>
+  <para>The default <filename>/etc/sysconfig/i18n</filename> is set up for UTF-8
+  using the us keymap. You will need to edit the file to your specific needs.
+  The <filename>/etc/sysconfig/i18n</filename> file has additional information
+  in it to help you to assist in configuring.</para>
+  <variablelist>
+    <varlistentry>
+      <term>KEYMAP</term>
+      <listitem>
+        <para>This variable specifies the key mapping table for the keyboard. If
+        unset, it defaults to <literal>us</literal>.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>KEYMAP_TOGGLE</term>
+      <listitem>
+        <para>This variable can be used to configure a second toggle keymap and
+        is unset by default.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>FONT</term>
+      <listitem>
+        <para>This variable specifies the font used by the virtual
+        console.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>FONT_MAP</term>
+      <listitem>
+        <para>This variable specifies the console map to be used.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>FONT_UNIMAP</term>
+      <listitem>
+        <para>This variable specifies the unicode font map.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <para>An example for a German keyboard and console is given below:</para>
+<screen role="nodump"><userinput>cat &gt; /etc/vconsole.conf &lt;&lt; "EOF"
+<literal>KEYMAP=de-latin1
+FONT=Lat2-Terminus16</literal>
+EOF</userinput></screen>
+  <para>You can change KEYMAP value at runtime by using the
+  <command>localectl</command> utility:</para>
+<screen role="nodump"><userinput>localectl set-keymap MAP</userinput></screen>
+  <note><para>Please note that <command>localectl</command> command can
+  be used  only on a system booted with Systemd.</para></note>
+  <para>You can also use <command>localectl</command> utility with the
+  corresponding parameters to change X11 keyboard layout, model, variant
+  and options:</para>
+<screen role="nodump"><userinput>localectl set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]</userinput></screen>
+  <para>To list possible values for <command>localectl set-x11-keymap</command>
+  parameters, run <command>localectl</command> with parameters listed below:
+  </para>
+  <variablelist>
+    <varlistentry>
+      <term>list-x11-keymap-models</term>
+      <listitem>
+        <para>Show known X11 keyboard mapping models.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>list-x11-keymap-layouts</term>
+      <listitem>
+        <para>Show known X11 keyboard mapping layouts.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>list-x11-keymap-variants</term>
+      <listitem>
+        <para>Show known X11 keyboard mapping variants.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>list-x11-keymap-options</term>
+      <listitem>
+        <para>Show known X11 keyboard mapping options.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <note><para>Using any of the parameters listed above requires
+  <ulink url="http://cblfs.cross-lfs.org/index.php/Xorg7/Data">
+  XKeyboard Client</ulink> package from CBLFS.</para></note>
 </sect1>

BOOK/bootscripts/common/introduction.xml

-              r88ef769
+              r03e6a40
   <title>Introduction</title>
+  <para>This chapter details how to install and configure the CLFS-Bootscripts
+  package. Most of these scripts will work without modification, but a few
+  require additional configuration files because they deal with
+  hardware-dependent information.</para>
+  <para>System-V style init scripts are employed in this book because they
+  are widely used. For additional options, a hint detailing the BSD style
+  init setup is available at <ulink
+  url="&hints-root;BSD-Init"/>.
+  Searching the LFS mailing lists for <quote>depinit</quote> will also offer
+  additional choices.</para>
+  <para>If using an alternative style of init scripts, skip this chapter and
+  move on to <xref linkend="chapter-bootable"/>.</para>
+  <para>This chapter details how to finish configuring the base system.
+  Including some final configuration for Systemd and as well as locales and a
+  simple bash profile that should be suitable for most users.</para>
 </sect1>

BOOK/bootscripts/common/locale.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-scripts-locale">
     <primary sortas="e-/etc/profile">/etc/profile</primary>
+    <primary sortas="e-/etc/locale.conf">/etc/locale.conf</primary>
   </indexterm>
   <para>The base <filename>/etc/profile</filename> below sets some
   environment variables necessary for native language support. Setting
   them properly results in:</para>
+  <para>The <filename>/etc/locale.conf</filename> below sets some environment
+  variables necessary for native language support. Setting them properly
+  results in:</para>
   <itemizedlist>
 …
     </listitem>
     <listitem>
+      <para>Correct classification of characters into letters, digits and
+      other classes. This is necessary for <command>bash</command> to
+      properly accept non-ASCII characters in command lines in non-English
+      locales</para>
+      <para>Correct classification of characters into letters, digits and other
+      classes. This is necessary for <command>bash</command> to properly accept
+      non-ASCII characters in command lines in non-English locales</para>
     </listitem>
     <listitem>
 …
   </itemizedlist>
-  <para>This script also sets the <envar>INPUTRC</envar> environment variable
-  that makes Bash and Readline use the <filename>/etc/inputrc</filename> file
-  created earlier.</para>
   <para>Replace <replaceable>[ll]</replaceable> below with the
   two-letter code for the desired language (e.g., <quote>en</quote>) and
   <replaceable>[CC]</replaceable> with the two-letter code for the
   appropriate country (e.g., <quote>GB</quote>).
+  appropriate country (e.g., <quote>GB</quote> or <quote>US</quote>).
   <replaceable>[charmap]</replaceable> should be replaced with the
+  canonical charmap for your chosen locale.</para>
+  canonical charmap for your chosen locale. Optional modifiers such as
+  <quote>@euro</quote> may also be present.</para>
   <para>The list of all locales supported by Glibc can be obtained by running
 …
   <para>This results in a final locale setting of <quote>en_US.UTF-8</quote>.
   It is important that the locale found using the heuristic above is tested prior
   to it being added to the Bash startup files:</para>
+  It is important that the locale found using the heuristic above is tested
+  prior to it being added to <filename>/etc/locale.conf</filename>:</para>
 <screen role="nodump"><userinput>LC_ALL=[locale name] locale territory
 …
   <para>Other packages can also function incorrectly (but may not necessarily
   display any error messages) if the locale name does not meet their expectations.
   In those cases, investigating how other Linux distributions support your locale
   might provide some useful information.</para>
+  display any error messages) if the locale name does not meet their
+  expectations. In those cases, investigating how other Linux distributions
+  support your locale might provide some useful information.</para>
   <para>Once the proper locale settings have been determined, create the
   <filename>/etc/profile</filename> file:</para>
+  <filename>/etc/locale.conf</filename> file:</para>
 <screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
 <literal># Begin /etc/profile
+<screen><userinput>cat &gt; /etc/locale.conf &lt;&lt; "EOF"
+<literal># Begin /etc/locale.conf
+export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
+export INPUTRC=/etc/inputrc
+LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable><replaceable>[@modifiers]</replaceable>
 # End /etc/profile</literal>
+# End /etc/locale.conf</literal>
 EOF</userinput></screen>
+  <para>Note that you can modify <filename>/etc/locale.conf</filename> with
+  Systemd <command>localectl</command> utility. To use
+  <command>localectl</command> for the example above, run:</para>
+<screen role="nodump"><userinput>localectl set-locale LANG="<replaceable>[ll]_[CC][charmap][@modifiers]</replaceable>"</userinput></screen>
+  <para>You can also specify other language specific environment variables such
+  as <envar>LANG</envar>, <envar>LC_CTYPE</envar>, <envar>LC_NUMERIC</envar> or
+  any other environment variable from <command>locale</command> output. Just
+  separate them with a space. An example where <envar>LANG</envar> is set as
+  en_US.UTF-8 but <envar>LC_CTYPE</envar> is set as just en_US is:</para>
+<screen role="nodump"><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
+  <note><para>Please note that <command>localectl</command> command can
+  be used  only on a system booted with Systemd.</para></note>
   <para>Setting the keyboard layout, screen font, and locale-related
   environment variables are the only internationalization steps needed to

BOOK/bootscripts/common/profile.xml

-              r88ef769
+              r03e6a40
   <para>The files <filename>/etc/profile</filename> and
   <filename>~/.bash_profile</filename> are read when the shell is
+  invoked as an interactive login shell. In the next section, a base
+  <filename>/etc/profile</filename> will be created to set up locale
+  information.</para>
+  invoked as an interactive login shell. Create a base
+  <filename>/etc/profile</filename> that will setup locale information and load
+  any bash auto completion files that may be on the system. This script also
+  sets the <envar>INPUTRC</envar> environment variable that makes Bash and
+  Readline use <filename>/etc/inputrc</filename>.</para>
+<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
+<literal># Begin /etc/profile
+source /etc/locale.conf
+for f in /etc/bash_completion.d/*.sh; do source $f; done; unset f
+export INPUTRC=/etc/inputrc
+# End /etc/profile</literal>
+EOF</userinput></screen>
 </sect1>

BOOK/bootscripts/common/symlinks.xml

-              r88ef769
+              r03e6a40
     <note>
       <para>Although the examples in this book work properly, be aware
       that Eudev does not recognize the backslash for line continuation.
       If modifying Eudev rules with an editor, be sure to leave each rule
+      that Udev does not recognize the backslash for line continuation.
+      If modifying Udev rules with an editor, be sure to leave each rule
       on one physical line.</para>
     </note>
 …
     <title>Dealing with duplicate devices</title>
     <para>As explained in <xref linkend="ch-scripts-eudev"/>, the order in
+    <para>As explained in <xref linkend="ch-scripts-udev"/>, the order in
     which devices with the same function appear in
     <filename class="directory">/dev</filename> is essentially random.
 …
     device.</para>
     <para>More information on writing Eudev rules can be found in
     <filename>/usr/share/doc/udev/writing_udev_rules/index.html</filename>.</para>
+    <para>More information on writing Udev rules can be found in
+    <filename>/usr/share/doc/systemd-208/udev.html</filename>.</para>
  </sect2>

BOOK/bootscripts/common/udev.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-scripts-eudev">
   <?dbhtml filename="eudev.html"?>
+<sect1 id="ch-scripts-udev">
+  <?dbhtml filename="udev.html"?>
   <title>Device and Module Handling on a CLFS System</title>
   <indexterm zone="ch-scripts-eudev">
     <primary sortas="a-Eudev">Eudev</primary>
+  <indexterm zone="ch-scripts-udev">
+    <primary sortas="a-Udev">Udev</primary>
     <secondary>usage</secondary>
   </indexterm>
   <para>In <xref linkend="chapter-building-system"/>, we installed the Eudev
   package. Before we go into the details regarding how this works,
   a brief history of previous methods of handling devices is in
+  <para>In <xref linkend="chapter-building-system"/>, we installed the Udev
+  package during Systemd install. Before we go into the details regarding how
+  this works, a brief history of previous methods of handling devices is in
   order.</para>
 …
   the world.</para>
   <para>Using the Eudev method, only those devices which are detected by the
+  <para>Using the Udev method, only those devices which are detected by the
   kernel get device nodes created for them. Because these device nodes will be
   created each time the system boots, they will be stored on a <systemitem
 …
   <sect2>
     <title>Eudev Implementation</title>
+    <title>Udev Implementation</title>
     <sect3>
 …
     <sect3>
       <title>Eudev Bootscript</title>
+      <title>Udev Bootscript</title>
       <para>The <command>S10udev</command> initscript takes care of creating
 …
       class="directory">/lib/udev/devices</filename> also provides an easy
       workaround for devices that are not supported by the dynamic device
       handling infrastructure. The bootscript then starts the Eudev daemon,
+      handling infrastructure. The bootscript then starts the Udev daemon,
       <command>udevd</command>, which will act on any uevents it receives.
       Finally, the bootscript forces the kernel to replay uevents for any
 …
       <title>Device Node Creation</title>
       <para>To obtain the right major and minor number for a device, Eudev relies
+      <para>To obtain the right major and minor number for a device, Udev relies
       on the information provided by <systemitem
       class="filesystem">sysfs</systemitem> in <filename
 …
       <command>udevd</command> can't find a rule for the device it is creating,
       it will default permissions to <emphasis>660</emphasis> and ownership to
       <emphasis>root:root</emphasis>. Documentation on the syntax of the Eudev
+      <emphasis>root:root</emphasis>. Documentation on the syntax of the Udev
       rules configuration files is available in
       <filename>/usr/share/doc/udev/writing_udev_rules/index.html</filename></para>
 …
       might contain the string
       <quote>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</quote>.
       The default rules provided by Eudev will cause <command>udevd</command>
+      The default rules provided by Udev will cause <command>udevd</command>
       to call out to <command>/sbin/modprobe</command> with the contents of the
       <envar>MODALIAS</envar> uevent environment variable (that should be the
 …
       <title>A kernel module is not loaded automatically</title>
       <para>Eudev will only load a module if it has a bus-specific alias and the
+      <para>Udev will only load a module if it has a bus-specific alias and the
       bus driver properly exports the necessary aliases to <systemitem
       class="filesystem">sysfs</systemitem>. In other cases, one should
       arrange module loading by other means. With Linux-&linux-version;, Eudev is
+      arrange module loading by other means. With Linux-&linux-version;, Udev is
       known to load properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
       SERIO and FireWire devices.</para>
       <para>To determine if the device driver you require has the necessary
       support for Eudev, run <command>modinfo</command> with the module name as
+      support for Udev, run <command>modinfo</command> with the module name as
       the argument.  Now try locating the device directory under
       <filename class="directory">/sys/bus</filename> and check whether there is
 …
       class="filesystem">sysfs</systemitem>, the driver supports the device and
       can talk to it directly, but doesn't have the alias, it is a bug in the
       driver. Load the driver without the help from Eudev and expect the issue
+      driver. Load the driver without the help from Udev and expect the issue
       to be fixed later.</para>
 …
       busses. Expect this issue to be fixed in later kernel versions.</para>
       <para>Eudev is not intended to load <quote>wrapper</quote> drivers such as
+      <para>Udev is not intended to load <quote>wrapper</quote> drivers such as
       <emphasis>snd-pcm-oss</emphasis> and non-hardware drivers such as
       <emphasis>loop</emphasis> at all.</para>
 …
     <sect3>
       <title>A kernel module is not loaded automatically, and Eudev is not
+      <title>A kernel module is not loaded automatically, and Udev is not
       intended to load it</title>
 …
       enhances the functionality of <emphasis>snd-pcm</emphasis> by making the
       sound cards available to OSS applications), configure
       <command>modprobe</command> to load the wrapper after Eudev loads the
+      <command>modprobe</command> to load the wrapper after Udev loads the
       wrapped module. To do this, add an <quote>install</quote> line in
       <filename>/etc/modprobe.conf</filename>. For example:</para>
 …
     <sect3>
       <title>Eudev loads some unwanted module</title>
+      <title>Udev loads some unwanted module</title>
       <para>Either don't build the module, or blacklist it in
 …
     <sect3>
       <title>Eudev creates a device incorrectly, or makes a wrong symlink</title>
+      <title>Udev creates a device incorrectly, or makes a wrong symlink</title>
       <para>This usually happens if a rule unexpectedly matches a device. For
 …
     <sect3>
       <title>Eudev rule works unreliably</title>
+      <title>Udev rule works unreliably</title>
       <para>This may be another manifestation of the previous problem. If not,
 …
     <sect3>
       <title>Eudev does not create a device</title>
+      <title>Udev does not create a device</title>
       <para>Further text assumes that the driver is built statically into the
       kernel or already loaded as a module, and that you have already checked
       that Eudev doesn't create a misnamed device.</para>
       <para>Eudev has no information needed to create a device node if a kernel
+      that Udev doesn't create a misnamed device.</para>
+      <para>Udev has no information needed to create a device node if a kernel
       driver does not export its data to <systemitem
       class="filesystem">sysfs</systemitem>.
 …
       <title>Device naming order changes randomly after rebooting</title>
       <para>This is due to the fact that Eudev, by design, handles uevents and
+      <para>This is due to the fact that Udev, by design, handles uevents and
       loads modules in parallel, and thus in an unpredictable order. This will
       never be <quote>fixed</quote>. You should not rely upon the kernel device
       names being stable. Instead, create your own rules that make symlinks with
       stable names based on some stable attributes of the device, such as a
       serial number or the output of various *_id utilities installed by Eudev.
+      serial number or the output of various *_id utilities installed by Udev.
       See <xref linkend="ch-scripts-symlinks"/> and
       <xref linkend="chapter-network"/> for examples.</para>

BOOK/bootscripts/common/usage.xml

-              r88ef769
+              r03e6a40
   <?dbhtml filename="usage.html"?>
   <title>How Do These Bootscripts Work?</title>
+  <title>How does Systemd work?</title>
   <indexterm zone="ch-scripts-usage">
     <primary sortas="a-Bootscripts">Bootscripts</primary>
+    <primary sortas="a-systemd-usage">Systemd usage</primary>
   <secondary>usage</secondary></indexterm>
+  <para>Linux uses a special booting facility named SysVinit that is
+  based on a concept of <emphasis>run-levels</emphasis>. It can be quite
+  different from one system to another, so it cannot be assumed that
+  because things worked in one particular Linux distribution, they should work
+  the same in CLFS too. CLFS has its own way of doing things, but it
+  respects generally accepted standards.</para>
+  <warning>
+    <para>Please disregard this page until it is complete and verified.</para>
+  </warning>
+  <para>SysVinit (which will be referred to as <quote>init</quote> from
+  now on) works using a run-levels scheme. There are seven (numbered 0 to 6)
+  run-levels (actually, there are more run-levels, but they are for
+  special cases and are generally not used. See <filename>init(8)</filename>
+  for more details), and each one of those corresponds to the actions the
+  computer is supposed to perform when it starts up. The default
+  run-level is 3. Here are the descriptions of the different run-levels
+  as they are implemented:</para>
+  <sect2>
+    <title>Introduction to Systemd</title>
+<literallayout>0: halt the computer
+: single-user mode
+: multi-user mode without networking
+: multi-user mode with networking
+: reserved for customization, otherwise does the same as 3
+: same as 4, it is usually used for GUI login (like X's <command>xdm</command> or KDE's <command>kdm</command>)
+: reboot the computer</literallayout>
+    <para>Systemd is a system management daemon designed exclusively for the
+    Linux kernel API. In the Linux startup process, it is the first process to
+    execute in user land; therefore, it is also the parent process of all child
+    processes in user land.</para>
   <para>The command used to change run-levels is <command>init
   <replaceable>[runlevel]</replaceable></command>, where
   <replaceable>[runlevel]</replaceable> is the target run-level. For example,
   to reboot the computer, a user could issue the <command>init 6</command>
   command, which is an alias for the <command>reboot</command> command.
   Likewise, <command>init 0</command> is an alias for the
   <command>halt</command> command.</para>
+    <para>Systemd's initialization instructions for each daemon are recorded in
+    a declarative configuration file rather than a shell script. For
+    inter-process communication, systemd makes Unix domain sockets and D-Bus
+    available to the running daemons. Because systemd tracks processes using
+    Linux cgroups instead of process identifiers (PIDs), daemons cannot "escape"
+    systemd; not even by double-forking. Systemd is also capable of aggressive
+    parallelization.</para>
+  <para>There are a number of directories under <filename
+  class="directory">/etc/rc.d</filename> that look like <filename
+  class="directory">rc?.d</filename> (where ? is the number of the
+  run-level) and <filename class="directory">rcsysinit.d</filename>, all
+  containing a number of symbolic links. Some begin with a
+  <emphasis>K</emphasis>, the others begin with an
+  <emphasis>S</emphasis>, and all of them have two numbers following the
+  initial letter. The K means to stop (kill) a service and the S means
+  to start a service. The numbers determine the order in which the
+  scripts are run, from 00 to 99&mdash;the lower the number the earlier it
+  gets executed. When <command>init</command> switches to another run-level,
+  the appropriate services are either started or stopped, depending on the
+  runlevel chosen.</para>
+    <para>Among systemd's auxiliary features are a cron-like job scheduler
+    called systemd Calendar Timers, and an event logging subsystem called
+    journal. The system administrator may choose whether to log system events
+    with systemd or syslog. Systemd's logfile is a binary file. The state of
+    systemd itself can be preserved in a snapshot for future recall.</para>
+  <para>The real scripts are in <filename
+  class="directory">/etc/rc.d/init.d</filename>. They do the actual work,
+  and the symlinks all point to them. Killing links and starting links point
+  to the same script in <filename class="directory">/etc/rc.d/init.d</filename>.
+  This is because the scripts can be called with different parameters like
+  <option>start</option>, <option>stop</option>, <option>restart</option>,
+  <option>reload</option>, and <option>status</option>. When a K link is
+  encountered, the appropriate script is run with the <option>stop</option>
+  argument. When an S link is encountered, the appropriate script is run
+  with the <option>start</option> argument.</para>
+    <para>Systemd provides a replacement for sysvinit, pm-utils, inetd, acpid,
+    syslog, watchdog, cron and atd, and obsoletes ConsoleKit.</para>
+  <para>There is one exception to this explanation. Links that start
+  with an <emphasis>S</emphasis> in the <filename
+  class="directory">rc0.d</filename> and <filename
+  class="directory">rc6.d</filename> directories will not cause anything
+  to be started. They will be called with the parameter
+  <option>stop</option> to stop something. The logic behind this
+  is that when a user is going to reboot or halt the system, nothing
+  needs to be started. The system only needs to be stopped.</para>
+  </sect2>
   <para>These are descriptions of what the arguments make the scripts
   do:</para>
+  <sect2>
+    <title>Systemctl</title>
+  <variablelist>
+    <varlistentry>
+      <term><option>start</option></term>
+      <listitem>
+        <para>The service is started.</para>
+      </listitem>
+    </varlistentry>
+    <para><command>systemctl</command> is the main command used to introspect
+     and control Systemd.</para>
+    <varlistentry>
+      <term><option>stop</option></term>
+      <listitem>
+        <para>The service is stopped.</para>
+      </listitem>
+    </varlistentry>
+    <variablelist>
     <varlistentry>
       <term><option>restart</option></term>
       <listitem>
         <para>The service is stopped and then started again.</para>
       </listitem>
     </varlistentry>
+      <varlistentry>
+        <term>List running units:</term>
+        <listitem>
+          <para><command>systemctl</command> or <command>systemctl list-units</command></para>
+        </listitem>
+      </varlistentry>
+    <varlistentry>
+      <term><option>reload</option></term>
+      <listitem>
+        <para>The configuration of the service is updated. This is used
+        after the configuration file of a service was modified, when the
+        service does not need to be restarted.</para>
+      </listitem>
+    </varlistentry>
+      <varlistentry>
+        <term>List failed units:</term>
+        <listitem>
+          <para><command>systemctl --failed</command></para>
+        </listitem>
+      </varlistentry>
+    <varlistentry>
+      <term><option>status</option></term>
+      <listitem>
+        <para>Tells if the service is running and with which PIDs.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+      <varlistentry>
+        <term>List available unit files:</term>
+        <listitem>
+          <para><command>systemctl list-unit-files</command></para>
+        </listitem>
+      </varlistentry>
+  <para>Feel free to modify the way the boot process works (after all,
+  it is your own CLFS system). The files given here are an example of how
+  it can be done.</para>
+      <varlistentry>
+        <term>Activate a unit immediately:</term>
+        <listitem>
+          <para><command>systemctl start</command> <replaceable>unit</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Stop a unit immediately:</term>
+        <listitem>
+          <para><command>systemctl stop </command><replaceable>unit</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Restart a unit:</term>
+        <listitem>
+          <para><command>systemctl restart </command><replaceable>unit</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Reload unit configuration:</term>
+        <listitem>
+          <para><command>systemctl reload </command><replaceable>unit</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Show status of a unit:</term>
+        <listitem>
+          <para><command>systemctl status </command><replaceable>unit</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Check if a unit is enabled or disabled:</term>
+        <listitem>
+          <para><command>systemctl is-enabled </command><replaceable>unit</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Enable a unit to start during boot:</term>
+        <listitem>
+          <para><command>systemctl enable </command><replaceable>unit</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Disable a unit to not start during boot:</term>
+        <listitem>
+          <para><command>systemctl disable </command><replaceable>unit</replaceable></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Reload systemd and scan for new or changed units:</term>
+        <listitem>
+          <para><command>systemctl daemon-reload</command></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>For more information regarding systemd, please refer to the systemd
+    and related man-pages and
+    <ulink url="https://fedoraproject.org/wiki/Systemd">Systemd at
+    FedoraProject</ulink> for documentation, examples, features, and other
+    information.</para>
+  </sect2>
 </sect1>

BOOK/bootscripts/mips-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/mips64-64-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/mips64-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/ppc-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/ppc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/ppc64-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/sparc-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/sparc64-64-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/sparc64-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/x86-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/x86_64-64-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/bootscripts/x86_64-chapter.xml

-              r88ef769
+              r03e6a40
 ]>
 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
   <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>

BOOK/chroot/64/createfiles.xml

-              r88ef769
+              r03e6a40
 ln -sv /tools/bin/file /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+ln -sv /tools/lib/libstd* /usr/lib
+ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
 ln -sv bash /bin/sh
 ln -sv /run /var/run</userinput></screen>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/64/createfiles.xml"
   xpointer="xpointer(//*[@os='b'])"/>
+  xpointer="xpointer(//*[@os='e'])"/>
 <screen><userinput>mkdir -pv /usr/lib64
+ln -sv /tools/lib/libstd*so* /usr/lib64</userinput></screen>
+ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../boot/common/createfiles.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/createfiles.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 </sect1>

BOOK/chroot/alpha-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/chroot/common/changingowner.xml

-              r88ef769
+              r03e6a40
   <title>Changing Ownership</title>
-    <note>
-      <para>This step is not optional as some of the binaries in
-      <filename class="directory">/tools</filename> are set u+s.
-      leaving the permissions as is could cause some commands,
-      mount in particular, to fail later.</para>
-    </note>
     <para os="a">Currently, the <filename class="directory">/tools</filename>
     and <filename class="directory">/cross-tools</filename> directories
     are owned by the user <emphasis>clfs</emphasis>, a user that
     exists only on the host system. Although the <filename
+    exists only on the host system. Although <filename
     class="directory">/tools</filename> and <filename
     class="directory">/cross-tools</filename> directories can be deleted
     once the CLFS system has been finished, they can be retained to build
+    class="directory">/cross-tools</filename> can be deleted once the CLFS
+    system has been finished, they can be retained to build
     additional CLFS systems. If the <filename class="directory">/tools</filename>
     and <filename class="directory">/cross-tools</filename> directories are
     kept as is, the files are owned by a user ID without a corresponding
     account. This is dangerous because a user account created later could
+    get this same user ID and would own the <filename
+    class="directory">/tools</filename> directory and all the files therein,
+    thus exposing these files to possible malicious manipulation.</para>
+    get this same user ID and would own these directories and all the files
+    therein, thus exposing those files to possible malicious manipulation.</para>
     <para os="b">To avoid this issue, add the <systemitem
     class="username">clfs</systemitem> user to the new CLFS system later when
     creating the <filename>/etc/passwd</filename> file, taking care to assign
     it the same user and group IDs as on the host system. Alternatively,
+    <para os="b">One possible fix for this issue might be to add the
+    <systemitem class="username">clfs</systemitem> user to the new CLFS system
+    later when creating the <filename>/etc/passwd</filename> file, taking care
+    to assign it the same user and group IDs as on the host system. Alternatively,
     assign the contents of the <filename class="directory">/tools</filename>
     and <filename class="directory">/cross-tools</filename> directories to

BOOK/chroot/common/createfiles.xml

-              r88ef769
+              r03e6a40
   <title>Creating Essential Symlinks</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/createfiles.xml"
   xpointer="xpointer(//*[@os='a'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../boot/common/createfiles.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
 ln -sv /tools/bin/file /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+ln -sv /tools/lib/libstd* /usr/lib
+ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
 ln -sv bash /bin/sh
 ln -sv /run /var/run</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../boot/common/createfiles.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+<screen os="d"><userinput>ln -sv /proc/self/mounts /etc/mtab</userinput></screen>
 </sect1>

BOOK/chroot/common/creatingdirs.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 <screen os="b"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
+<screen os="c"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
 mkdir -pv /{proc,media/{floppy,cdrom},run/shm,sbin,srv,sys}
 mkdir -pv /var/{lock,log,mail,spool}
 …
 mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
 mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
+mkdir -pv /usr/{,local/}share/man/man{1..8}
+for dir in /usr{,/local}; do
+  ln -sv share/{man,doc,info} $dir
+done</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../boot/common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+mkdir -pv /usr/{,local/}share/man/man{1..8}</userinput></screen>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
   xpointer="xpointer(//*[@os='e'])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../boot/common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 </sect1>

BOOK/chroot/common/kernfs.xml

-              r88ef769
+              r03e6a40
   <title>Mounting Virtual Kernel File Systems</title>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../boot/common/devices.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+    <note os="a">
+      <para>The commands in the remainder of the book should be run as
+      the <systemitem class="username">root</systemitem> user. Check
+      that ${CLFS} is set in the
+      <systemitem class="username">root</systemitem> user&rsquo;s environment
+       before proceeding.</para>
+    </note>
   <para>Various file systems exported by the kernel are used to communicate
 …
   <para>Once the system is complete and booting, the rest of our device
   nodes are created by the Eudev package.  Since this package is not
+  nodes are created by Udev, part of Systemd.  Since this package is not
   available to us right now, we must take other steps to provide device
   nodes under on the CLFS filesystem.  We will use the <quote>bind</quote>

BOOK/chroot/common/pwdgroup.xml

-              r88ef769
+              r03e6a40
   <?dbhtml filename="pwdgroup.html"?>
   <title>Creating the passwd, group, and log Files</title>
+  <title>Creating the passwd and group Files</title>
   <indexterm zone="ch-chroot-pwdgroup">
 …
   <indexterm zone="ch-chroot-pwdgroup">
     <primary sortas="e-/etc/group">/etc/group</primary>
-  </indexterm>
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
-  </indexterm>
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
-  </indexterm>
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
-  </indexterm>
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
   </indexterm>
 …
 <screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
 <literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
+<literal>bin:x:&uid-bin;:&gid-bin;:/bin:/bin/false</literal>
+<literal>daemon:x:&uid-daemon;:&gid-daemon;:/sbin:/bin/false</literal>
+<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
+<literal>nobody:x:&uid-nobody;:&gid-nogroup;:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 …
 utmp:x:&gid-utmp;:
 usb:x:&gid-usb;:
+cdrom:x:&gid-cdrom;:</literal>
+cdrom:x:&gid-cdrom;:
+adm:x:&gid-adm;:
+messagebus:x:&gid-messagebus;:
+systemd-journal:x:&gid-systemd-journal;:
+mail:x:&gid-mail;:
+wheel:x:&gid-wheel;:
+nogroup:x:&gid-nogroup;:</literal>
 EOF</userinput></screen>
 …
   for the duration of the next chapters.</para>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-<screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
-chgrp -v utmp /var/run/utmp /var/log/lastlog
-chmod -v 664 /var/run/utmp /var/log/lastlog
-chmod -v 600 /var/log/btmp</userinput></screen>
-  <para>The <filename>/var/run/utmp</filename> file records the users that
-  are currently logged in. The <filename>/var/log/wtmp</filename> file records
-  all logins and logouts. The <filename>/var/log/lastlog</filename> file
-  records when each user last logged in. The <filename>/var/log/btmp</filename>
-  file records the bad login attempts.</para>
 </sect1>

BOOK/chroot/mips-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/before-chroot.xml"/>

BOOK/chroot/mips/creatingdirs.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='b'])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
    <para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 …
   xpointer="xpointer(//*[@os='e'])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 </sect1>

BOOK/chroot/mips64-64-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/chroot/mips64-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/chroot/mips64/createfiles.xml

-              r88ef769
+              r03e6a40
 ln -sv /tools/lib32/libgcc_s.so{,.1} /usr/lib32
 ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
+ln -sv /tools/lib/libstd* /usr/lib
+ln -sv /tools/lib32/libstd* /usr/lib32
+ln -sv /tools/lib64/libstd* /usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
+ln -sv /tools/lib32/libstdc++.so{.6,} /usr/lib32
+ln -sv /tools/lib64/libstdc++.so{.6,} /usr/lib64
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
 ln -sv bash /bin/sh
 ln -sv /run /var/run</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../boot/common/createfiles.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/createfiles.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 </sect1>

BOOK/chroot/mips64/creatingdirs.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 <screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
 …
 mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
 install -dv /usr/lib/locale
 ln -sv ../lib/locale /usr/lib32
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 …
   xpointer="xpointer(//*[@os='e'])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 </sect1>

BOOK/chroot/multilib/createfiles.xml

-              r88ef769
+              r03e6a40
 ln -sv /run /var/run</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../boot/common/createfiles.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/createfiles.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 </sect1>

BOOK/chroot/multilib/creatingdirs.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 <screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
 …
 mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
 install -dv /usr/lib/locale
 ln -sv ../lib/locale /usr/lib64</userinput></screen>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
   xpointer="xpointer(//*[@os='e'])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 </sect1>

BOOK/chroot/ppc-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/before-chroot.xml"/>

BOOK/chroot/ppc64-64-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/chroot/ppc64-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/chroot/sparc-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/before-chroot.xml"/>

BOOK/chroot/sparc64-64-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/chroot/sparc64-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/chroot/x86-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/before-chroot.xml"/>

BOOK/chroot/x86/before-chroot.xml

-              r88ef769
+              r03e6a40
     <command>config.guess</command>:</para>
 <screen><userinput>build-aux/config.guess</userinput></screen>
+<screen><userinput>lib/config.guess</userinput></screen>
     <para>If the output of that command does not equal what is in
 …
     directory:</para>
 <screen><userinput>setarch linux32 build-aux/config.guess</userinput></screen>
+<screen><userinput>setarch linux32 lib/config.guess</userinput></screen>
     <para>If the output of the command above equals what is in
 …
     directory:</para>
 <screen os="uui"><userinput>build-aux/config.guess</userinput></screen>
+<screen os="uui"><userinput>lib/config.guess</userinput></screen>
     <para os="uuj">The output of the above command should be the same as the

BOOK/chroot/x86_64-64-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/chroot/x86_64-chapter.xml

r88ef769	r03e6a40
13	13
14	14	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
15		~~<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>~~
16	15	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
17	16	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>

BOOK/cross-tools/64/gcc-static.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
       AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
       ../eglibc-&eglibc-version;/configure --prefix=/tools \
+      ../glibc-&glibc-version;/configure --prefix=/tools \
       --host=${CLFS_TARGET} --build=${CLFS_HOST} \
       --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../multilib/eglibc-64bit.xml"
+      href="../multilib/glibc-64bit.xml"
       xpointer="xpointer(//*[@os='fa1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg3'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg4'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg5'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg6'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg7'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg8'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg10'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg11'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg12'])"/>
     </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/alpha-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/eglibc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/glibc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>

BOOK/cross-tools/alpha/glibc-headers.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc-headers" role="wrap">
   <?dbhtml filename="eglibc-headers.html"?>
+<sect1 id="ch-cross-tools-glibc-headers" role="wrap">
+  <?dbhtml filename="glibc-headers.html"?>
   <title>EGLIBC-&eglibc-version; Headers</title>
+  <title>GLIBC-&glibc-version; Headers</title>
   <indexterm zone="ch-cross-tools-eglibc-headers">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc-headers">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, headers</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC Headers</title>
+    <title>Installation of GLIBC Headers</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <para os="s1">EGLIBC's <filename>configure</filename> script checks the
     version of GCC, and will fail if it's less than 3.4. The next EGLIBC build
+    <para os="s1">GLIBC's <filename>configure</filename> script checks the
+    version of GCC, and will fail if it's less than 3.4. The next GLIBC build
     will use the GCC that will be installed into
     <filename class="directory">/cross-tools</filename> in the next step.
     However, in this step only the EGLIBC headers are being installed - no
+    However, in this step only the GLIBC headers are being installed - no
     compiling is taking place - so the GCC version isn't important. The
     following sed removes the dependency of GCC 3.4.x:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="s3"><userinput>CC=gcc ../eglibc-&eglibc-version;/configure --prefix=/tools \
+<screen os="s3"><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    --disable-sanity-checks --enable-kernel=2.6.32 \
 …
              <term><parameter>CC=gcc</parameter></term>
              <listitem>
                 <para>Tells EGLIBC to use the host's GCC compiler.</para>
+                <para>Tells GLIBC to use the host's GCC compiler.</para>
              </listitem>
           </varlistentry>
 …
             <term><parameter>--enable-kernel=2.6.32</parameter></term>
             <listitem>
                <para>This tells EGLIBC to compile the library with support
+               <para>This tells GLIBC to compile the library with support
                for 2.6.32 and later Linux kernels.</para>
             </listitem>
 …
            <term><parameter>--with-headers=/tools/include</parameter></term>
            <listitem>
               <para>This tells EGLIBC to compile itself against the headers
+              <para>This tells GLIBC to compile itself against the headers
               recently installed to the <filename class="directory">/tools</filename>
               directory, so that it knows exactly what features the kernel has
 …
            <term><parameter>--with-binutils=/cross-tools/${CLFS_TARGET}/bin</parameter></term>
            <listitem>
               <para>This tells EGLIBC to use the Binutils for our specific target architecture.</para>
+              <para>This tells GLIBC to use the Binutils for our specific target architecture.</para>
             </listitem>
        </varlistentry>
 …
    <para os="cj">Another header is needed for NPTL:</para>
 <screen><userinput>cp -v ../eglibc-&eglibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
+<screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
     /tools/include/bits/</userinput></screen>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/alpha/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/common/bc.xml

r88ef769	r03e6a40
28	28
29	29	<variablelist>
30		<title>The meaning of the configure options:</title>
	30	<title>The meaning of the configure option:</title>
31	31
32	32	<varlistentry>

BOOK/cross-tools/common/binutils-32.xml

-              r88ef769
+              r03e6a40
       <varlistentry os="bd4">
+        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
+        <listitem>
+          <para>Tells configure to build a linker that uses ${CLFS} as its
+          root directory for its search paths.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry os="bd5">
         <term><parameter>--with-lib-path=/tools/lib</parameter></term>
         <listitem>
 …
       </varlistentry>
       <varlistentry os="bd5">
+      <varlistentry os="bd6">
         <term><parameter>--disable-nls</parameter></term>
         <listitem>
 …
       </varlistentry>
       <varlistentry os="bd6">
+      <varlistentry os="bd7">
         <term><parameter>--disable-multilib</parameter></term>
         <listitem>
 …
     <para os="be">Compile the package:</para>
+<screen os="bf"><userinput>make configure-host
+make</userinput></screen>
+    <variablelist os="bg">
+      <title>The meaning of the make options:</title>
+      <varlistentry os="bg1">
+        <term><parameter>configure-host</parameter></term>
+        <listitem>
+          <para>This checks the host environment and makes sure all the
+          necessary tools are available to compile Binutils.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+<screen os="bf"><userinput>make</userinput></screen>
     <para os="bh">Install the package:</para>
 <screen os="bi"><userinput>make install</userinput></screen>
-    <para os="bj">Copy <filename class="headerfile">libiberty.h</filename> to
-    <filename class="directory">/tools/include</filename> directory:</para>
-<screen os="bk"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /tools/include</userinput></screen>
   </sect2>

BOOK/cross-tools/common/binutils.xml

-              r88ef769
+              r03e6a40
       <varlistentry os="bd4">
+        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
+        <listitem>
+          <para>Tells configure to build a linker that uses ${CLFS} as its
+          root directory for its search paths.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry os="bd5">
         <term><parameter>--with-lib-path=/tools/lib</parameter></term>
         <listitem>
 …
       </varlistentry>
       <varlistentry os="bd5">
+      <varlistentry os="bd6">
         <term><parameter>--disable-nls</parameter></term>
         <listitem>
 …
       </varlistentry>
       <varlistentry os="bd6">
+      <varlistentry os="bd7">
         <term><parameter>--disable-multilib</parameter></term>
         <listitem>
 …
       </varlistentry>
       <varlistentry os="bd7">
+      <varlistentry os="bd8">
         <term><parameter>--enable-64-bit-bfd</parameter></term>
         <listitem>
 …
     <para os="be">Compile the package:</para>
+<screen os="bf"><userinput>make configure-host
+make</userinput></screen>
+    <variablelist os="bg">
+      <title>The meaning of the make options:</title>
+      <varlistentry os="bg1">
+        <term><parameter>configure-host</parameter></term>
+        <listitem>
+          <para>This checks the host environment and makes sure all the
+          necessary tools are available to compile Binutils.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+<screen os="bf"><userinput>make</userinput></screen>
     <para os="bh">Install the package:</para>
 <screen os="bi"><userinput>make install</userinput></screen>
-    <para os="bj">Copy <filename class="headerfile">libiberty.h</filename> to
-    <filename class="directory">/tools/include</filename> directory:</para>
-<screen os="bk"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /tools/include</userinput></screen>
   </sect2>

BOOK/cross-tools/common/cloog.xml

-              r88ef769
+              r03e6a40
     --with-gmp-prefix=/cross-tools --with-isl-prefix=/cross-tools</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/cloog.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/cloog.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
     <para os="c">Compile the package:</para>

BOOK/cross-tools/common/file.xml

-              r88ef769
+              r03e6a40
     <variablelist>
+      <title>The meaning of the configure options:</title>
+      <varlistentry>
+        <term><parameter>--prefix=/cross-tools</parameter></term>
+        <listitem>
+          <para>This tells the configure script to prepare to install the
+          package in the <filename class="directory">/cross-tools</filename>
+          directory.</para>
+        </listitem>
+      </varlistentry>
+      <title>The meaning of the new configure option:</title>
       <varlistentry>

BOOK/cross-tools/common/gcc-final.xml

-              r88ef769
+              r03e6a40
   --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
   --with-gmp=/cross-tools --with-cloog=/cross-tools \
+  --enable-cloog-backend=isl --with-isl=/cross-tools \
+  --disable-isl-version-check --with-system-zlib --enable-checking=release \
+  --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
   --enable-libstdcxx-time</userinput></screen>
 …
       </varlistentry>
+      <varlistentry os="bg6">
+        <term><parameter>--enable-libstdcxx-time</parameter></term>
+        <listitem>
+          <para>This enables link-time checks for the availability of
+          clock_gettime clocks, and nanosleep and sched_yield functions, in the
+          C library.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>

BOOK/cross-tools/common/gcc-static.xml

-              r88ef769
+              r03e6a40
   --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
   --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
+  --disable-libmudflap --disable-libssp --disable-threads --disable-multilib \
+  --disable-libatomic --disable-libitm --disable-libsanitizer \
+  --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
+  --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
+  --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \
+  --disable-libsanitizer --disable-libquadmath --disable-threads \
+  --disable-multilib --disable-target-zlib --with-system-zlib \
   --enable-languages=c --enable-checking=release</userinput></screen>
     <variablelist os="am">
       <title>The meaning of the new configure options:</title>
-      <varlistentry>
-        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
-        <listitem>
-          <para>Tells GCC to consider ${CLFS} as the root file system.</para>
-        </listitem>
-      </varlistentry>
      <varlistentry>
 …
       </varlistentry>
       <varlistentry>
         <term><parameter>--with-native-system-headers-dir=/tools/include</parameter></term>
 …
       <varlistentry>
+        <term><parameter>--disable-nls</parameter></term>
+        <listitem>
+          <para>This disables internationalization as i18n is not needed for the
+          cross-compile tools.</para>
+        <term><parameter>--disable-shared</parameter></term>
+        <listitem>
+          <para>This tells GCC not to create a shared library.</para>
         </listitem>
       </varlistentry>
 …
       <varlistentry>
+        <term><parameter>--disable-libgomp</parameter></term>
+        <listitem>
+          <para>Disables the creation of runtime libraries used by GOMP.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--disable-libmudflap</parameter></term>
+        <listitem>
+          <para>Disables the creation of runtime libaries used by libmudflap.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--disable-libssp</parameter></term>
+        <listitem>
+          <para>Disables the use of Stack Smashing Protection for runtime libraries.</para>
+        <term><parameter>--disable-lib*</parameter></term>
+        <listitem>
+          <para>These options prevent GCC from building a number of libraries
+          that are not needed at this time.</para>
         </listitem>
       </varlistentry>
 …
       <varlistentry>
+        <term><parameter>--disable-libatomic</parameter></term>
+        <listitem>
+          <para>The atomic library isn't needed at this time.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--disable-libitm</parameter></term>
+        <listitem>
+          <para>The itm library isn't neeeded at this tiem.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--disable-libsanitizer</parameter></term>
+        <listitem>
+          <para>The sanitizer library isn't needed at this time.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--disable-libquadmath</parameter></term>
+        <listitem>
+          <para>The quadmath library isn't needed at this time.</para>
+        <term><parameter>--disable-target-zlib</parameter></term>
+        <listitem>
+          <para>This tells GCC stuff.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--with-system-zlib</parameter></term>
+        <listitem>
+          <para>This tells GCC to link to the system-installed zlib instead
+          of the one in its source tree.</para>
         </listitem>
       </varlistentry>
 …
 <screen os="ar"><userinput>make install-gcc install-target-libgcc</userinput></screen>
+    <para os="as">Copy <filename class="headerfile">libiberty.h</filename> to
+    <filename class="directory">/tools/include</filename> directory:</para>
+<screen os="at"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /tools/include</userinput></screen>
   </sect2>

BOOK/cross-tools/common/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <para os="da">It should be noted that compiling EGLIBC in any way other than
+    <para os="da">It should be noted that compiling GLIBC in any way other than
     the method suggested in this book puts the stability of the system at
     risk.</para>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <para os="dd">Add the following to <filename>config.cache</filename>
     to disable ssp when building EGLIBC:</para>
+    to disable ssp when building GLIBC:</para>
 <screen os="de"><userinput>echo "libc_cv_ssp=no" &gt; config.cache</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
     AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../eglibc-&eglibc-version;/configure --prefix=/tools \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${CLFS_TARGET} --build=${CLFS_HOST} \
     --disable-profile --with-tls --enable-kernel=2.6.32 \
 …
         <term><parameter>BUILD_CC="gcc"</parameter></term>
         <listitem>
           <para>This sets EGLIBC to use the current compiler on our system. This is
           used to create the tools EGLIBC uses during its build.</para>
+          <para>This sets GLIBC to use the current compiler on our system. This is
+          used to create the tools GLIBC uses during its build.</para>
         </listitem>
       </varlistentry>
 …
         <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
         <listitem>
           <para>This forces EGLIBC to use the GCC compiler that we made for our target
+          <para>This forces GLIBC to use the GCC compiler that we made for our target
           architecture.</para>
         </listitem>
 …
         <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
         <listitem>
           <para>This forces EGLIBC to use the <command>ar</command> utility
+          <para>This forces GLIBC to use the <command>ar</command> utility
           we made for our target architecture.</para>
         </listitem>
 …
         <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
         <listitem>
           <para>This forces EGLIBC to use the <command>ranlib</command> utility
+          <para>This forces GLIBC to use the <command>ranlib</command> utility
           we made for our target architecture.</para>
         </listitem>
 …
         <term><parameter>--with-tls</parameter></term>
         <listitem>
           <para>This tells EGLIBC to use Thread Local Storage.</para>
+          <para>This tells GLIBC to use Thread Local Storage.</para>
         </listitem>
       </varlistentry>
 …
         <term><parameter>--enable-kernel=2.6.32</parameter></term>
         <listitem>
           <para>This tells EGLIBC to compile the library with support
+          <para>This tells GLIBC to compile the library with support
           for 2.6.32 and later Linux kernels.</para>
         </listitem>
 …
         <term><parameter>--with-__thread</parameter></term>
         <listitem>
           <para>This tells EGLIBC to use use the __thread for libc and
+          <para>This tells GLIBC to use use the __thread for libc and
           libpthread builds.</para>
         </listitem>
 …
         <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
         <listitem>
           <para>This tells EGLIBC to use the Binutils that are specific to
+          <para>This tells GLIBC to use the Binutils that are specific to
           our target architecture.</para>
         </listitem>
 …
         <term><parameter>--with-headers=/tools/include</parameter></term>
         <listitem>
           <para>This tells EGLIBC to compile itself against the headers
+          <para>This tells GLIBC to compile itself against the headers
           recently installed to the <filename class="directory">/tools</filename>
           directory, so that it knows exactly what features the kernel has
 …
       <varlistentry os="dg11">
+        <term><parameter>--enable-obsolete-rpc</parameter></term>
+        <listitem>
+          <para>This tells GLIBC to install rpc headers that are not installed
+          by default but may be needed by other packages.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry os="dg12">
         <term><parameter>--cache-file=config.cache</parameter></term>
         <listitem>
           <para>This tells EGLIBC to utilize a premade cache file.</para>
+          <para>This tells GLIBC to utilize a premade cache file.</para>
         </listitem>
       </varlistentry>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/common/gmp.xml

r88ef769	r03e6a40
46	46
47	47	<variablelist os="b1">
48		<title>The meaning of the new configure options:</title>
	48	<title>The meaning of the new configure option:</title>
49	49
50	50	<varlistentry>

BOOK/cross-tools/common/mpfr.xml

-              r88ef769
+              r03e6a40
       <varlistentry>
-        <term><parameter>--enable-shared</parameter></term>
-        <listitem>
-          <para>This tells <command>configure</command> to build MPFR's
-          shared libraries.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term><parameter>--with-gmp=/cross-tools</parameter></term>
         <listitem>

BOOK/cross-tools/mips-chapter.xml

r88ef769	r03e6a40
27	27	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
28	28	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc-static.xml"/>
29		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/eglibc.xml"/>
	29	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/glibc.xml"/>
30	30	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc-final.xml"/>
31	31

BOOK/cross-tools/mips/gcc-final.xml

-              r88ef769
+              r03e6a40
       xpointer="xpointer(//*[@os='bg5'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/gcc-final.xml"
+      xpointer="xpointer(//*[@os='bg6'])"/>
     </variablelist>

BOOK/cross-tools/mips/gcc-static.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/mips/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/mips64-64-chapter.xml

r88ef769	r03e6a40
28	28	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
29	29	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc-static.xml"/>
30		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/eglibc.xml"/>
	30	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/glibc.xml"/>
31	31	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc-final.xml"/>
32	32

BOOK/cross-tools/mips64-64/gcc-final.xml

-              r88ef769
+              r03e6a40
 <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
   ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  ../gcc-4.8.2/configure --prefix=/cross-tools \
   --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
   --with-sysroot=${CLFS} --with-local-prefix=/tools \
   --with-native-system-header-dir=/tools/include --disable-nls \
+  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
+  --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
+  --disable-libmudflap --disable-libssp --disable-threads --disable-multilib \
+  --disable-libatomic --disable-libitm --disable-libsanitizer \
+  --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
+  --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
+  --enable-languages=c --enable-checking=release --with-abi=64
+  </userinput></screen>
+  --enable-shared --disable-static --enable-languages=c,c++ \
+  --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \
+  --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
+  --with-gmp=/cross-tools --with-cloog=/cross-tools \
+  --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
+  --enable-libstdcxx-time --with-abi=64</userinput></screen>
     <variablelist os="bg">
 …
       xpointer="xpointer(//*[@os='bg5'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/gcc-final.xml"
+      xpointer="xpointer(//*[@os='bg6'])"/>
     </variablelist>

BOOK/cross-tools/mips64-64/gcc-static.xml

-              r88ef769
+              r03e6a40
 <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
   ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  ../gcc-4.8.2/configure --prefix=/cross-tools \
   --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
   --with-sysroot=${CLFS} --with-local-prefix=/tools \
   --with-native-system-header-dir=/tools/include --disable-nls \
+  --enable-shared --disable-static --enable-languages=c,c++ \
+  --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \
+  --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
+  --with-gmp=/cross-tools --with-cloog=/cross-tools --enable-cloog-backend=isl \
+  --with-isl=/cross-tools --disable-isl-version-check --with-system-zlib \
+  --enable-checking=release --enable-libstdcxx-time --with-abi=64</userinput></screen>
+  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
+  --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
+  --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \
+   --disable-libsanitizer --disable-libquadmath --disable-threads \
+   --disable-multilib --disable-target-libiberty --disable-target-zlib \
+   --with-system-zlib --enable-languages=c --enable-checking=release \
+   --with-abi=64</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/mips64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc-final.xml"/>

BOOK/cross-tools/mips64/gcc-static.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/mips64/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc-64" role="wrap">
   <?dbhtml filename="eglibc-64.html"?>
+<sect1 id="ch-cross-tools-glibc-64" role="wrap">
+  <?dbhtml filename="glibc-64.html"?>
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-cross-tools-eglibc-64">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc-64">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 64 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/mips64/eglibc-64bit.xml"
+    href="../../final-system/mips64/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/mips64/eglibc-64bit.xml"
+    href="../../final-system/mips64/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='df'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/mips64/glibc-n32.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc-n32" role="wrap">
   <?dbhtml filename="eglibc-n32.html"?>
+<sect1 id="ch-cross-tools-glibc-n32" role="wrap">
+  <?dbhtml filename="glibc-n32.html"?>
   <title>EGLIBC-&eglibc-version; N32</title>
+  <title>GLIBC-&glibc-version; N32</title>
   <indexterm zone="ch-cross-tools-eglibc-n32">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc-n32">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, N32</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/mips64/eglibc-64bit.xml"
+    href="../../final-system/mips64/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/mips64/eglibc-64bit.xml"
+    href="../../final-system/mips64/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <para os="n1">Tell EGLIBC to install its 32-bit libraries into <filename
+    <para os="n1">Tell GLIBC to install its 32-bit libraries into <filename
     class="directory">/tools/lib32</filename>:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILDN32}" \
     AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../eglibc-&eglibc-version;/configure --prefix=/tools \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib32 \
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
 …
         <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
         <listitem>
           <para>Forces EGLIBC to utilize our target architecture GCC utilizing
+          <para>Forces GLIBC to utilize our target architecture GCC utilizing
           the N32 flags.</para>
         </listitem>
 …
         <term><parameter>--libdir=/tools/lib32</parameter></term>
         <listitem>
           <para>Installs EGLIBC into /tools/lib32 instead of /tools/lib.</para>
+          <para>Installs GLIBC into /tools/lib32 instead of /tools/lib.</para>
         </listitem>
       </varlistentry>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/mips64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit</title>
+  <title>GLIBC-&glibc-version; 32 Bit</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/multilib/binutils.xml

-              r88ef769
+              r03e6a40
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/binutils.xml"
       xpointer="xpointer(//*[@os='bd7'])"/>
+      xpointer="xpointer(//*[@os='bd8'])"/>
     </variablelist>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='bh'])"/>
 …
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='bi'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
   </sect2>

BOOK/cross-tools/multilib/gcc-final.xml

-              r88ef769
+              r03e6a40
   --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \
   --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
+  --enable-cloog-backend=isl --with-isl=/cross-tools \
+  --disable-isl-version-check --with-system-zlib --enable-checking=release \
+  --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
   --enable-libstdcxx-time</userinput></screen>

BOOK/cross-tools/multilib/gcc-static.xml

-              r88ef769
+              r03e6a40
   --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
   --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
+  --disable-libssp --disable-threads --disable-libatomic --disable-libitm \
+  --disable-libsanitizer --disable-libquadmath --disable-target-libiberty \
+  --disable-target-zlib --with-system-zlib --enable-cloog-backend=isl \
+  --with-isl=/cross-tools --disable-isl-version-check --enable-languages=c \
+  --enable-checking=release</userinput></screen>
+  --disable-libssp --disable-libatomic --disable-libitm \
+  --disable-libsanitizer --disable-libquadmath --disable-threads \
+  --disable-target-zlib --with-system-zlib --with-isl=/cross-tools \
+  --enable-languages=c --enable-checking=release</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/multilib/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibcc-64" role="wrap">
   <?dbhtml filename="eglibc-64.html"?>
+<sect1 id="ch-cross-tools-glibcc-64" role="wrap">
+  <?dbhtml filename="glibc-64.html"?>
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-cross-tools-eglibcc-64">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibcc-64">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 64 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <para os="n1">Tell EGLIBC to install its 64-bit libraries into <filename
+    <para os="n1">Tell GLIBC to install its 64-bit libraries into <filename
     class="directory">/tools/lib64</filename>:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
     AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../eglibc-&eglibc-version;/configure --prefix=/tools \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
 …
         <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD64}"</parameter></term>
         <listitem>
           <para>Forces EGLIBC to build using our target architecture GCC
+          <para>Forces GLIBC to build using our target architecture GCC
           utilizing the 64 Bit flags.</para>
         </listitem>
 …
         <term><parameter>--libdir=/tools/lib64</parameter></term>
         <listitem>
           <para>Puts EGLIBC into /tools/lib64 instead of /tools/lib.</para>
+          <para>Puts GLIBC into /tools/lib64 instead of /tools/lib.</para>
         </listitem>
       </varlistentry>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/multilib/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit</title>
+  <title>GLIBC-&glibc-version; 32 Bit</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
     AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../eglibc-&eglibc-version;/configure --prefix=/tools \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg1'])"/>
 …
         <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
         <listitem>
           <para>Forces EGLIBC to utilize our target architecture GCC utilizing
+          <para>Forces GLIBC to utilize our target architecture GCC utilizing
           the 32 Bit flags.</para>
         </listitem>
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg3'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg4'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg5'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg6'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg7'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg8'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg10'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg11'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg12'])"/>
     </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/ppc-chapter.xml

r88ef769	r03e6a40
27	27	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
28	28	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/gcc-static.xml"/>
29		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/eglibc.xml"/>
	29	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/glibc.xml"/>
30	30	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/gcc-final.xml"/>
31	31

BOOK/cross-tools/ppc/gcc-static.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/ppc/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/ppc64-64-chapter.xml

r88ef769	r03e6a40
28	28	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
29	29	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc-static.xml"/>
30		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/eglibc.xml"/>
	30	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/glibc.xml"/>
31	31	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc-final.xml"/>
32	32

BOOK/cross-tools/ppc64-64/gcc-static.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/ppc64-64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
       AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
       ../eglibc-&eglibc-version;/configure --prefix=/tools \
+      ../glibc-&glibc-version;/configure --prefix=/tools \
       --host=${CLFS_TARGET} --build=${CLFS_HOST} \
       --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../multilib/eglibc-64bit.xml"
+      href="../multilib/glibc-64bit.xml"
       xpointer="xpointer(//*[@os='fa1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg3'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg4'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg5'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg6'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg7'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg8'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg10'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg11'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg12'])"/>
     </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='do'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='dp'])"/>
   </sect2>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/ppc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc-final.xml"/>

BOOK/cross-tools/ppc64/gcc-static.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/ppc64/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc-64" role="wrap">
   <?dbhtml filename="eglibc-64.html"?>
+<sect1 id="ch-cross-tools-glibc-64" role="wrap">
+  <?dbhtml filename="glibc-64.html"?>
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-cross-tools-eglibc-64">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc-64">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 64 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='df'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/ppc64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit</title>
+  <title>GLIBC-&glibc-version; 32 Bit</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg3'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg4'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg5'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg6'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg7'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg8'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg10'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg11'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg12'])"/>
     </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/sparc-chapter.xml

r88ef769	r03e6a40
27	27	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
28	28	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
29		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eglibc.xml"/>
	29	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
30	30	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
31	31

BOOK/cross-tools/sparc64-64-chapter.xml

r88ef769	r03e6a40
28	28	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
29	29	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
30		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/eglibc.xml"/>
	30	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/glibc.xml"/>
31	31	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
32	32

BOOK/cross-tools/sparc64-64/gcc-static.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='ar'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='as'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='at'])"/>
   </sect2>

BOOK/cross-tools/sparc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>

BOOK/cross-tools/sparc64/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc-64" role="wrap">
   <?dbhtml filename="eglibc-64.html"?>
+<sect1 id="ch-cross-tools-glibc-64" role="wrap">
+  <?dbhtml filename="glibc-64.html"?>
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-cross-tools-eglibc-64">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc-64">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 64 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='df'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/sparc64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit</title>
+  <title>GLIBC-&glibc-version; 32 Bit</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
     AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../eglibc-&eglibc-version;/configure --prefix=/tools \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg1'])"/>
 …
         <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
         <listitem>
           <para>Forces EGLIBC to utilize our target architecture GCC utilizing
+          <para>Forces GLIBC to utilize our target architecture GCC utilizing
           the 32 Bit flags.</para>
         </listitem>
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg3'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg4'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg5'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg6'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg7'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg8'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg10'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/x86-chapter.xml

r88ef769	r03e6a40
27	27	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
28	28	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
29		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/eglibc.xml"/>
	29	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/glibc.xml"/>
30	30	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
31	31

BOOK/cross-tools/x86/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 …
     AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $CLFS_TARGET) -O2" \
     ../eglibc-&eglibc-version;/configure --prefix=/tools \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${CLFS_TARGET} --build=${CLFS_HOST} \
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg2'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg3'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg4'])"/>
 …
         $CLFS_TARGET)" -O2</parameter></term>
         <listitem>
           <para>Forces EGLIBC to optimize for our target system.</para>
+          <para>Forces GLIBC to optimize for our target system.</para>
         </listitem>
       </varlistentry>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg5'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg6'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg7'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg8'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg10'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg11'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg12'])"/>
     </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/x86_64-64-chapter.xml

r88ef769	r03e6a40
28	28	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
29	29	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
30		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
	30	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/glibc.xml"/>
31	31	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
32	32

BOOK/cross-tools/x86_64-64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../64/eglibc.xml"
+    href="../64/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../multilib/eglibc-64bit.xml"
+      href="../multilib/glibc-64bit.xml"
       xpointer="xpointer(//*[@os='fa1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg3'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg4'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg5'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg6'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg7'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg8'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg10'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg11'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg12'])"/>
     </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
-    <para os="do">The stubs.h header installed by eglibc looks for stubs-32.h
-    and stubs-64.h. This configuration of eglibc only generates stubs-64.h. Fix
-    this with the following:</para>
-    <screen os="dp"><userinput>mv -v /tools/include/gnu/stubs{-64,}.h</userinput></screen>
   </sect2>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/cross-tools/x86_64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>

BOOK/cross-tools/x86_64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit</title>
+  <title>GLIBC-&glibc-version; 32 Bit</title>
   <indexterm zone="ch-cross-tools-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 …
     AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $CLFS_TARGET32) -O2" \
     ../eglibc-&eglibc-version;/configure --prefix=/tools \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
 …
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../multilib/eglibc.xml"
+      href="../multilib/glibc.xml"
       xpointer="xpointer(//*[@os='ea1'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg3'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg4'])"/>
 …
         $CLFS_TARGET32) -O2"</parameter></term>
         <listitem>
           <para>Forces EGLIBC to optimize for our target system.</para>
+          <para>Forces GLIBC to optimize for our target system.</para>
         </listitem>
       </varlistentry>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg5'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg6'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg7'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg8'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg10'])"/>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/eglibc.xml"
+      href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg11'])"/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg12'])"/>
     </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/final-system/64/binutils.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 …
     xpointer="xpointer(//*[@os='s'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
   </sect2>

BOOK/final-system/64/gcc.xml

-              r88ef769
+              r03e6a40
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='fix2'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='z'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
   </sect2>

BOOK/final-system/alpha-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>

BOOK/final-system/alpha/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <title>EGLIBC-&eglibc-version;</title>
+<sect1 id="ch-system-glibc" role="wrap">
+  <title>GLIBC-&glibc-version;</title>
   <?dbhtml filename="eglibc.html"?>
+  <?dbhtml filename="glibc.html"?>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../ppc/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(id('conf-ld'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/common/automake.xml

r88ef769	r03e6a40
28	28	<para os="a">Prepare Automake for compilation:</para>
29	29
30		<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
	30	<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
31	31
32	32	<para os="c">Compile the package:</para>

BOOK/final-system/common/bash.xml

-              r88ef769
+              r03e6a40
 <c:command c:multilib="false">./configure --prefix=/usr --bindir=/bin \
+    --without-bash-malloc --with-installed-readline</c:command>
+    --without-bash-malloc --with-installed-readline \
+    --docdir=/usr/share/doc/bash-&bash-version;</c:command>
 <c:command c:multilib="true">CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ./configure --prefix=/usr --bindir=/bin \
+    --without-bash-malloc --with-installed-readline</c:command>
+    --without-bash-malloc --with-installed-readline \
+    --docdir=/usr/share/doc/bash-&bash-version;</c:command>
 <!--
 …
     <c:para>Install the package:</c:para>
 <c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
+<c:command>make install</c:command>
     <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing

BOOK/final-system/common/bc.xml

-              r88ef769
+              r03e6a40
     <title/>
     <para>The Bc pacakge contains an arbitrary precision numeric processing language.</para>
+    <para>The Bc package contains an arbitrary precision numeric processing language.</para>
   </sect2>
 …
     <para os="a">Prepare Bc for compilation:</para>
+<screen os="b"><userinput>./configure --prefix=/usr --with-readline</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --with-readline \
+  --mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen>
     <para os="c">Compile the package:</para>

BOOK/final-system/common/binutils.xml

-              r88ef769
+              r03e6a40
     <para os="j">Compile the package:</para>
 <screen os="k"><userinput>make configure-host</userinput></screen>
+<screen os="k"><userinput>make tooldir=/usr</userinput></screen>
     <important os="l">
       <para>During <command>make configure-host</command> you may receive the
+      <para>During <command>make tooldir=/usr</command> you may receive the
       following error message. It is safe to ignore.</para>
 …
     </important>
-<screen os="m"><userinput>make tooldir=/usr</userinput></screen>
     <variablelist os="n">
       <title>The meaning of the make parameter:</title>
 …
 <screen os="s"><userinput>make tooldir=/usr install</userinput></screen>
-    <para os="t">Install the <filename class="headerfile">libiberty</filename> header
-    file that is needed by some packages:</para>
-<screen os="u"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /usr/include</userinput></screen>
   </sect2>
 …
         objdump,
         ranlib, readelf, size, strings, and strip</seg>
         <seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg>
+        <seg>libbfd.[a,so], and libopcodes.[a,so]</seg>
         <seg>/usr/lib/ldscripts</seg>
       </seglistitem>
 …
       </varlistentry>
-      <varlistentry id="libiberty">
-        <term><filename class="libraryfile">libiberty</filename></term>
-        <listitem>
-          <para>Contains routines used by various GNU programs, including
-          <command>getopt</command>, <command>obstack</command>,
-          <command>strerror</command>, <command>strtol</command>, and
-          <command>strtoul</command></para>
-          <indexterm zone="ch-system-binutils libiberty">
-            <primary sortas="c-libiberty">libiberty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
       <varlistentry id="libbfd">
         <term><filename class="libraryfile">libbfd</filename></term>

BOOK/final-system/common/bison.xml

-              r88ef769
+              r03e6a40
     <title>Installation of Bison</title>
-    <para os="t3">The <command>configure </command>script does not determine
-    the correct value for the following. Set the value manually:</para>
-<screen os="t4"><userinput>echo "ac_cv_prog_lex_is_flex=yes" &gt; config.cache</userinput></screen>
     <para os="a">Prepare Bison for compilation:</para>
 <screen os="b"><userinput>./configure --prefix=/usr --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr</userinput></screen>
     <para os="c">Compile the package:</para>

BOOK/final-system/common/bzip2.xml

-              r88ef769
+              r03e6a40
 <screen os="s2"><userinput>sed -i -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' Makefile</userinput></screen>
+    <para os="s3">Make Bzip2 install its manpages in
+    <filename class="directory">/usr/share/man</filename> instead of
+    <filename class="directory">/usr/man</filename>:</para>
+<screen os="s4"><userinput>sed -i 's@X)/man@X)/share/man@g' ./Makefile</userinput></screen>
     <para os="a">The Bzip2 package does not contain a <command>configure</command>

BOOK/final-system/common/cloog.xml

-              r88ef769
+              r03e6a40
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
   ./configure --prefix=/usr --enable-shared --with-isl=system</userinput></screen>
+    <para os="s1">Apply a <command>sed</command> which prevents the attempted installation of an invalid file:</para>
+<screen os="s2"><userinput>sed -i '/cmake/d' Makefile</userinput></screen>
     <para os="c">Compile the package:</para>

BOOK/final-system/common/coreutils.xml

-              r88ef769
+              r03e6a40
   ./configure --prefix=/usr \
     --enable-no-install-program=kill,uptime \
     --enable-install-program=hostname</userinput></screen>
+    --enable-install-program=hostname --libexecdir=/usr/lib</userinput></screen>
     <variablelist os="d1">
 …
 <screen os="f"><userinput>make</userinput></screen>
+    <para os="g">The test suite of Coreutils makes several assumptions about the
+    presence of system users and groups that are not valid within the minimal
+    environment that exists at the moment. Therefore, we will reuse the dummy
+    groups and user created during Util-linux. Skip down to <quote>Install the
+    package</quote> if not running the test suite and you did not create the
+    dummy groups and users during Util-linux.</para>
+   <para os="h">Now the test suite is ready to be run. First, run
+   <para os="g">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 os="i"><userinput remap="test">make NON_ROOT_USERNAME=dummy</userinput></screen>
+    <para os="j">The testsuite will now be run as the
+    <systemitem class="username">dummy</systemitem> user. Fix the permissions
+    for a few files to allow this:</para>
+<screen os="k"><userinput remap="test">chown -Rv dummy .</userinput></screen>
+    <para os="l">Then run the remainder of the tests as the
+    <systemitem class="username">dummy</systemitem> user:</para>
+<screen os="m"><userinput remap="test">su dummy -s /bin/bash \
+<screen os="h"><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
+    <para os="i">The testsuite will now be run as the
+    <systemitem class="username">nobody</systemitem> user. Some tests require
+    that the user be a member of more than one group. Add a temporary group
+    and make the user <systemitem class="username">nobody</systemitem> a part
+    of it so that the tests are not skipped:</para>
+<screen os="j"><userinput remap="test">echo "dummy:x:1000:nobody" >> /etc/group</userinput></screen>
+    <para os="k">Fix permissions of some files so the non-root user can compile
+    and run the tests:</para>
+<screen os="l"><userinput remap="test">chown -Rv nobody .</userinput></screen>
+    <para os="m">Then run the remainder of the tests as the
+    <systemitem class="username">nobody</systemitem> user:</para>
+<screen os="n"><userinput remap="test">su nobody -s /bin/bash \
     -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
+    <para os="n">When testing is complete, remove the
+    <systemitem class="username">dummy</systemitem> user and groups:</para>
+<screen os="o"><userinput remap="test">sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
+    <para os="p">Install the package:</para>
+<screen os="q"><userinput>make install</userinput></screen>
+    <para os="r">Move programs to the locations specified by the FHS:</para>
+<screen os="s"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
+    <para os="o">Remove the temporary group:</para>
+<screen os="p"><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
+    <para os="q">Install the package:</para>
+<screen os="r"><userinput>make install</userinput></screen>
+    <para os="s">Move programs to the locations specified by the FHS:</para>
+<screen os="t"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
 mv -v /usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} /bin
 mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
 mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
-    <para os="t">Other Coreutils programs are used by some of the scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-<screen os="u"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
-mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
-ln -svf ../../bin/install /usr/bin</userinput></screen>
   </sect2>

BOOK/final-system/common/diffutils.xml

-              r88ef769
+              r03e6a40
     <title>Installation of Diffutils</title>
+    <para os="s1">Fix a file so locale files are installed:</para>
+<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
     <para os="a">Prepare Diffutils for compilation:</para>
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
     <para os="s1">Diffutils wants <command>ed</command> as the default editor.
+    <para os="s3">Diffutils wants <command>ed</command> as the default editor.
     The following sed will change the default to <command>vim</command>:</para>
 <screen os="s2"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
+<screen os="s4"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
     <para os="c">Compile the package:</para>

BOOK/final-system/common/e2fsprogs.xml

-              r88ef769
+              r03e6a40
           <para>This creates the shared libraries which some programs
           in this package use.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry os="e3">
+        <term><parameter>--disable-*</parameter></term>
+        <listitem>
+          <para>This prevents E2fsprogs from building and installing the
+          <systemitem class="library">libuuid</systemitem> and
+          <systemitem class="library">libblkid</systemitem> libraries, the
+          <systemitem class="daemon">uuidd</systemitem> daemon, and the
+          <command>fsck</command> wrapper, as Util-Linux installed all of
+          them earlier.</para>
         </listitem>
       </varlistentry>

BOOK/final-system/common/flex.xml

-              r88ef769
+              r03e6a40
     <para os="a">Prepare Flex for compilation:</para>
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
     <para os="c">Compile the package:</para>
 …
 <screen os="g"><userinput>make install</userinput></screen>
+    <para os="h">There are some packages that expect to find the
+    <filename class="libraryfile">lex</filename> library in <filename
+    class="directory">/usr/lib</filename>. Create a symlink to account for
+    this:</para>
+<screen os="i"><userinput>ln -sv libfl.a /usr/lib/libl.a</userinput></screen>
+    <para os="j">A few programs do not know about <command>flex</command> yet and
+    <para os="h">A few programs do not know about <command>flex</command> yet and
     try to run its predecessor, <command>lex</command>. To support those
     programs, create a wrapper script named <filename>lex</filename> that
 …
     mode:</para>
 <screen os="k"><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"
+<screen os="i"><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"
 <literal>#!/bin/sh
 # Begin /usr/bin/lex
 …
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
       <seglistitem>
+        <seg>flex and lex</seg>
+        <seg>libfl.a and libfl_pic.a</seg>
+        <seg>flex, flex++ (link to flex), and lex</seg>
+        <seg>libfl.[a,so] and libfl_pic.[a,so]</seg>
+        <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
     </segmentedlist>
 …
       </varlistentry>
       <varlistentry id="libfl.a">
         <term><filename class="libraryfile">libfl.a</filename></term>
+      <varlistentry id="libfl">
+        <term><filename class="libraryfile">libfl</filename></term>
         <listitem>
           <para>The <filename class="libraryfile">flex</filename> library</para>
           <indexterm zone="ch-system-flex libfl.a">
             <primary sortas="c-libfl.a">libfl.a</primary>
+          <indexterm zone="ch-system-flex libfl">
+            <primary sortas="c-libfl">libfl</primary>
           </indexterm>
         </listitem>
       </varlistentry>
       <varlistentry id="libfl_pic.a">
         <term><filename class="libraryfile">libfl_pic.a</filename></term>
+      <varlistentry id="libfl_pic">
+        <term><filename class="libraryfile">libfl_pic</filename></term>
         <listitem>
           <para>The <filename class="libraryfile">flex</filename> library</para>
           <indexterm zone="ch-system-flex libfl_pic.a">
             <primary sortas="c-libfl.a">libfl_pic.a</primary>
+          <indexterm zone="ch-system-flex libfl_pic">
+            <primary sortas="c-libfl">libfl_pic</primary>
           </indexterm>
         </listitem>

BOOK/final-system/common/gawk.xml

-              r88ef769
+              r03e6a40
 <screen os="g"><userinput>make install</userinput></screen>
+    <para os="h">Install the documentation:</para>
+<screen os="i"><userinput>mkdir -v /usr/share/doc/gawk-&gawk-version;
+cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
   </sect2>
 …
         <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
         pgawk, pgawk-&gawk-version;, and pwcat</seg>
+        <seg>/usr/lib/awk, /usr/share/awk</seg>
+        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
+        /usr/share/doc/gawk-&gawk-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/gcc.xml

-              r88ef769
+              r03e6a40
     suppress the execution of the <command>fixincludes</command> script:</para>
+<screen os="fix2"><userinput>cp -v gcc/Makefile.in{,.orig}
+sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
+    <para os="d">Apply a <command>sed</command> substitution that will suppress the
+    installation of <filename class="libraryfile">libiberty.a</filename>. The
+    version of <filename class="libraryfile">libiberty.a</filename> provided by
+    Binutils will be used instead:</para>
+<screen os="e"><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
+<screen os="fix2"><userinput>sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen>
     <para os="f">The GCC documentation recommends building GCC outside of the source
 …
     <para os="h">Prepare GCC for compilation:</para>
 <screen os="i"><userinput>CC="gcc -isystem /usr/include" \
+<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include" \
 CXX="g++ -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
 …
     --enable-clocale=gnu --enable-languages=c,c++ \
     --disable-multilib --disable-libstdcxx-pch \
+    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
+    --enable-checking=release --enable-libstdcxx-time \
+    --disable-install-libiberty</userinput></screen>
+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
     <para os="j">Compile the package:</para>
 …
 <screen os="t"><userinput>make install</userinput></screen>
+    <para os="u">Some packages expect the C preprocessor to be installed in the
+    <para os="u">Install the <filename class="headerfile">libiberty</filename> header
+    file that is needed by some packages:</para>
+<screen os="v"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /usr/include</userinput></screen>
+    <para os="w">Some packages expect the C preprocessor to be installed in the
     <filename class="directory">/lib</filename> directory.
     To support those packages, create this symlink:</para>
 <screen os="v"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
     <para os="w">Many packages use the name <command>cc</command> to call the C
+<screen os="x"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
+    <para os="y">Many packages use the name <command>cc</command> to call the C
     compiler. To satisfy those packages, create a symlink:</para>
 <screen os="x"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
     <para os="y">Finally, move a misplaced file:</para>
 <screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
+<screen os="z"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
+    <para os="aa">Finally, move a misplaced file:</para>
+<screen os="ab"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
   </sect2>
 …
       <seglistitem>
         <seg>c++, cc (link to gcc), cpp, g++, gcc, and gcov</seg>
+        <seg>libasan.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
+        libgomp.[a,so], libmudflap.[a,so], libmudflapth.[a,so], libssp.[a,so],
+        libssp_nonshared.a, libstdc++.[a,so], libsupc++.a, and libtsan.[a,so]</seg>
+        <seg>libasan.[a,so], libatomic.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
+        libgomp.[a,so], libiberty.a, libitm.[a,so], liblto_plugin.so, libmudflap.[a,so], libmudflapth.[a,so],
+        libquadmath.[a,so], libssp.[a,so], libssp_nonshared.a, libstdc++.[a,so], libsupc++.a, and
+        libtsan.[a,so]</seg>
         <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
       </seglistitem>
 …
       </varlistentry>
+      <varlistentry id="libatomic">
+        <term><filename class="libraryfile">libatomic</filename></term>
+        <listitem>
+          <para>A GCC support runtime library for atomic operations not
+          supported by hardware</para>
+          <indexterm zone="ch-system-gcc libatomic">
+            <primary sortas="c-libatomic*">libatomic*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
       <varlistentry id="libgcc">
         <term><filename class="libraryfile">libgcc</filename></term>
 …
       </varlistentry>
+      <varlistentry id="libiberty">
+        <term><filename class="libraryfile">libiberty</filename></term>
+        <listitem>
+          <para>Contains routines used by various GNU programs, including
+          <command>getopt</command>, <command>obstack</command>,
+          <command>strerror</command>, <command>strtol</command>, and
+          <command>strtoul</command></para>
+          <indexterm zone="ch-system-gcc libiberty">
+            <primary sortas="c-libiberty">libiberty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="libitm">
+        <term><filename class="libraryfile">libitm</filename></term>
+        <listitem>
+          <para>The GNU Transactional Memory Library, which provides
+          transaction support for accesses to a process's memory</para>
+          <indexterm zone="ch-system-gcc libitm">
+            <primary sortas="c-libitm*">libitm*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="liblto_plugin">
+        <term><filename class="libraryfile">liblto_plugin</filename></term>
+        <listitem>
+          <para>Runtime library for GCC's link-time optimization plugin</para>
+          <indexterm zone="ch-system-gcc liblto_plugin">
+            <primary sortas="c-liblto_plugin">liblto_plugin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
       <varlistentry id="libmudflap">
         <term><filename class="libraryfile">libmudflap</filename></term>
 …
       </varlistentry>
+      <varlistentry id="libquadmath">
+        <term><filename class="libraryfile">libquadmath</filename></term>
+        <listitem>
+          <para>The GCC Quad-Precision Math Libarary API</para>
+          <indexterm zone="ch-system-gcc libquadmath">
+            <primary sortas="c-libquadmath*">libquadmath*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
       <varlistentry id="libssp">
         <term><filename class="libraryfile">libssp</filename></term>

BOOK/final-system/common/gettext.xml

-              r88ef769
+              r03e6a40
     <para os="a">Prepare Gettext for compilation:</para>
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
     <para os="c">Compile the package:</para>
 …
         <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
         libgettextsrc.so, and preloadable_libintl.so</seg>
+        <seg>/usr/lib/gettext, /usr/share/doc/gettext, /usr/share/gettext</seg>
+        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
+        /usr/share/gettext</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
+  <title>GLIBC-&glibc-version;</title>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
 …
     <title/>
     <para>The EGLIBC package contains the main C library. This library provides
+    <para>The GLIBC package contains the main C library. This library provides
     the basic routines for allocating memory, searching directories, opening and
     closing files, reading and writing files, string handling, pattern matching,
 …
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <note os="z">
 …
       <quote>This library provides an <function>iconv()</function>
       implementation, for use on systems which don't have one, or whose
       implementation cannot convert from/to Unicode.</quote> EGLIBC provides
+      implementation cannot convert from/to Unicode.</quote> GLIBC provides
       an <function>iconv()</function> implementation and can convert from/to
       Unicode, therefore libiconv is not required on a CLFS system.</para>
 …
 unset LINKER</userinput></screen>
     <para os="b">The EGLIBC build system is self-contained and will install
+    <para os="b">The GLIBC build system is self-contained and will install
     perfectly, even though the compiler specs file and linker are still
     pointing at <filename class="directory">/tools</filename>. The specs
     and linker cannot be adjusted before the EGLIBC install because the
     EGLIBC Autoconf tests would give false results and defeat the goal
+    and linker cannot be adjusted before the GLIBC install because the
+    GLIBC Autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
     <para os="s1">Allow EGLIBC to detect Make-4.x:</para>
 <screen os="s2"><userinput>sed -r -i 's/(3..89..)/\1 | 4.*/' configure</userinput></screen>
     <para os="e">The EGLIBC documentation recommends building EGLIBC outside of     the source directory in a dedicated build directory:</para>
 <screen os="f"><userinput>mkdir -v ../eglibc-build
 cd ../eglibc-build</userinput></screen>
     <para os="g">Prepare EGLIBC for compilation:</para>
 <screen os="h"><userinput>../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/eglibc \
+    <para os="s1">Apply the following sed so the <command>tzselect</command> script works properly:</para>
+<screen os="s2"><userinput>sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile</userinput></screen>
+    <para os="e">The GLIBC documentation recommends building GLIBC outside of     the source directory in a dedicated build directory:</para>
+<screen os="f"><userinput>mkdir -v ../glibc-build
+cd ../glibc-build</userinput></screen>
+    <para os="g">Prepare GLIBC for compilation:</para>
+<screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
+    --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/glibc \
     --enable-obsolete-rpc</userinput></screen>
 …
       <varlistentry>
         <term><parameter>--libexecdir=/usr/lib/eglibc</parameter></term>
+        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
         <listitem>
           <para>This changes the location of the <command>getconf</command>
           utility from its default of <filename
           class="directory">/usr/libexec</filename> to <filename
           class="directory">/usr/lib/eglibc</filename>.</para>
+          class="directory">/usr/lib/glibc</filename>.</para>
         </listitem>
       </varlistentry>
 …
     <important os="l">
       <para>The test suite for EGLIBC is considered critical.
+      <para>The test suite for GLIBC is considered critical.
       Do not skip it under any circumstance.</para>
     </important>
 …
 <!-- items n,o,p no longer the master, use x86_64 which has no failures -->
+<screen os="n"><userinput remap="test">cp -v ../eglibc-&eglibc-version;/iconvdata/gconv-modules iconvdata
+make -k check 2&gt;&amp;1 | tee eglibc-check-log; grep Error eglibc-check-log</userinput></screen>
+    <para os="o">The EGLIBC test suite is highly dependent on certain functions of
+    the host system, in particular the kernel. The posix/annexc test normally fails
+<screen os="n"><userinput remap="test">cp -v ../glibc-&glibc-version;/iconvdata/gconv-modules iconvdata
+make -k check 2&gt;&amp;1 | tee glibc-check-log; grep Error glibc-check-log</userinput></screen>
+    <para os="o">The GLIBC test suite is highly dependent on certain functions of
+    the host system, in particular the kernel. The <emphasis>posix/annexc</emphasis> and
+    <emphasis>conform/run-conformtest</emphasis> tests normally fail
     and you should see <literal>Error 1 (ignored)</literal> in the output. Apart
     from this, the EGLIBC test suite is always expected to pass. However, in certain
+    from this, the GLIBC test suite is always expected to pass. However, in certain
     circumstances, some failures are unavoidable. If a test fails because of a missing
     program (or missing symbolic link), or a segfault, you will see an error code
 …
     <itemizedlist os="p">
+      <listitem>
+        <para>The <emphasis>nptl/tst-clock2</emphasis>,
+        <emphasis>nptl/tst-attr3</emphasis>,
+        <emphasis>tst/tst-cputimer1</emphasis>, and
+        <emphasis>rt/tst-cpuclock2</emphasis>
+        tests have been known to fail.  The
+        reason is not completely understood, but indications are that minor
+        timing issues can trigger these failures.</para>
+      </listitem>
       <listitem>
         <para>The <emphasis>math</emphasis> tests sometimes fail.
 …
       <listitem>
         <para>When running on older and slower hardware, some tests
+        can fail because of test timeouts being exceeded.</para>
+        can fail because of test timeouts being exceeded.
+        Modifying the make check command to set a TIMEOUTFACTOR is reported to
+        help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
+        make -k check</command>).</para>
+      </listitem>
+      <listitem>
+        <para>posix/tst-getaddrinfo4 will always fail due to not having a network
+        connection when the test is run.</para>
       </listitem>
     </itemizedlist>
     <para os="q">Though it is a harmless message, the install stage of EGLIBC will
+    <para os="q">Though it is a harmless message, the install stage of GLIBC will
     complain about the absence of <filename>/etc/ld.so.conf</filename>.
     Prevent this warning with:</para>
 …
 <screen os="r"><userinput>touch /etc/ld.so.conf</userinput></screen>
+    <para os="s">Install the package:</para>
+<screen os="t"><userinput>make install</userinput></screen>
+    <para os="s">Install the package, and remove unneeded files from
+    <filename class="directory">/usr/include/rpcsvc</filename>:</para>
+<screen os="t"><userinput>make install &amp;&amp;
+rm -v /usr/include/rpcsvc/*.x</userinput></screen>
+    <para os="u">Install the configuration file and runtime directory for
+    <command>nscd</command>:</para>
+<screen os="v"><userinput>cp -v ../glibc-2.19/nscd/nscd.conf /etc/nscd.conf
+mkdir -pv /var/cache/nscd</userinput></screen>
+    <para os="w">Install the Systemd support files for <command>nscd</command>:</para>
+<screen os="x"><userinput>install -v -Dm644 ../glibc-2.19/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
+install -v -Dm644 ../glibc-2.19/nscd/nscd.service /lib/systemd/system/nscd.service</userinput></screen>
   </sect2>
   <sect2 id="i18n-eglibc" role="configuration">
+  <sect2 id="i18n-glibc" role="configuration">
     <title>Internationalization</title>
 …
     <para>To save time, an alternative to running the previous command (which
     generates and installs every locale listed in the
     <filename>eglibc-&eglibc-version;/localedata/SUPPORTED</filename> file) is
+    <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file) is
     to install only those locales that are wanted and needed. This can be
     achieved by using the <command>localedef</command> command. Information on
     this command is located in the <filename>INSTALL</filename> file in the
     EGLIBC source. However, there are a number of locales that are essential in
+    GLIBC source. However, there are a number of locales that are essential in
     order for the tests of future packages to pass, in particular, the
     <emphasis>libstdc++</emphasis> tests from GCC. The following instructions,
 …
     fa_IR locales as well&mdash;they have been installed only for GCC and
     Gettext tests to pass, and the <command>watch</command> program (part of
     the Procps package) does not work properly in them. Various attempts to
+    the Procps-ng package) does not work properly in them. Various attempts to
     circumvent these restrictions are documented in internationalization-related
     hints.</para>
 …
   </sect2>
   <sect2 id="conf-eglibc" role="configuration">
     <title>Configuring EGLIBC</title>
     <indexterm zone="conf-eglibc">
+  <sect2 id="conf-glibc" role="configuration">
+    <title>Configuring GLIBC</title>
+    <indexterm zone="conf-glibc">
       <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
     </indexterm>
     <indexterm zone="conf-eglibc">
+    <indexterm zone="conf-glibc">
       <primary sortas="e-/etc/localtime">/etc/localtime</primary>
     </indexterm>
     <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
     because, although EGLIBC provides defaults when this file is missing or
     corrupt, the EGLIBC defaults do not work well in a networked environment.
+    because, although GLIBC provides defaults when this file is missing or
+    corrupt, the GLIBC defaults do not work well in a networked environment.
     The time zone also needs to be configured.</para>
 …
 for tz in etcetera southamerica northamerica europe africa antarctica  \
           asia australasia backward pacificnew solar87 solar88 solar89 \
+          asia australasia backward pacificnew \
           systemv; do
     zic -L /dev/null   -d $ZONEINFO       -y "sh yearistype.sh" ${tz}
 …
     <filename>/etc/localtime</filename> file by running:</para>
 <screen><userinput>cp -v --remove-destination /usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
+<screen><userinput>cp -v /usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
     /etc/localtime</userinput></screen>
     <para>Replace <replaceable>[xxx]</replaceable> with the name of the time zone
     that <command>tzselect</command> provided (e.g., Canada/Eastern).</para>
-    <variablelist>
-      <title>The meaning of the cp option:</title>
-      <varlistentry>
-        <term><parameter>--remove-destination</parameter></term>
-        <listitem>
-          <para>This is needed to force removal of the already existing symbolic
-          link. The reason for copying the file instead of using a symlink is to
-          cover the situation where <filename class="directory">/usr</filename>
-          is on a separate partition. This could be important when booted into
-          single user mode.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
   </sect2>
 …
   </sect2>
   <sect2 id="contents-eglibc" role="content">
     <title>Contents of EGLIBC</title>
+  <sect2 id="contents-glibc" role="content">
+    <title>Contents of GLIBC</title>
     <segmentedlist>
 …
         <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
         ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd,
         pcprofiledump, pldd, rpcgen, sln, sprof, tzselect, xtrace,zdump,
         and zic</seg>
+        pcprofiledump, pldd, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
+        zdump, and zic</seg>
         <seg>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
         libbsd-compat.a, libc.[a,so], libc_nonshared.a, libcidn.[a,so],
         libcrypt.[a,so], libdl.[a,so], libg.a, libieee.a, libm.[a,so],
         libmcheck.a, libmemusage.so, libnsl.a, libnss_compat.so, libnss_dns.so,
+        libc.[a,so], libc_nonshared.a, libcidn.[a,so], libcrypt.[a,so],
+        libdl.[a,so], libg.a, libieee.a, libm.[a,so], libmcheck.a,
+        libmemusage.so, libnsl.a, libnss_compat.so, libnss_dns.so,
         libnss_files.so, libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so,
         libpcprofile.so, libpthread.[a,so], libpthread_nonshared.a,
 …
         /usr/include/netrom, /usr/include/netrose, /usr/include/nfs,
         /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
+        /usr/include/sys, /usr/lib/gconv, /usr/lib/eglibc, /usr/lib/locale,
+        /usr/share/i18n, /usr/share/zoneinfo, /var/cache/ldconfig</seg>
+        /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/glibc, /usr/lib/locale,
+        /usr/share/i18n, /usr/share/zoneinfo, /var/cache/ldconfig, and
+        /var/cache/nscd</seg>
       </seglistitem>
     </segmentedlist>
 …
           <para>Can be used to create a stack trace when a program
           terminates with a segmentation fault</para>
           <indexterm zone="ch-system-eglibc catchsegv">
+          <indexterm zone="ch-system-glibc catchsegv">
             <primary sortas="b-catchsegv">catchsegv</primary>
           </indexterm>
 …
         <listitem>
           <para>Generates message catalogues</para>
           <indexterm zone="ch-system-eglibc gencat">
+          <indexterm zone="ch-system-glibc gencat">
             <primary sortas="b-gencat">gencat</primary>
           </indexterm>
 …
           <para>Displays the system configuration values for file system specific
           variables</para>
           <indexterm zone="ch-system-eglibc getconf">
+          <indexterm zone="ch-system-glibc getconf">
             <primary sortas="b-getconf">getconf</primary>
           </indexterm>
 …
         <listitem>
           <para>Gets entries from an administrative database</para>
           <indexterm zone="ch-system-eglibc getent">
+          <indexterm zone="ch-system-glibc getent">
             <primary sortas="b-getent">getent</primary>
           </indexterm>
 …
         <listitem>
           <para>Performs character set conversion</para>
           <indexterm zone="ch-system-eglibc iconv">
+          <indexterm zone="ch-system-glibc iconv">
             <primary sortas="b-iconv">iconv</primary>
           </indexterm>
 …
           <para>Creates fastloading <command>iconv</command> module configuration
           files</para>
           <indexterm zone="ch-system-eglibc iconvconfig">
+          <indexterm zone="ch-system-glibc iconvconfig">
             <primary sortas="b-iconvconfig">iconvconfig</primary>
           </indexterm>
 …
         <listitem>
           <para>Configures the dynamic linker runtime bindings</para>
           <indexterm zone="ch-system-eglibc ldconfig">
+          <indexterm zone="ch-system-glibc ldconfig">
             <primary sortas="b-ldconfig">ldconfig</primary>
           </indexterm>
 …
           <para>Reports which shared libraries are required
           by each given program or shared library</para>
           <indexterm zone="ch-system-eglibc ldd">
+          <indexterm zone="ch-system-glibc ldd">
             <primary sortas="b-ldd">ldd</primary>
           </indexterm>
 …
         <listitem>
           <para>Assists <command>ldd</command> with object files</para>
           <indexterm zone="ch-system-eglibc lddlibc4">
+          <indexterm zone="ch-system-glibc lddlibc4">
             <primary sortas="b-lddlibc4">lddlibc4</primary>
           </indexterm>
 …
           <para>Tells the compiler to enable or disable the use of POSIX locales
           for built-in operations</para>
           <indexterm zone="ch-system-eglibc locale">
+          <indexterm zone="ch-system-glibc locale">
             <primary sortas="b-locale">locale</primary>
           </indexterm>
 …
         <listitem>
           <para>Compiles locale specifications</para>
           <indexterm zone="ch-system-eglibc localedef">
+          <indexterm zone="ch-system-glibc localedef">
             <primary sortas="b-localedef">localedef</primary>
           </indexterm>
 …
         <listitem>
           <para>Creates a simple database from textual input</para>
           <indexterm zone="ch-system-eglibc makedb">
+          <indexterm zone="ch-system-glibc makedb">
             <primary sortas="b-makedb">makedb</primary>
           </indexterm>
 …
           <para>Reads and interprets a memory trace file and
           displays a summary in human-readable format</para>
           <indexterm zone="ch-system-eglibc mtrace">
+          <indexterm zone="ch-system-glibc mtrace">
             <primary sortas="b-mtrace">mtrace</primary>
           </indexterm>
 …
           <para>A daemon that provides a cache for the most common name
           service requests</para>
           <indexterm zone="ch-system-eglibc nscd">
+          <indexterm zone="ch-system-glibc nscd">
             <primary sortas="b-nscd">nscd</primary>
           </indexterm>
 …
         <listitem>
           <para>Dumps information generated by PC profiling</para>
           <indexterm zone="ch-system-eglibc pcprofiledump">
+          <indexterm zone="ch-system-glibc pcprofiledump">
             <primary sortas="b-pcprofiledump">pcprofiledump</primary>
           </indexterm>
 …
         <listitem>
           <para>Lists dynamic shared objects used by running processes</para>
           <indexterm zone="ch-system-eglibc pldd">
+          <indexterm zone="ch-system-glibc pldd">
             <primary sortas="b-pldd">pldd</primary>
           </indexterm>
 …
           <para>Generates C code to implement the Remote Procecure Call (RPC)
           protocol</para>
           <indexterm zone="ch-system-eglibc rpcgen">
+          <indexterm zone="ch-system-glibc rpcgen">
             <primary sortas="b-rpcgen">rpcgen</primary>
           </indexterm>
 …
         <listitem>
           <para>A statically linked program that creates symbolic links</para>
           <indexterm zone="ch-system-eglibc sln">
+          <indexterm zone="ch-system-glibc sln">
             <primary sortas="b-sln">sln</primary>
           </indexterm>
 …
         <listitem>
           <para>Traces shared library procedure calls of a specified command</para>
           <indexterm zone="ch-system-eglibc sotruss">
+          <indexterm zone="ch-system-glibc sotruss">
             <primary sortas="b-sotruss">sotruss</primary>
           </indexterm>
 …
         <listitem>
           <para>Reads and displays shared object profiling data</para>
           <indexterm zone="ch-system-eglibc sprof">
+          <indexterm zone="ch-system-glibc sprof">
             <primary sortas="b-sprof">sprof</primary>
           </indexterm>
 …
           <para>Asks the user about the location of the
           system and reports the corresponding time zone description</para>
           <indexterm zone="ch-system-eglibc tzselect">
+          <indexterm zone="ch-system-glibc tzselect">
             <primary sortas="b-tzselect">tzselect</primary>
           </indexterm>
 …
           <para>Traces the execution of a program by
           printing the currently executed function</para>
           <indexterm zone="ch-system-eglibc xtrace">
+          <indexterm zone="ch-system-glibc xtrace">
             <primary sortas="b-xtrace">xtrace</primary>
           </indexterm>
 …
         <listitem>
           <para>The time zone dumper</para>
           <indexterm zone="ch-system-eglibc zdump">
+          <indexterm zone="ch-system-glibc zdump">
             <primary sortas="b-zdump">zdump</primary>
           </indexterm>
 …
         <listitem>
           <para>The time zone compiler</para>
           <indexterm zone="ch-system-eglibc zic">
+          <indexterm zone="ch-system-glibc zic">
             <primary sortas="b-zic">zic</primary>
           </indexterm>
 …
         <listitem>
           <para>The helper program for shared library executables</para>
           <indexterm zone="ch-system-eglibc ld.so">
+          <indexterm zone="ch-system-glibc ld.so">
             <primary sortas="c-ld.so">ld.so</primary>
           </indexterm>
 …
         <listitem>
           <para>Used by programs, such as Mozilla, to solve broken locales</para>
           <indexterm zone="ch-system-eglibc libBrokenLocale">
+          <indexterm zone="ch-system-glibc libBrokenLocale">
             <primary sortas="c-libBrokenLocale">libBrokenLocale</primary>
           </indexterm>
 …
         <listitem>
           <para>The segmentation fault signal handler</para>
           <indexterm zone="ch-system-eglibc libSegFault">
+          <indexterm zone="ch-system-glibc libSegFault">
             <primary sortas="c-libSegFault">libSegFault</primary>
           </indexterm>
 …
         <listitem>
           <para>An asynchronous name lookup library</para>
           <indexterm zone="ch-system-eglibc libanl">
+          <indexterm zone="ch-system-glibc libanl">
             <primary sortas="c-libanl">libanl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="libbsd-compat">
-        <term><filename class="libraryfile">libbsd-compat</filename></term>
-        <listitem>
-          <para>Provides the portability needed
-          in order to run certain Berkey Software Distribution (BSD) programs
-          under Linux</para>
-          <indexterm zone="ch-system-eglibc libbsd-compat">
-            <primary sortas="c-libbsd-compat">libbsd-compat</primary>
           </indexterm>
         </listitem>
 …
         <listitem>
           <para>The main C library</para>
           <indexterm zone="ch-system-eglibc libc">
+          <indexterm zone="ch-system-glibc libc">
             <primary sortas="c-libc">libc</primary>
           </indexterm>
 …
         <term><filename class="libraryfile">libcidn</filename></term>
         <listitem>
           <para>Used internally by EGLIBC for handling internationalized domain
+          <para>Used internally by GLIBC for handling internationalized domain
           names in the <function>getaddrinfo()</function> function</para>
           <indexterm zone="ch-system-eglibc libcidn">
+          <indexterm zone="ch-system-glibc libcidn">
             <primary sortas="c-libcidn">libcidn</primary>
           </indexterm>
 …
         <listitem>
           <para>The cryptography library</para>
           <indexterm zone="ch-system-eglibc libcrypt">
+          <indexterm zone="ch-system-glibc libcrypt">
             <primary sortas="c-libcrypt">libcrypt</primary>
           </indexterm>
 …
         <listitem>
           <para>The dynamic linking interface library</para>
           <indexterm zone="ch-system-eglibc libdl">
+          <indexterm zone="ch-system-glibc libdl">
             <primary sortas="c-libdl">libdl</primary>
           </indexterm>
 …
         <listitem>
           <para>A runtime library for <command>g++</command></para>
           <indexterm zone="ch-system-eglibc libg">
+          <indexterm zone="ch-system-glibc libg">
             <primary sortas="c-libg">libg</primary>
           </indexterm>
 …
           <para>The Institute of Electrical and Electronic Engineers (IEEE)
           floating point library</para>
           <indexterm zone="ch-system-eglibc libieee">
+          <indexterm zone="ch-system-glibc libieee">
             <primary sortas="c-libieee">libieee</primary>
           </indexterm>
 …
         <listitem>
           <para>The mathematical library</para>
           <indexterm zone="ch-system-eglibc libm">
+          <indexterm zone="ch-system-glibc libm">
             <primary sortas="c-libm">libm</primary>
           </indexterm>
 …
         <listitem>
           <para>Contains code run at boot</para>
           <indexterm zone="ch-system-eglibc libmcheck">
+          <indexterm zone="ch-system-glibc libmcheck">
             <primary sortas="c-libmcheck">libmcheck</primary>
           </indexterm>
 …
         <term><filename class="libraryfile">libmemusage</filename></term>
         <listitem>
           <para>Used by <command>memusage</command> (included in EGLIBC, but
+          <para>Used by <command>memusage</command> (included in GLIBC, but
           not built in a base CLFS system as it has additional dependencies)
           to help collect information about the memory usage of a program</para>
           <indexterm zone="ch-system-eglibc libmemusage">
+          <indexterm zone="ch-system-glibc libmemusage">
             <primary sortas="c-libmemusage">libmemusage</primary>
           </indexterm>
 …
         <listitem>
           <para>The network services library</para>
           <indexterm zone="ch-system-eglibc libnsl">
+          <indexterm zone="ch-system-glibc libnsl">
             <primary sortas="c-libnsl">libnsl</primary>
           </indexterm>
 …
           resolving host names, user names, group names, aliases, services,
           protocols, etc.</para>
           <indexterm zone="ch-system-eglibc libnss">
+          <indexterm zone="ch-system-glibc libnss">
             <primary sortas="c-libnss">libnss</primary>
           </indexterm>
 …
           <para>Contains profiling functions used to track the amount of CPU
           time spent in specific source code lines</para>
           <indexterm zone="ch-system-eglibc libpcprofile">
+          <indexterm zone="ch-system-glibc libpcprofile">
             <primary sortas="c-libpcprofile">libpcprofile</primary>
           </indexterm>
 …
         <listitem>
           <para>The POSIX threads library</para>
           <indexterm zone="ch-system-eglibc libpthread">
+          <indexterm zone="ch-system-glibc libpthread">
             <primary sortas="c-libpthread">libpthread</primary>
           </indexterm>
 …
           <para>Contains functions for creating, sending, and interpreting
           packets to the Internet domain name servers</para>
           <indexterm zone="ch-system-eglibc libresolv">
+          <indexterm zone="ch-system-glibc libresolv">
             <primary sortas="c-libresolv">libresolv</primary>
           </indexterm>
 …
         <listitem>
           <para>Contains functions providing miscellaneous RPC services</para>
           <indexterm zone="ch-system-eglibc librpcsvc">
+          <indexterm zone="ch-system-glibc librpcsvc">
             <primary sortas="c-librpcsvc">librpcsvc</primary>
           </indexterm>
 …
           <para>Contains functions providing most of the interfaces specified by
           the POSIX.1b Realtime Extension</para>
           <indexterm zone="ch-system-eglibc librt">
+          <indexterm zone="ch-system-glibc librt">
             <primary sortas="c-librt">librt</primary>
           </indexterm>
 …
           <para>Contains functions useful for
           building debuggers for multi-threaded programs</para>
           <indexterm zone="ch-system-eglibc libthread_db">
+          <indexterm zone="ch-system-glibc libthread_db">
             <primary sortas="c-libthread_db">libthread_db</primary>
           </indexterm>
 …
           <para>Contains code for <quote>standard</quote> functions used in
           many different Unix utilities</para>
           <indexterm zone="ch-system-eglibc libutil">
+          <indexterm zone="ch-system-glibc libutil">
             <primary sortas="c-libutil">libutil</primary>
           </indexterm>

BOOK/final-system/common/gmp.xml

-              r88ef769
+              r03e6a40
 <screen os="i"><userinput>make install</userinput></screen>
+    <para os="j">Install the documentation:</para>
+<screen os="k"><userinput>mkdir -v /usr/share/doc/gmp-&gmp-version;
+cp -v doc/{isa_abi_headache,configuration} doc/*.html \
+    /usr/share/doc/gmp-&gmp-version;</userinput></screen>
   </sect2>
 …
     <segmentedlist>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
       <seglistitem>
+        <seg>libgmp.[a,so], libgmpxx.[a,so], libmp.[a,so]</seg>
+        <seg>libgmp.[a,so], libgmpxx.[a,so]</seg>
+        <seg>/usr/share/doc/gmp-&gmp-version;</seg>
       </seglistitem>
     </segmentedlist>
 …
       </varlistentry>
-      <varlistentry id="libmp">
-        <term><filename class="libraryfile">libmp</filename></term>
-        <listitem>
-          <para>Contains the Berkeley MP compatibility library.</para>
-          <indexterm zone="ch-system-gmp libmp">
-            <primary sortas="c-libmp">libmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
     </variablelist>

BOOK/final-system/common/iana-etc.xml

-              r88ef769
+              r03e6a40
     <title>Installation of Iana-Etc</title>
+    <note os="p1">
+      <para>This package has the option of downloading updated data when internet access is available. If /etc/resolv.conf has a nameserver entry and internet access is available at this step, then apply the IANA get patch and get the updated data:
+<screen><command>patch -Np1 -i ../&iana-etc-get_fix-patch;</command>
+<command>make get</command></screen>
+Do not apply the following patch.</para>
+    </note>
+    <para os="p2">The following patch updates the services and protocol xml files:</para>
+    <para os="p2">The following patch updates the services and protocol files:</para>
+<screen os="p3"><userinput>patch -Np1 -i ../&iana-etc-numbers_update-patch;</userinput></screen>
+<screen os="p3"><userinput>xzcat ../&iana-etc-numbers_update-patch; | patch -Np1 -i -</userinput></screen>
     <para os="a">The following command converts the raw data provided by IANA into

BOOK/final-system/common/iproute2.xml

-              r88ef769
+              r03e6a40
 <screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
 sed -i '/ARPD/d' Makefile
 rm -v man/man8/arpd.8</userinput></screen>
+sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
     <para os="f1">Remove unused libnl headers:</para>
 …
     <para os="a">Compile the package:</para>
+<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+    MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make DESTDIR= MANDIR=/usr/share/man</userinput></screen>
     <variablelist os="c">
 …
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><parameter>DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</parameter></term>
-        <listitem>
-          <para>The DESTDIR=/ parameter would cause documentation to be
-          installed into <filename class="directory">/share/doc</filename> and
-          <filename class="directory">/share/man</filename>. These options
-          ensure the docs are installed to the correct locations.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
 …
     <para os="e">Install the package:</para>
 <screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
     MANDIR=/usr/share/man install</userinput></screen>
 …
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
+        <seg>/etc/iproute2, /lib/tc, /usr/lib/tc, /usr/share/doc/iproute2</seg>
+        <seg>/etc/iproute2, /usr/lib/tc,
+        /usr/share/doc/iproute2-&iproute2-version;</seg>
       </seglistitem>
     </segmentedlist>
 …
           delete the multicast routing</para>
           <para><command>ip monitor</command> allows users to continously monitor
+          <para><command>ip monitor</command> allows users to continuously monitor
           the state of devices, addresses and routes</para>
           <indexterm zone="ch-system-iproute2 ip">

BOOK/final-system/common/iputils.xml

r88ef769	r03e6a40
32	32	<para os="a">Compile the package:</para>
33	33
34		<screen os="b"><userinput>make ~~USE_CAP=no~~ \
	34	<screen os="b"><userinput>make \
35	35	IPV4_TARGETS="tracepath ping clockdiff rdisc" \
36	36	IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>

BOOK/final-system/common/isl.xml

-              r88ef769
+              r03e6a40
 <screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib
 mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
+mv -v /usr/lib/libisl*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
   </sect2>
 …
     <segmentedlist>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
       <seglistitem>
         <seg>libisl.[a,so]</seg>
+        <seg>/usr/include/isl</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/kbd.xml

-              r88ef769
+              r03e6a40
 <screen os="g"><userinput>make install</userinput></screen>
+    <para os="h">Some of the programs from Kbd are used by scripts
+    in the CLFS-Bootscripts package. As <filename
+    class="directory">/usr</filename> may not be available during the early
+    stages of booting, those binaries need to be on the root partition:</para>
+<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont,setvtrgb} /bin</userinput></screen>
+    <para os="h">Some of the programs from Kbd are used by Systemd to
+    initialize the system, those binaries need to be on the root
+    partition:</para>
+<screen os="i"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
+    <para os="j">Install the documentation:</para>
+<screen os="k"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
+cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
   </sect2>
 …
         unicode_start, and unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
+        /usr/share/doc/kbd-&kbd-version;,
         /usr/share/keymaps, /usr/share/unimaps</seg>
       </seglistitem>

BOOK/final-system/common/kmod.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>./configure --prefix=/usr \
     --bindir=/bin --sysconfdir=/etc \
     --with-rootlibdir=/lib --disable-manpages \
+    --with-rootlibdir=/lib \
     --with-zlib --with-xz</userinput></screen>
 …
 <screen os="j"><userinput>ln -sfv kmod /bin/lsmod
+ln -sfv ../bin/kmod /sbin/depmod
+ln -sfv ../bin/kmod /sbin/insmod
+ln -sfv ../bin/kmod /sbin/modprobe
+ln -sfv ../bin/kmod /sbin/modinfo
+ln -sfv ../bin/kmod /sbin/rmmod</userinput></screen>
+for tool in depmod insmod modprobe modinfo rmmod; do
+ln -sfv ../bin/kmod /sbin/${tool}
+done</userinput></screen>
   </sect2>
 …
       <seglistitem>
+        <seg>depmod, insmod, kmod, lsmod, modinfo, modprobe, and
+        rmmod</seg>
+        <seg>depmod (link to kmod), insmod (link to kmod), kmod,
+        lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod),
+        and rmmod (link to kmod) </seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/man-pages.xml

r88ef769	r03e6a40
18	18	<title/>
19	19
20		<para>The Man-pages package contains over ~~1,2~~00 man pages.</para>
	20	<para>The Man-pages package contains over 2,100 man pages.</para>
21	21
22	22	</sect2>

BOOK/final-system/common/man.xml

r88ef769	r03e6a40
50	50	<para os="h">Prepare Man for compilation:</para>
51	51
52		<screen os="i"><userinput>./configure -confdir=/etc</userinput></screen>
	52	<screen os="i"><userinput>./configure -confdir=/etc -mandir=/usr/share/man</userinput></screen>
53	53
54	54	<variablelist os="j">

BOOK/final-system/common/mpfr.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
   ./configure --prefix=/usr --enable-shared \
     --with-gmp=/usr</userinput></screen>
+  ./configure --prefix=/usr --with-gmp=/usr \
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
     <para os="c">Compile the package:</para>
 …
       <seglistitem>
         <seg>libmpfr.[a,so]</seg>
         <seg>/usr/share/doc/mpfr</seg>
+        <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/ncurses.xml

-              r88ef769
+              r03e6a40
     <para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
+<screen os="k"><userinput>rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
+ln -svf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
+ln -svf ../../lib/libmenuw.so.5 /usr/lib/libmenuw.so
+ln -svf ../../lib/libpanelw.so.5 /usr/lib/libpanelw.so
+ln -svf ../../lib/libformw.so.5 /usr/lib/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib/$(readlink /lib/libncursesw.so) /usr/lib/libncursesw.so
+ln -svf ../../lib/$(readlink /lib/libmenuw.so) /usr/lib/libmenuw.so
+ln -svf ../../lib/$(readlink /lib/libpanelw.so) /usr/lib/libpanelw.so
+ln -svf ../../lib/$(readlink /lib/libformw.so) /usr/lib/libformw.so
+rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
     <para os="l">Now we will make our Ncurses compatible for older and non-widec compatible programs
 …
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a
 ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
-    <para os="n">Now we will create a symlink for /usr/share/terminfo in
-    <filename class="directory">/usr/lib</filename> for compatibility:</para>
-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib/terminfo</userinput></screen>
   </sect2>

BOOK/final-system/common/perl.xml

-              r88ef769
+              r03e6a40
     <note os="a00">
       <para>If you are following the boot method you will need to enable the
+      loopback device as well as set a hostname for some of the tests:</para>
+  <screen os="a01"><userinput remap="test">ip link set lo up
+hostname clfs</userinput></screen>
+      loopback device:</para>
+<screen><userinput remap="test">ip link set lo up</userinput></screen>
     </note>
     <para os="a02">Before starting to configure, create a basic
+    <para os="a01">Before starting to configure, create a basic
     <filename>/etc/hosts</filename> file which will be referenced by one
     of Perl's configuration files as well as used by the testsuite:</para>
 <screen os="a03"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
+<screen os="a02"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
     <para os="a">To have full control over the way Perl is set up, you can
 …
         <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
         <listitem>
+          <para>This corrects an error in the way that <command>perldoc</command>
+          invokes the <command>less</command> program.</para>
+          <para>This ensures that <command>perldoc</command> invokes the
+          <command>less</command> program rather than <command>more</command>,
+          as Less has not yet been installed.</para>
         </listitem>
       </varlistentry>

BOOK/final-system/common/pkg-config-lite.xml

-              r88ef769
+              r03e6a40
     <para os="a">Prepare Pkg-config-lite for compilation:</para>
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version;</userinput></screen>
     <para os="c">Compile the package:</para>
 …
       <seglistitem>
         <seg>pkg-config</seg>
         <seg>/usr/share/doc/pkg-config</seg>
+        <seg>/usr/share/doc/pkg-config-&pkg-config-lite-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/pkgmgt.xml

r88ef769	r03e6a40
219	219	commercial distributions. Examples of package managers that follow this
220	220	approach are RPM (which, incidentally, is required by the <ulink
221		url="http://~~lsbbook.gforge.freestandards.org/package.html#RPM~~">Linux
	221	url="http://refspecs.linuxfoundation.org/lsb.shtml">Linux
222	222	Standard Base Specification</ulink>), pkg-utils, Debian's apt, and
223	223	Gentoo's Portage system. A hint describing how to adopt this style of

BOOK/final-system/common/procps-ng.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-procps" role="wrap">
   <?dbhtml filename="procps.html"?>
   <title>Procps-&procps-version;</title>
   <indexterm zone="ch-system-procps">
     <primary sortas="a-Procps">Procps</primary>
+<sect1 id="ch-system-procps-ng" role="wrap">
+  <?dbhtml filename="procps-ng.html"?>
+  <title>Procps-ng-&procps-ng-version;</title>
+  <indexterm zone="ch-system-procps-ng">
+    <primary sortas="a-Procps-ng">Procps-ng</primary>
   </indexterm>
 …
     <title/>
     <para>The Procps package contains programs for monitoring
+    <para>The Procps-ng package contains programs for monitoring
     processes.</para>
 …
   <sect2 role="installation">
+    <title>Installation of Procps</title>
+    <para os="p1">The following patch adds process control group support to
+    ps:</para>
+<screen os="p2"><userinput>patch -Np1 -i ../&procps-ps_cgroup-patch;</userinput></screen>
+    <para os="p3">The following patch fixes an issue where some procps utils
+    print an error on the screen if the monitor isn't running at 60Hz:</para>
+<screen os="p4"><userinput>patch -Np1 -i ../&procps-fix_HZ_errors-patch;</userinput></screen>
+    <para os="s1">The following fixes an issue with Make 3.82:</para>
+<screen os="s2"><userinput>sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile</userinput></screen>
+    <para os="a">Compile the package:</para>
+<screen os="b"><userinput>make</userinput></screen>
+    <para os="c">This package does not come with a test suite.</para>
+    <para os="d">Install the package:</para>
+<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install</userinput></screen>
+    <title>Installation of Procps-ng</title>
+    <para os="a">Prepare procps-ng for compilation:</para>
+<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix= \
+    --libdir=/usr/lib --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+    --disable-kill</userinput></screen>
+    <variablelist os="c">
+      <title>The meaning of the configure options:</title>
+      <varlistentry>
+        <term><parameter>--disable-kill</parameter></term>
+        <listitem>
+          <para>This switch disables building the kill command that
+          was installed in the util-linux package.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para os="d">Compile the package:</para>
+<screen os="e"><userinput>make</userinput></screen>
+    <note os="note1">
+      <para>When using the boot method, two tests will fail if the hostname is
+      not set:</para>
+<screen><userinput remap="test">hostname clfs</userinput></screen>
+    </note>
+    <para os="f">Remove the test which fails when scripting does not use a tty
+    device. Run the following commands:</para>
+<screen os="g"><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
+make check</userinput></screen>
+    <para os="h">Install the package:</para>
+<screen os="i"><userinput>make install</userinput></screen>
+    <para os="j">Move essential files to a location that can be found if <filename class="directory">/usr</filename> is not mounted.</para>
+<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
+mv -v /usr/lib/libprocps.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
   </sect2>
   <sect2 id="contents-procps" role="content">
     <title>Contents of Procps</title>
+  <sect2 id="contents-procps-ng" role="content">
+    <title>Contents of Procps-ng</title>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed library</segtitle>
+      <segtitle>Installed directories</segtitle>
       <seglistitem>
+        <seg>free, pgrep, pkill, pmap, ps, pwdx, skill, slabtop, snice, sysctl,
+        tload, top, uptime, vmstat, w, and watch</seg>
+        <seg>libproc.so</seg>
+        <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop, sysctl, tload,
+        top, uptime, vmstat, w, and watch</seg>
+        <seg>libprocps.{a,so}</seg>
+        <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
       </seglistitem>
     </segmentedlist>
 …
           <para>Reports the amount of free and used memory (both physical and
           swap memory) in the system</para>
           <indexterm zone="ch-system-procps free">
+          <indexterm zone="ch-system-procps-ng free">
             <primary sortas="b-free">free</primary>
           </indexterm>
 …
         <listitem>
           <para>Looks up processes based on their name and other attributes</para>
           <indexterm zone="ch-system-procps pgrep">
+          <indexterm zone="ch-system-procps-ng pgrep">
             <primary sortas="b-pgrep">pgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      <varlistentry id="pidof">
+        <term><command>pidof</command></term>
+        <listitem>
+          <para>Looks up processes based on their name and other attributes</para>
+          <indexterm zone="ch-system-procps-ng pidof">
+            <primary sortas="b-pidof">pidof</primary>
           </indexterm>
         </listitem>
 …
         <listitem>
           <para>Signals processes based on their name and other attributes</para>
           <indexterm zone="ch-system-procps pkill">
+          <indexterm zone="ch-system-procps-ng pkill">
             <primary sortas="b-pkill">pkill</primary>
           </indexterm>
 …
         <listitem>
           <para>Reports the memory map of the given process</para>
           <indexterm zone="ch-system-procps pmap">
+          <indexterm zone="ch-system-procps-ng pmap">
             <primary sortas="b-pmap">pmap</primary>
           </indexterm>
 …
         <listitem>
           <para>Lists the current running processes</para>
           <indexterm zone="ch-system-procps ps">
+          <indexterm zone="ch-system-procps-ng ps">
             <primary sortas="b-ps">ps</primary>
           </indexterm>
 …
         <listitem>
           <para>Reports the current working directory of a process</para>
           <indexterm zone="ch-system-procps pwdx">
+          <indexterm zone="ch-system-procps-ng pwdx">
             <primary sortas="b-pwdx">pwdx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="skill">
-        <term><command>skill</command></term>
-        <listitem>
-          <para>Sends signals to processes matching the given criteria</para>
-          <indexterm zone="ch-system-procps skill">
-            <primary sortas="b-skill">skill</primary>
           </indexterm>
         </listitem>
 …
         <listitem>
           <para>Displays detailed kernel slab cache information in real time</para>
           <indexterm zone="ch-system-procps slabtop">
+          <indexterm zone="ch-system-procps-ng slabtop">
             <primary sortas="b-slabtop">slabtop</primary>
           </indexterm>
 …
       </varlistentry>
-      <varlistentry id="snice">
-        <term><command>snice</command></term>
-        <listitem>
-          <para>Changes the scheduling priority of processes matching the given
-          criteria</para>
-          <indexterm zone="ch-system-procps snice">
-            <primary sortas="b-snice">snice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
       <varlistentry id="sysctl">
 …
         <listitem>
           <para>Modifies kernel parameters at run time</para>
           <indexterm zone="ch-system-procps sysctl">
+          <indexterm zone="ch-system-procps-ng sysctl">
             <primary sortas="b-sysctl">sysctl</primary>
           </indexterm>
 …
         <listitem>
           <para>Prints a graph of the current system load average</para>
           <indexterm zone="ch-system-procps tload">
+          <indexterm zone="ch-system-procps-ng tload">
             <primary sortas="b-tload">tload</primary>
           </indexterm>
 …
           <para>Displays a list of the most CPU intensive processes; it
           provides an ongoing look at processor activity in real time</para>
           <indexterm zone="ch-system-procps top">
+          <indexterm zone="ch-system-procps-ng top">
             <primary sortas="b-top">top</primary>
           </indexterm>
 …
           <para>Reports how long the system has been running, how many users are
           logged on, and the system load averages</para>
           <indexterm zone="ch-system-procps uptime">
+          <indexterm zone="ch-system-procps-ng uptime">
             <primary sortas="b-uptime">uptime</primary>
           </indexterm>
 …
           processes, memory, paging, block Input/Output (IO), traps, and CPU
           activity</para>
           <indexterm zone="ch-system-procps vmstat">
+          <indexterm zone="ch-system-procps-ng vmstat">
             <primary sortas="b-vmstat">vmstat</primary>
           </indexterm>
 …
           <para>Shows which users are currently logged on, where, and since
           when</para>
           <indexterm zone="ch-system-procps w">
+          <indexterm zone="ch-system-procps-ng w">
             <primary sortas="b-w">w</primary>
           </indexterm>
 …
           screen-full of its output; this allows a user to watch the output
           change over time</para>
           <indexterm zone="ch-system-procps watch">
+          <indexterm zone="ch-system-procps-ng watch">
             <primary sortas="b-watch">watch</primary>
           </indexterm>
 …
       </varlistentry>
       <varlistentry id="libproc">
         <term><filename class="libraryfile">libproc</filename></term>
+      <varlistentry id="libprocps">
+        <term><filename class="libraryfile">libprocps</filename></term>
         <listitem>
           <para>Contains the functions used by most programs in this
           package</para>
           <indexterm zone="ch-system-procps libproc">
             <primary sortas="c-libproc">libproc</primary>
+          <indexterm zone="ch-system-procps-ng libprocps">
+            <primary sortas="c-libprocps">libprocps</primary>
           </indexterm>
         </listitem>

BOOK/final-system/common/psmisc.xml

-              r88ef769
+              r03e6a40
 <screen os="j"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen>
-    <para os="k">By default, Psmisc's <command>pidof</command> program is not installed.
-    This usually is not a problem because it is installed later in the Sysvinit
-    package, which provides a better <command>pidof</command> program. If
-    Sysvinit will not be used for a particular system, complete the installation
-    of Psmisc by creating the following symlink:</para>
-<screen os="l" role="nodump"><userinput>ln -sv killall /bin/pidof</userinput></screen>
   </sect2>

BOOK/final-system/common/readline.xml

-              r88ef769
+              r03e6a40
     <para os="f">Install the package:</para>
 <screen os="g"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make htmldir=/usr/share/doc/readline-&readline-version; install</userinput></screen>
     <para os="h">Install the documentation:</para>
+    <para os="h">Now move the static libraries to a more appropriate location:</para>
 <screen os="i"><userinput>make install-doc</userinput></screen>
+<screen os="i"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
     <para os="j">Now move the static libraries to a more appropriate location:</para>
+    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename>.</para>
+<screen os="k"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
+    <para os="l">Next, remove the <filename class="extension">.so</filename>
+    files in <filename class="directory">/lib</filename> and relink them into
+    <filename class="directory">/usr/lib</filename>.</para>
+<screen os="m"><userinput>rm -v /lib/lib{readline,history}.so
+ln -svf ../../lib/libreadline.so.&readline-version2; /usr/lib/libreadline.so
+ln -svf ../../lib/libhistory.so.&readline-version2; /usr/lib/libhistory.so</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib/$(readlink /lib/libreadline.so) /usr/lib/libreadline.so
+ln -svf ../../lib/$(readlink /lib/libhistory.so) /usr/lib/libhistory.so
+rm -v /lib/lib{readline,history}.so</userinput></screen>
   </sect2>
 …
       <seglistitem>
         <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
         <seg>/usr/include/readline, /usr/share/readline</seg>
+        <seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/sed.xml

-              r88ef769
+              r03e6a40
     <para os="a">Prepare Sed for compilation:</para>
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
+    --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
     <para os="c">Compile the package:</para>
 …
       <seglistitem>
         <seg>sed</seg>
         <seg>/usr/share/doc/sed</seg>
+        <seg>/usr/share/doc/sed-&sed-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/shadow.xml

-              r88ef769
+              r03e6a40
       command below.</para>
     </note>
     <para os="b">Disable the installation of the <command>groups</command> and
 …
   </variablelist>
     <para os="h">Compile the package:</para>
 …
       <seglistitem>
         <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
+        <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
         lastlog, login, logoutd, newgrp, newusers, passwd, pwck,

BOOK/final-system/common/tar.xml

-              r88ef769
+              r03e6a40
 <screen os="i"><userinput>perl tarman > /usr/share/man/man1/tar.1</userinput></screen>
+    <para os="j">Install the documentation:</para>
+<screen os="k"><userinput>make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
   </sect2>
 …
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
       <seglistitem>
         <seg>rmt and tar</seg>
+        <seg>/usr/share/doc/tar-&tar-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/temp-perl.xml

-              r88ef769
+              r03e6a40
 <screen os="j"><userinput>make install</userinput></screen>
-    <para os="k">Finally, create a necessary symlink:</para>
-<screen os="l"><userinput>ln -sfv /tools/bin/perl /usr/bin</userinput></screen>
   </sect2>

BOOK/final-system/common/util-linux.xml

-              r88ef769
+              r03e6a40
     <title>Installation of Util-linux</title>
+    <note os="n">
+      <para><command>findmnt</command>, and <command>lsblk</command> can
+      utilize <filename class="libraryfile">libudev</filename> for WWN and serial
+      number information. If this is desired, rebuild Util-linux after
+      <xref linkend="ch-system-systemd"/></para>
+    </note>
     <para os="a">Prepare Util-linux for compilation:</para>
 <screen os="b"><userinput>./configure --enable-write</userinput></screen>
+<screen os="b"><userinput>./configure --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
     <variablelist os="c">
 …
 <screen os="e"><userinput>make</userinput></screen>
-    <para os="dummy1">Create two <systemitem class="groupname">dummy</systemitem> groups and a <systemitem class="username">dummy</systemitem> user to be used during Util-linux and Coreutils test suites:</para>
-<screen os="dummy2"><userinput remap="test">echo "dummy1:x:1000:" &gt;&gt; /etc/group
-echo "dummy2:x:1001:dummy" &gt;&gt; /etc/group
-echo "dummy:x:1000:1000::/root:/bin/bash" &gt;&gt; /etc/passwd</userinput></screen>
     <para os="f">To test the results, issue:</para>
 <screen os="f2"><userinput remap="test">chown -Rv dummy . &amp;&amp;
 su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
+<screen os="f2"><userinput remap="test">chown -Rv nobody . &amp;&amp;
+su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
     <para os="g">Install the package:</para>
 <screen os="h"><userinput>make install</userinput></screen>
-    <para os="i">Move the <command>logger</command> binary to
-    <filename class="directory">/bin</filename> as it is needed by the
-    CLFS-Bootscripts package:</para>
-<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
   </sect2>
 …
         <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
         <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
+        /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
+        /usr/share/bash-completion,
+        /usr/share/doc/util-linux-&util-linux-version;/getopt,
+        /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
 …
           <indexterm zone="ch-system-util-linux cytune">
             <primary sortas="b-cytune">cytune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="ddate">
-        <term><command>ddate</command></term>
-        <listitem>
-          <para>Gives the Discordian date or converts the given Gregorian date
-          to a Discordian one</para>
-          <indexterm zone="ch-system-util-linux ddate">
-            <primary sortas="b-ddate">ddate</primary>
           </indexterm>
         </listitem>
 …
         <term><command>lscpu</command></term>
         <listitem>
           <para>Prints CPU architechture information</para>
+          <para>Prints CPU architecture information</para>
           <indexterm zone="ch-system-util-linux lscpu">
             <primary sortas="b-lscpu">lscpu</primary>

BOOK/final-system/common/vim.xml

-              r88ef769
+              r03e6a40
     --prefix=/usr --enable-multibyte</userinput></screen>
-    <variablelist os="f">
-      <title>The meaning of the configure options:</title>
-      <varlistentry>
-        <term><parameter>--enable-multibyte</parameter></term>
-        <listitem>
-          <para>This optional but highly recommended switch enables support
-          for editing files in multibyte character encodings. This is needed
-          if using a locale with a multibyte character set. This switch is
-          also helpful to be able to edit text files initially created in
-          Linux distributions like Fedora that use UTF-8 as a default
-          character set.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
     <para os="g">Compile the package:</para>
 …
     <para os="j">Install the package:</para>
 <screen os="k"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
     <para os="l">Many users are accustomed to using <command>vi</command>
 …
 <screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
+<para os="n">By default, Vim's documentation is installed in
+<filename class="directory">/usr/share/vim</filename>.  The following symlink
+allows the documentation to be accessed via
+<filename class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
+it consistent with the location of documentation for other packages:</para>
+<screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
+    <para os="p">If an X Window System is going to be installed on the CLFS
+    <para os="n">If an X Window System is going to be installed on the CLFS
     system, you may want to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
 …
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
       <seglistitem>
 …
         tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
         vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg>
         <seg>/usr/share/vim</seg>
+        <seg>/usr/share/vim, /usr/share/doc/vim-&vim-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/xz.xml

-              r88ef769
+              r03e6a40
   <?dbhtml filename="xz.html"?>
   <title>XZ-Utils-&xz-version;</title>
+  <title>XZ Utils-&xz-version;</title>
   <indexterm zone="ch-system-xz">
     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
   </indexterm>
 …
     <title/>
     <para>The XZ-Utils package contains programs for compressing and
     decompressing files. Compressing text files with <command>XZ-Utils</command>
+    <para>The XZ Utils package contains programs for compressing and
+    decompressing files. Compressing text files with <command>XZ Utils</command>
     yields a much better compression percentage than with the traditional
     <command>gzip</command>.</para>
 …
   <sect2 role="installation">
     <title>Installation of XZ-Utils</title>
     <para os="a">Prepare XZ-Utils for compilation:</para>
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+    <title>Installation of XZ Utils</title>
+    <para os="a">Prepare XZ Utils for compilation:</para>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
     <para os="c">Compile the package:</para>
 …
 <screen os="k"><userinput>mv -v /usr/lib/liblzma.so.* /lib
 ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
+ln -sfv ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
   </sect2>
   <sect2 id="contents-xz" role="content">
     <title>Contents of XZ-Utils</title>
+    <title>Contents of XZ Utils</title>
     <segmentedlist>
 …
         and xzmore</seg>
         <seg>liblzma.[a,so]</seg>
         <seg>/usr/include/lzma, /usr/share/doc/xz</seg>
+        <seg>/usr/include/lzma, /usr/share/doc/xz-&xz-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/zlib.xml

r88ef769	r03e6a40
52	52
53	53	<screen os="i"><userinput>mv -v /usr/lib/libz.so.* /lib
54		ln -s~~vf ../../lib/libz.so.1~~ /usr/lib/libz.so</userinput></screen>
	54	ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
55	55
56	56	</sect2>

BOOK/final-system/mips-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>

BOOK/final-system/mips/gcc.xml

-              r88ef769
+              r03e6a40
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='fix2'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='z'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
   </sect2>

BOOK/final-system/mips/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <title>EGLIBC-&eglibc-version;</title>
+<sect1 id="ch-system-glibc" role="wrap">
+  <title>GLIBC-&glibc-version;</title>
   <?dbhtml filename="eglibc.html"?>
+  <?dbhtml filename="glibc.html"?>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../ppc/glibc.xml"
   xpointer="xpointer(id('conf-ld'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/mips64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>

BOOK/final-system/mips64-64/gcc.xml

-              r88ef769
+              r03e6a40
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='fix2'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='z'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
   </sect2>

BOOK/final-system/mips64-64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../mips64/eglibc-64bit.xml"
+    href="../mips64/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../mips64/eglibc-64bit.xml"
+    href="../mips64/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l5'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
     <para>Now we will force EGLIBC to build as 64-bit instead of the default
+    <para>Now we will force GLIBC to build as 64-bit instead of the default
     n32 with the following sed:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='u'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../mips/eglibc.xml"
+  href="../mips/glibc.xml"
   xpointer="xpointer(id('conf-ld'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/mips64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-n32.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-n32.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>

BOOK/final-system/mips64/binutils.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 …
     xpointer="xpointer(//*[@os='s'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
   </sect2>

BOOK/final-system/mips64/gcc.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 …
     --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
+    --enable-checking=release --enable-libstdcxx-time \
+    --disable-install-libiberty</userinput></screen>
+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/mips64/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
+<sect1 id="ch-system-glibc" role="wrap">
   <?dbhtml filename="glibc-64bit.html"?>
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="eglibc.xml"
+  href="glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <para os="m3">The following will cause EGLIBC to use an absolute path to the
+    <para os="m3">The following will cause GLIBC to use an absolute path to the
     ldd-rewrite-script instead of a relative path:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='h'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <sect2 id="conf-ld" role="configuration">
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/mips64/glibc-n32.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc-n32" role="wrap">
   <?dbhtml filename="eglibc-n32.html"?>
+<sect1 id="ch-system-glibc-n32" role="wrap">
+  <?dbhtml filename="glibc-n32.html"?>
   <title>EGLIBC-&eglibc-version; N32</title>
+  <title>GLIBC-&glibc-version; N32</title>
   <indexterm zone="ch-system-eglibc-n32">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc-n32">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="eglibc.xml"
+  href="glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc-64bit.xml"
+    href="glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc-64bit.xml"
+    href="glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <para os="m1">Tell EGLIBC to install its 32-bit libraries into
+    <para os="m1">Tell GLIBC to install its 32-bit libraries into
     <filename class="directory">/lib32</filename>:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib32/eglibc --libdir=/usr/lib32 \
+    --libexecdir=/usr/lib32/glibc --libdir=/usr/lib32 \
     --enable-obsolete-rpc</userinput></screen>
 …
       <varlistentry>
         <term><parameter>--libexecdir=/usr/lib32/eglibc</parameter></term>
+        <term><parameter>--libexecdir=/usr/lib32/glibc</parameter></term>
         <listitem>
           <para>This changes the location of the <command>getconf</command>
           program from its default of <filename
           class="directory">/usr/libexec</filename> to <filename
           class="directory">/usr/lib32/eglibc</filename>.</para>
+          class="directory">/usr/lib32/glibc</filename>.</para>
         </listitem>
       </varlistentry>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/final-system/mips64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc-32" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc-32" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
+  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
   <indexterm zone="ch-system-eglibc-32">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc-32">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='l1b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='l2b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/final-system/multilib/automake.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/binutils.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 …
     xpointer="xpointer(//*[@os='s'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
   </sect2>

BOOK/final-system/multilib/bison-64bit.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='t3'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='t4'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64  --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" M4=m4 \
+    ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/bison-n32.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='t3'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='t4'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32  --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" M4=m4 \
+    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/bison.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='t3'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='t4'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr  --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" M4=m4 \
+    ./configure --prefix=/usr</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/bzip2-64bit.xml

-              r88ef769
+              r03e6a40
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
     <para os="m1">We need to change the default lib path

BOOK/final-system/multilib/bzip2-n32.xml

-              r88ef769
+              r03e6a40
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
     <para os="m1">We need to change the default lib path

BOOK/final-system/multilib/bzip2.xml

-              r88ef769
+              r03e6a40
     href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/cloog-64bit.xml

-              r88ef769
+              r03e6a40
   ./configure --prefix=/usr \
     --libdir=/usr/lib64 --enable-shared --with-isl=system</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/cloog-n32.xml

-              r88ef769
+              r03e6a40
   ./configure --prefix=/usr \
     --libdir=/usr/lib32 --enable-shared --with-isl=system</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/cloog.xml

-              r88ef769
+              r03e6a40
   ./configure --prefix=/usr \
     --host=${CLFS_TARGET32} --enable-shared --with-isl=system</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/coreutils.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='t'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
   </sect2>

BOOK/final-system/multilib/dbus.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eudev-32" role="wrap">
   <?dbhtml filename="eudev.html"?>
+<sect1 id="ch-system-dbus-32" role="wrap">
+  <?dbhtml filename="dbus.html"?>
   <title>Eudev-&eudev-version; 32 Bit Libraries</title>
+  <title>D-Bus-&dbus-version; 32 Bit Libraries</title>
+  <indexterm zone="ch-system-eudev-32">
+    <primary sortas="a-Eudev">Eudev 32 Bit Libraries</primary>
+    <secondary>32 Bit</secondary>
+  <indexterm zone="ch-system-dbus-32">
+    <primary sortas="a-D-Bus">D-Bus 32 Bit Libraries</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eudev.xml"
+  href="../common/dbus.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of Eudev</title>
+    <title>Installation of D-Bus</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
+CC="gcc ${BUILD32}" ./configure --prefix=/usr --sysconfdir=/etc \
+    --with-rootprefix="" --libexecdir=/lib --enable-split-usr \
+    --libdir=/usr/lib --with-rootlibdir=/lib --sbindir=/sbin --bindir=/sbin \
+    --enable-rule_generator --disable-introspection --disable-keymap \
+    --disable-gudev --disable-gtk-doc-html --enable-libkmod</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" USE_ARCH=32 PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='e2'])"/>
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='h'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
   </sect2>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eudev" role="."/></para>
+    linkend="contents-dbus" role="."/></para>
   </sect2>

BOOK/final-system/multilib/diffutils.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/diffutils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
+    xpointer="xpointer(//*[@os='s3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+    xpointer="xpointer(//*[@os='s4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/e2fsprogs-64bit.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='c'])"/>
+<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+CC="gcc ${BUILD64}"  \
+../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \

BOOK/final-system/multilib/e2fsprogs-n32.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='c'])"/>
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+CC="gcc ${BUILDN32}" \
+../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \

BOOK/final-system/multilib/e2fsprogs.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='c'])"/>
+<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+CC="gcc ${BUILD32}" \
+../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \

BOOK/final-system/multilib/flex-64bit.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" M4=m4 ./configure --prefix=/usr \
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='g'])"/>
+    <para os="h">There are some packages that expect to find the
+    <filename class="libraryfile">lex</filename> library in <filename
+    class="directory">/usr/lib64</filename>. Create a symlink to account for
+    this:</para>
+<screen os="i"><userinput>ln -sv libfl.a /usr/lib64/libl.a</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
   </sect2>

BOOK/final-system/multilib/flex-n32.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" M4=m4 ./configure --prefix=/usr \
+   --libdir=/usr/lib32 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='g'])"/>
-    <para os="h">There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib32</filename>. Create a symlink to account for
-    this:</para>
-<screen os="i"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
   </sect2>

BOOK/final-system/multilib/flex.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" M4=m4 ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='c'])"/>
 <screen os="d"><userinput>make libfl.a libfl_pic.a</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='f'])"/>
+<screen os="g"><userinput>make install-libLIBRARIES</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="g"><userinput>make install</userinput></screen>
   </sect2>

BOOK/final-system/multilib/gawk.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='g'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
   </sect2>

BOOK/final-system/multilib/gcc.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 …
     --enable-__cxa_atexit --enable-c99 --enable-long-long \
     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
+    --enable-checking=release --enable-libstdcxx-time \
+    --disable-install-libiberty</userinput></screen>
+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/gettext-64bit.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+   ./configure --prefix=/usr --libdir=/usr/lib64 \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/gettext-n32.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+   ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+   ./configure --prefix=/usr --libdir=/usr/lib32 \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/gettext.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+   ./configure --prefix=/usr</userinput></screen>
+   ./configure --prefix=/usr \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc-64bit.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc-64bit.html"?>
   <title>Glibc-&eglibc-version; 64-Bit</title>
+  <title>Glibc-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="eglibc.xml"
+  href="glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <para os="m1">Tell EGLIBC to install its 64-bit libraries into
+    <para os="m1">Tell GLIBC to install its 64-bit libraries into
     <filename class="directory">/lib64</filename>:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <sect2 id="conf-ld" role="configuration">
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/multilib/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc-32" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc-32" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
+  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
   <indexterm zone="ch-system-eglibc-32">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc-32">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
+    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32} \
     --enable-obsolete-rpc</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <para os="l1b">In multilib, we tend to think that compiling for
     <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
     cross-compiling. EGLIBC takes the traditional view that if you are building
+    cross-compiling. GLIBC takes the traditional view that if you are building
     for a different host then you are cross-compiling, so you won't be running
     the tests and therefore you don't need the locale files. When we run
 …
     sed allows these tests to succeed:</para>
 <screen os="l2b"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
+<screen os="l2b"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../glibc-&glibc-version;/localedata/Makefile</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/final-system/multilib/gmp-64bit.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
     <para os="j">Create the 64bit header file:</para>

BOOK/final-system/multilib/gzip.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='e'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+<screen><userinput remap="test">make PERL=perl-64 check</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/iproute2.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
 <screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
     DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
+    LIBDIR=/usr/lib64 MANDIR=/usr/share/man</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
     DOCDIR=/usr/share/doc/iproute2 \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
     MANDIR=/usr/share/man install</userinput></screen>

BOOK/final-system/multilib/iputils.xml

r88ef769	r03e6a40
34	34	xpointer="xpointer(//*[@os='a'])"/>
35	35
36		<screen os="b"><userinput>make ~~USE_CAP=no~~ CC="gcc ${BUILD64}" \
	36	<screen os="b"><userinput>make CC="gcc ${BUILD64}" \
37	37	IPV4_TARGETS="tracepath ping clockdiff rdisc" \
38	38	IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>

BOOK/final-system/multilib/kbd.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
   </sect2>

BOOK/final-system/multilib/kmod-64bit.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
         ./configure --prefix=/usr \
         --bindir=/bin --sysconfdir=/etc \
         --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
         --with-zlib --with-xz --disable-manpages</userinput></screen>
+  ./configure --prefix=/usr \
+    --bindir=/bin --sysconfdir=/etc \
+    --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
+    --with-zlib --with-xz</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/kmod-n32.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
     <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
             ./configure --prefix=/usr \
             --bindir=/bin --sysconfdir=/etc \
             --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
             --with-zlib --with-xz --disable-manpages</userinput></screen>
+<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
+  ./configure --prefix=/usr \
+    --bindir=/bin --sysconfdir=/etc \
+    --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
+    --with-zlib --with-xz</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/kmod.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
         ./configure --prefix=/usr \
         --bindir=/bin --sysconfdir=/etc \
         --with-rootlibdir=/lib --libdir=/usr/lib \
         --with-zlib --with-xz --disable-manpages</userinput></screen>
+  ./configure --prefix=/usr \
+    --bindir=/bin --sysconfdir=/etc \
+    --with-rootlibdir=/lib --libdir=/usr/lib \
+    --with-zlib --with-xz</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/mpfr-64bit.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+  ./configure --prefix=/usr --libdir=/usr/lib64 --enable-shared</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib64 \
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/mpfr-n32.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+  ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib32 \
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/mpfr.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+  ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
+  ./configure --prefix=/usr --host=${CLFS_TARGET32} \
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/ncurses-64bit.xml

-              r88ef769
+              r03e6a40
     <para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
+<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
+ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
+ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
+ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so
+ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib64/$(readlink /lib64/libncursesw.so) /usr/lib64/libncursesw.so
+ln -svf ../../lib64/$(readlink /lib64/libmenuw.so) /usr/lib64/libmenuw.so
+ln -svf ../../lib64/$(readlink /lib64/libpanelw.so) /usr/lib64/libpanelw.so
+ln -svf ../../lib64/$(readlink /lib64/libformw.so) /usr/lib64/libformw.so
+rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
-    <para os="n">Now we will create a symlink for /usr/share/terminfo in
-    <filename class="directory">/usr/lib64</filename> for compatibility:</para>
-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib64/terminfo</userinput></screen>
   </sect2>

BOOK/final-system/multilib/ncurses-n32.xml

-              r88ef769
+              r03e6a40
     <para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
+<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
+ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
+ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
+ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so
+ln -svf ../../lib32/libformw.so.5 /usr/lib32/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib32/$(readlink /lib32/libncursesw.so) /usr/lib32/libncursesw.so
+ln -svf ../../lib32/$(readlink /lib32/libmenuw.so) /usr/lib32/libmenuw.so
+ln -svf ../../lib32/$(readlink /lib32/libpanelw.so) /usr/lib32/libpanelw.so
+ln -svf ../../lib32/$(readlink /lib32/libformw.so) /usr/lib32/libformw.so
+rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
-    <para os="n">Now we will create a symlink for /usr/share/terminfo in
-    <filename class="directory">/usr/lib32</filename> for compatibility:</para>
-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib32/terminfo</userinput></screen>
   </sect2>

BOOK/final-system/multilib/ncurses.xml

-              r88ef769
+              r03e6a40
 ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
   </sect2>

BOOK/final-system/multilib/perl.xml

-              r88ef769
+              r03e6a40
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='a02'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a03'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/procps-ng-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-rsyslog" xreflabel="rsyslog" role="wrap">
   <?dbhtml filename="rsyslog.html"?>
+<sect1 id="ch-system-procps-ng" role="wrap">
+  <?dbhtml filename="procps-ng-64bit.html"?>
   <title>Rsyslog-&rsyslog-version;</title>
+  <title>Procps-ng-&procps-ng-version; 64 Bit</title>
   <indexterm zone="ch-system-rsyslog">
     <primary sortas="a-rsyslog">rsyslog</primary>
+  <indexterm zone="ch-system-procps-ng">
+    <primary sortas="a-Procps-ng">Procps-ng</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/rsyslog.xml"
+  href="../common/procps-ng.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of Rsyslog</title>
+    <title>Installation of Procps-ng</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --exec-prefix= \
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+    --disable-kill</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='h'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/procps-ng.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
+mv -v /usr/lib64/libprocps.so.* /lib64
+ln -sfv ../../lib64/$(readlink /usr/lib64/libprocps.so) /usr/lib64/libprocps.so</userinput></screen>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/rsyslog.xml"
+  xpointer="xpointer(id('conf-rsyslog'))"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/rsyslog.xml"
+  xpointer="xpointer(id('contents-rsyslog'))"/>
+  href="../common/procps-ng.xml"
+  xpointer="xpointer(id('contents-procps-ng'))"/>
 </sect1>

BOOK/final-system/multilib/psmisc.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='j'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
   </sect2>

BOOK/final-system/multilib/readline-64bit.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='h'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib64</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib64</filename>.</para>
+<screen os="k"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
+    <para os="l">Next, remove the <filename class="extension">.so</filename>
+    files in <filename class="directory">/lib64</filename> and relink them into
+    <filename class="directory">/usr/lib64</filename>.</para>
+<screen os="m"><userinput>rm -v /lib64/lib{readline,history}.so
+ln -svf ../../lib64/libreadline.so.&readline-version2; /usr/lib64/libreadline.so
+ln -svf ../../lib64/libhistory.so.&readline-version2; /usr/lib64/libhistory.so</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib64/$(readlink /lib64/libreadline.so) /usr/lib64/libreadline.so
+ln -svf ../../lib64/$(readlink /lib64/libhistory.so) /usr/lib64/libhistory.so
+rm -v /lib64/lib{readline,history}.so</userinput></screen>
   </sect2>

BOOK/final-system/multilib/readline-n32.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='h'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
+<screen os="k"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
+    <para os="l">Next, remove the <filename class="extension">.so</filename>
+    files in <filename class="directory">/lib32</filename> and relink them into
+    <filename class="directory">/usr/lib32</filename>.</para>
+<screen os="m"><userinput>rm -v /lib32/lib{readline,history}.so
+ln -svf ../../lib32/libreadline.so.&readline-version2; /usr/lib32/libreadline.so
+ln -svf ../../lib32/libhistory.so.&readline-version2; /usr/lib32/libhistory.so</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
+ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
+rm -v /lib32/lib{readline,history}.so</userinput></screen>
   </sect2>

BOOK/final-system/multilib/readline.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='k'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
   </sect2>

BOOK/final-system/multilib/sed.xml

r88ef769	r03e6a40
27	27
28	28	<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
29		--bindir=/bin</userinput></screen>
	29	--bindir=/bin --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
30	30
31	31	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/tar.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
   </sect2>

BOOK/final-system/multilib/temp-perl.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='j'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
   </sect2>

BOOK/final-system/multilib/util-linux-64bit.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
     --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='h'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
   </sect2>

BOOK/final-system/multilib/util-linux-n32.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
     --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='h'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
   </sect2>

BOOK/final-system/multilib/util-linux.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
     --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='e'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='dummy1'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='dummy2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/vim.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 …
     xpointer="xpointer(//*[@os='n'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
   </sect2>

BOOK/final-system/multilib/xml-parser-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-libee" role="wrap">
   <?dbhtml filename="libee-64bit.html"?>
+<sect1 id="ch-system-xml-parser" role="wrap">
+  <?dbhtml filename="xml-parser-64bit.html"?>
   <title>Libee-&libee-version; 64 Bit</title>
+  <title>XML-Parser-&xml-parser-version; 64 Bit</title>
   <indexterm zone="ch-system-libee">
     <primary sortas="a-Libee">Libee</primary>
+  <indexterm zone="ch-system-xml-parser">
+    <primary sortas="a-XML-Parser">XML::Parser</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/libee.xml"
+  href="../common/xml-parser.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of Libee</title>
+    <title>Installation of XML-Parser</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>USE_ARCH=64 perl Makefile.PL</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/xml-parser.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/libee.xml"
   xpointer="xpointer(id('contents-libee'))"/>
+  href="../common/xml-parser.xml"
+  xpointer="xpointer(id('contents-xml-parser'))"/>
 </sect1>

BOOK/final-system/multilib/xml-parser-n32.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-libee-n32" role="wrap">
   <?dbhtml filename="libee-n32.html"?>
+<sect1 id="ch-system-xml-parser-n32" role="wrap">
+  <?dbhtml filename="xml-parser-n32.html"?>
   <title>Libee-&libee-version; N32 Libraries</title>
+  <title>XML-Parser-&xml-parser-version; N32</title>
   <indexterm zone="ch-system-libee-n32">
     <primary sortas="a-Libee">Libee</primary>
+  <indexterm zone="ch-system-xml-parser-32">
+    <primary sortas="a-XML-Parser">XML::Parser</primary>
     <secondary>N32</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/libee.xml"
+  href="../common/xml-parser.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of Libee</title>
+    <title>Installation of XML-Parser</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>USE_ARCH=n32 perl Makefile.PL</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/xml-parser.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
   </sect2>
 …
     <para>Details on this package are located in <xref
     linkend="contents-libee" role="."/></para>
+    linkend="contents-xml-parser" role="."/></para>
   </sect2>
+</sect1>
-</sect1>

BOOK/final-system/multilib/xml-parser.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-libee-32" role="wrap">
   <?dbhtml filename="libee.html"?>
+<sect1 id="ch-system-xml-parser-32" role="wrap">
+  <?dbhtml filename="xml-parser.html"?>
   <title>Libee-&libee-version; 32 Bit Libraries</title>
+  <title>XML-Parser-&xml-parser-version; 32 Bit</title>
   <indexterm zone="ch-system-libee-32">
     <primary sortas="a-Libee">Libee</primary>
+  <indexterm zone="ch-system-xml-parser-32">
+    <primary sortas="a-XML-Parser">XML::Parser</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/libee.xml"
+  href="../common/xml-parser.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of Libee</title>
+    <title>Installation of XML-Parser</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+  ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>USE_ARCH=32 perl Makefile.PL</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/xml-parser.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
   </sect2>
 …
     <para>Details on this package are located in <xref
     linkend="contents-libee" role="."/></para>
+    linkend="contents-xml-parser" role="."/></para>
   </sect2>
+</sect1>
-</sect1>

BOOK/final-system/multilib/xz-64bit.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-system-xz">
     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
   </indexterm>
 …
   <sect2 role="installation">
     <title>Installation of XZ-Utils</title>
+    <title>Installation of XZ Utils</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
 ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
+ln -sfv ../../lib64/$(readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
   </sect2>

BOOK/final-system/multilib/xz-n32.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-system-xz-n32">
     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
     <secondary>N32</secondary>
   </indexterm>
 …
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
 ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
+ln -sfv ../../lib32/$(readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
   </sect2>

BOOK/final-system/multilib/xz.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-system-xz-32">
     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
 …
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/zlib-64bit.xml

r88ef769	r03e6a40
62	62
63	63	<screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
64		ln -s~~vf ../../lib64/libz.so.1~~ /usr/lib64/libz.so</userinput></screen>
	64	ln -sfv ../../lib64/$(readlink /usr/lib64/libz.so) /usr/lib64/libz.so</userinput></screen>
65	65
66	66	</sect2>

BOOK/final-system/multilib/zlib-n32.xml

r88ef769	r03e6a40
63	63
64	64	<screen os="i"><userinput>mv -v /usr/lib32/libz.so.* /lib32
65		ln -s~~vf ../../lib32/libz.so.1~~ /usr/lib32/libz.so</userinput></screen>
	65	ln -sfv ../../lib32/$(readlink /usr/lib32/libz.so) /usr/lib32/libz.so</userinput></screen>
66	66
67	67	</sect2>

BOOK/final-system/ppc-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>

BOOK/final-system/ppc/gcc.xml

-              r88ef769
+              r03e6a40
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='fix2'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/ppc/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <sect2 id="conf-ld" role="configuration">
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='ld-b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='ld-c'])"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/ppc/hfsutils.xml

r88ef769	r03e6a40
33	33	<para os="a">Prepare Hfsutils for compilation:</para>
34	34
35		<screen><userinput>./configure --prefix=/usr</userinput></screen>
	35	<screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man</userinput></screen>
36	36
37	37	<para os="c">Compile the package:</para>

BOOK/final-system/ppc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>

BOOK/final-system/ppc64-64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l5'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD64}" ../eglibc-&eglibc-version;/configure --prefix=/usr \
+<screen os="h"><userinput>CC="gcc ${BUILD64}" ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --libdir=/usr/lib \
+    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
     --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
 …
     creating a symlink to the real loader.</para>
     <screen><userinput>ln -sv &eglibc-ld-name; /lib/ld.so.1</userinput></screen>
+    <screen><userinput>ln -sv &glibc-ld-name; /lib/ld.so.1</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 …
     <screen><userinput>rm -v /lib/ld.so.1
+cp -v /usr/bin/ldd{,.bak}
+sed '/RTLDLIST/s%/ld.so.1 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userinput></screen>
+sed -i.bak '/RTLDLIST/s%/ld.so.1 /lib64%%' /usr/bin/ldd</userinput></screen>
     <para>Check the script to make sure the sed worked correctly, then delete
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='u'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(id('conf-ld'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/ppc64-64/yaboot.xml

r88ef769	r03e6a40
40	40	<term><parameter>"s/m32/m64/g"</parameter></term>
41	41	<listitem>
42		<para>Replaces -m32 wih -m64 to force <command>gcc</command> to
	42	<para>Replaces -m32 with -m64 to force <command>gcc</command> to
43	43	create 64-bit code when compiling yaboot.</para>
44	44	</listitem>

BOOK/final-system/ppc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>

BOOK/final-system/ppc64/gcc.xml

-              r88ef769
+              r03e6a40
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='fix2'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
     xpointer="xpointer(//*[@os='z'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
   </sect2>

BOOK/final-system/ppc64/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc-64bit.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc-64bit.html"?>
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="eglibc.xml"
+  href="glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <para os="m1">Tell EGLIBC to install its 64-bit libraries into
+    <para os="m1">Tell GLIBC to install its 64-bit libraries into
     <filename class="directory">/lib64</filename>:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
     --enable-obsolete-rpc</userinput></screen>
 …
       <varlistentry>
         <term><parameter>--libexecdir=/usr/lib64/eglibc</parameter></term>
+        <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
         <listitem>
           <para>This changes the location of the <command>getconf</command>
           utility from its default of <filename
           class="directory">/usr/libexec</filename> to <filename
           class="directory">/usr/lib64/eglibc</filename>.</para>
+          class="directory">/usr/lib64/glibc</filename>.</para>
         </listitem>
       </varlistentry>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <sect2 id="conf-ld" role="configuration">
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='ld-b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='ld-c'])"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/ppc64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc-32" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc-32" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
+  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
   <indexterm zone="ch-system-eglibc-32">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc-32">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
+    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32} \
     --enable-obsolete-rpc</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='l1b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='l2b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/final-system/ppc64/hfsutils.xml

r88ef769	r03e6a40
34	34	xpointer="xpointer(//*[@os='a'])"/>
35	35
36		<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
	36	<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --mandir=/usr/share/man</userinput></screen>
37	37
38	38	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/sparc-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>

BOOK/final-system/sparc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>

BOOK/final-system/sparc64-64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../sparc64/eglibc-64bit.xml"
+    href="../sparc64/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='t1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../sparc64/eglibc-64bit.xml"
+    href="../sparc64/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='t2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l5'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD64}" ../eglibc-&eglibc-version;/configure --prefix=/usr \
+<screen os="h"><userinput>CC="gcc ${BUILD64}" ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --libdir=/usr/lib \
+    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
     --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='u'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(id('conf-ld'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/sparc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>

BOOK/final-system/sparc64/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc-64bit.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc-64bit.html"?>
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
     --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../multilib/eglibc-64bit.xml"
+  href="../multilib/glibc-64bit.xml"
   xpointer="xpointer(id('conf-ld'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/x86-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+<!--   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>

BOOK/final-system/x86/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
+  <title>GLIBC-&glibc-version;</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>
     CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $MACHTYPE) -O2" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/eglibc \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
+    --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/glibc \
     --enable-obsolete-rpc</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <!-- this is specific to x86 because of the i686 reference in the math tests -->
     <itemizedlist os="p">
+      <listitem>
+        <para>The <emphasis>nptl/tst-clock2</emphasis>,
+        <emphasis>nptl/tst-attr3</emphasis>,
+        <emphasis>tst/tst-cputimer1</emphasis>, and
+        <emphasis>rt/tst-cpuclock2</emphasis>
+        tests have been known to fail.  The
+        reason is not completely understood, but indications are that minor
+        timing issues can trigger these failures.</para>
+      </listitem>
       <listitem>
         <para>The <emphasis>math</emphasis> tests, at least on i686, fail in
 …
       <listitem>
         <para>When running on older and slower hardware, some tests
+        can fail because of test timeouts being exceeded.</para>
+        can fail because of test timeouts being exceeded.
+        Modifying the make check command to set a TIMEOUTFACTOR is reported to
+        help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
+        make -k check</command>).</para>
+      </listitem>
+      <listitem>
+        <para>posix/tst-getaddrinfo4 will always fail due to not having a network
+        connection when the test is run.</para>
       </listitem>
     </itemizedlist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(id('conf-ld'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/x86/grub.xml

-              r88ef769
+              r03e6a40
     <note os="n1">
       <para>If you would like use a different bootloader than this
       one you can go to the following link for alterative bootloaders
+      one you can go to the following link for alternative bootloaders
       and the instructions to use them.
       <ulink url="http://trac.cross-lfs.org/wiki/bootloaders"/></para>
 …
     </note>
     <para os="s1">EGLIBC-&eglibc-version; does not declare gets():</para>
+    <para os="s1">GLIBC-&glibc-version; does not declare gets():</para>
 <screen os="s2"><userinput>sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h</userinput></screen>

BOOK/final-system/x86_64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>

BOOK/final-system/x86_64-64/binutils.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 …
     xpointer="xpointer(//*[@os='s'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
   </sect2>

BOOK/final-system/x86_64-64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc.html"?>
   <title>EGLIBC-&eglibc-version;</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
+  <title>GLIBC-&glibc-version;</title>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    <title>Installation of GLIBC</title>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <para os="l5">Tell EGLIBC to install its libraries into
+    <para os="l5">Tell GLIBC to install its libraries into
     <filename class="directory">/lib</filename>:</para>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CFLAGS="-O2" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --libdir=/usr/lib \
+    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
     --enable-obsolete-rpc</userinput></screen>
 …
       <varlistentry>
         <term><parameter>--libexecdir=/usr/lib/eglibc</parameter></term>
+        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
         <listitem>
           <para>This changes the location of the <command>getconf</command>
           utility from its default of <filename
           class="directory">/usr/libexec</filename> to <filename
           class="directory">/usr/lib/eglibc</filename>.</para>
+          class="directory">/usr/lib/glibc</filename>.</para>
         </listitem>
       </varlistentry>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
 …
     creating a symlink to the real loader.</para>
     <screen><userinput>ln -sv &eglibc-ld-name; /lib/ld-linux.so.2</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    <screen><userinput>ln -sv &glibc-ld-name; /lib/ld-linux.so.2</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 …
     <screen><userinput>rm -v /lib/ld-linux.so.2
+cp -v /usr/bin/ldd{,.bak}
+sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userinput></screen>
+sed -i.bak '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd</userinput></screen>
     <para>Check the script to make sure the sed worked correctly, then delete
 …
     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+ <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
+    and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
+    this with the following:</para>
+    <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <sect2 id="conf-ld" role="configuration">
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='ld-b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='ld-c'])"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/x86_64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/glibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>

BOOK/final-system/x86_64/glibc-64bit.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc" role="wrap">
   <?dbhtml filename="eglibc-64bit.html"?>
+<sect1 id="ch-system-glibc" role="wrap">
+  <?dbhtml filename="glibc-64bit.html"?>
   <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
   <indexterm zone="ch-system-eglibc">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="eglibc.xml"
+  href="glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     CFLAGS="-O2" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
     --enable-obsolete-rpc</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
   </sect2>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('i18n-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('i18n-glibc'))"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('conf-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('conf-glibc'))"/>
   <sect2 id="conf-ld" role="configuration">
 …
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='ld-b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='ld-c'])"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
   xpointer="xpointer(id('contents-eglibc'))"/>
+  href="../common/glibc.xml"
+  xpointer="xpointer(id('contents-glibc'))"/>
 </sect1>

BOOK/final-system/x86_64/glibc.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-system-eglibc-32" role="wrap">
   <?dbhtml filename="eglibc.html"?>
+<sect1 id="ch-system-glibc-32" role="wrap">
+  <?dbhtml filename="glibc.html"?>
   <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
+  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
   <indexterm zone="ch-system-eglibc-32">
     <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-system-glibc-32">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/eglibc.xml"
+  href="../common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; ${CLFS_TARGET32}) -O2" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
+    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32} \
     --enable-obsolete-rpc</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='l1b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='l2b'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='o'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='r'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 …
     <para>Details on this package are located in <xref
     linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
   </sect2>

BOOK/general.ent

-              r88ef769
+              r03e6a40
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!ENTITY month "12"> <!-- Use two digits -->
 <!ENTITY month_name "December">
 <!ENTITY day "30"> <!-- Use two digits -->
 <!ENTITY year "2013"> <!-- Use four digits -->
+<!ENTITY month "04"> <!-- Use two digits -->
+<!ENTITY month_name "April">
+<!ENTITY day "20"> <!-- Use two digits -->
+<!ENTITY year "2014"> <!-- Use four digits -->
 <!ENTITY releasedate "&month_name; &day;, &year;">
 …
 <!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
+<!ENTITY version "GIT-&year;&month;&day;">
+<!ENTITY versionid "&year;&month;&day;"> <!-- /etc/os-release from systemd -->
+<!ENTITY version "SYSTEMD-&year;&month;&day;">
 <!ENTITY version-x86 "&version;-x86">
 …
 <!ENTITY version-mips64 "&version;-MIPS64-Multilib">
 <!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
+<!-- Alpha isn't tested anymore
 <!ENTITY version-alpha "&version;-ALPHA">
+-->
 <!ENTITY version-native "&version;-Native">
 <!ENTITY version-native64 "&version;-Native-Multilib">

BOOK/introduction/common/changelog.xml

-              r88ef769
+              r03e6a40
         </listitem>
         <listitem>
+          <para>[name] - Another changelog entry.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+          <para>[name] - Previous changelog entry.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 -->
+    <listitem>
+      <para>20 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Reorganized "boot" section to allow everything
+          to be installed into /tools, remove the need to chown ${CLFS} to the
+          clfs user, and generally make the chapter's instructions flow better.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>18 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added --disable-makeinstall-setuid to temp-system
+          Util-linux, as nothing there needs to be suid.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>16 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed creation of /usr/bin/perl symlink, as
+          Perl creates a link itself when installed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>13 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Updated most packages in the Boot section to install
+          into /tools instead of $CLFS. Thanks to Martin Ward and
+          William Harrington for assistance.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>12 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Modified sysvinit installation to allow it
+          to use /tools/etc/inittab and /tools/sbin/agetty.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Moved Util-linux installation out of boot/chroot
+          sections into the temp-system, as it can be installed the same
+          way with either method.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>11 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Updated MPC to 1.0.2.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed unneeded --disable-login and --disable-su
+          switches from Util-linux configure in boot/chroot sections.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>09 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update Eudev to 1.5.3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>09 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Remove obsolete --enable-cloog-backend
+          parameter from GCC configure.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Remove unneeded
+          --disable-isl-version-check parameter from GCC configure.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Gawk to 4.1.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>08 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add versioned doc directories for
+          Automake, DBus, Flex, Gawk, Gettext, GMP, IPRoute2, KBD, MPFR,
+          Readline, Sed, Tar, Util-linux and XZ.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>06 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update KMOD to 17.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Man-pages to 3.64.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>05 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Move Flex before Bison in final system
+          and remove bison and flex from temp system.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Add M4=m4 before configure command in
+          final-system Bison and Flex.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Remove Bison and Flex from temp system.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Move M4 before GMP in final-system and
+          remove M4 from temp system.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>02 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add test commands to Attr and Acl.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>30 March 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Modified network section to split systemd/sysconfig
+          network configurations.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed instructions to install systemd manpages -
+          they are now automatically installed by default.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated installed program lists for several packages.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Remove link of libl to libfl during Flex installation.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update DHCPCD to 6.3.2.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update VIM 7.4 patch to level 229.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Bash 4.3 patch to level 8.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Readline 6.3 patch to level 3.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update GCC 4.8.2 branch update patch to
+          revision 208943.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>23 March 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update Man-pages to 3.63.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>28 March 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update File to 5.18.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Flex to 2.5.39.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Linux to 3.12.15.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Systemd to 212.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Tzdata to 2014b.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update GMP to 6.0.0a.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Move Bison and Flex before Binutils.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>17 March 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Remove libdbus and Update Systemd to 211.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Add Systemd compat patch to install pkg-config files.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>12 March 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Updated documentation installation instructions
+          for Readline and Bash.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Deleted --remove-destination parameter when creating
+          /etc/localtime - it's no longer needed.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Man-pages to 3.62.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>10 March 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update TZData to 2014a.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update MPFR fixes patch to patch level 5.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>09 March 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add configure command descriptions and testsuite commands to Systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update testsuite description for D-BUS.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Add note to final-system Util-Linux regarding extra functionality with libudev.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Add commands and descriptions for <filename>/etc/adjtime</filename>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>02 March 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update DHCPCD to 6.3.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>27 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update Grep to 2.18.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update DHCPCD to 6.3.0.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Man-pages to 3.61.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Readline to 6.3.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Bash to 4.3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>24 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Remove installation of nscd tmpfile and unit service file in clfs-network-scripts.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>23 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add commands for <command>nscd</command>  config, runtime, and Systemd unit files installation to GLIBC.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>18 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Migrate EGLIBC to GLIBC and upgrade to version 2.19.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update D-Bus to stable version 1.8.0.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update File to version 5.17.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Grep to version 2.17.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Linux to version 3.12.11.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Man-pages to version 3.60.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Psmisc to version 22.21.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>13 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Correct nobody gid to use nogroup gid.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>03 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add configure options to systemd so loadkeys and setfont is searched in /bin instead of /usr/bin.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>02 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Remove note in Iana-etc page and update iana-etc update numbers patch for proper operation with current iana-etc format.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>29 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add PKG_CONFIG= to temp-system make configure command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>27 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add PERL=/usr/bin/perl to temp-system Texinfo build.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>26 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update LESS to 462.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>25 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Create a link from /proc/self/mounts to /etc/mtab in boot and chroot createfiles section.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>23 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update text and redo some commands regarding Systemd in the System and Network configuration chapters.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Add a clock configuration script to system configuration chapter with regards to systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Add CLFS-Network-Scripts and add commands to install them in the network configuration chapter.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Util-linux to 2.24.1.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Check to 0.9.12.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>21 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add D-Bus libraries before Systemd in final-system for a circular dependency issue.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>19 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update DHCPCD to 6.2.1.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Use readlink when creating links for dynamic libraries for zlib, xz, ncurses, and readline.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>13 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update ISL to 0.12.2.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Man-pages to 3.56.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>10 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Migrate Procps to Procps-ng.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>09 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Updated Linux to 3.12.7.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Perl to 5.18.2.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Gettext to 0.18.3.2.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Libcap to 2.24.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed unneeded command to create a /usr/lib/terminfo
+          symlink from Ncurses instructions.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed /usr/{doc,info,man} symlinks and edited
+          instructions for packages to ensure all documentation is installed
+          to /usr/share.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Moved libcap so it's built just before iputils,
+          which can use libcap.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>08 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed commands to create files in /var/run and
+          /var/log - systemd now used its journal for all logs.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed obsolete sed command from temp-system Coreutils.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed unneeded command to rename stubs-64.h.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed unneeded "make configure-host" commands
+          from Binutils.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Moved Attr and ACL to just after GCC in the final system.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>07 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added command, from LFS, to modify
+          /tools/lib/libstdc++.la to prevent a /tools reference in the final system.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Use libiberty from GCC, since Binutils no longer
+          installs it by default.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>06 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added msgmerge and xgettext to /tools Gettext
+          installation - needed for attr.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update DHCPCD to 6.2.0.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Grep to 2.16.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>05 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed rsyslog and its depedencies, libee and libestr.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Expat to 2.1.0.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Attr to 2.4.47.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated D-Bus to 1.6.18.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Libcap to 2.23.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>04 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Updated Systemd to 208.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Added Gperf, XML::Parser, Intltool, and ACL - needed
+          by systemd.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>01 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added command to EGLIBC instructions to remove
+          extraneous '.x' files from /usr/include/rpcsvc.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>23 December 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update E2fsprogs to 1.42.9.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Automake to 1.14.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>21 December 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update CLooG to 0.18.2.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Tzdata to 2013i.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update EGLIBC 2.18 to revision 24829.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Linux to 3.12.6.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
     <listitem>
       <para>30 December 2013</para>

BOOK/introduction/common/how.xml

-              r88ef769
+              r03e6a40
   alternative booting methods in <xref linkend="ch-boot-whatnext"/></para>
   <para>To finish the installation, the CLFS-Bootscripts are set up in <xref
   linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
+  <para>To finish the installation, several configuration files are created in
+  <xref linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
   up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
   contains information on furthering the CLFS experience beyond this book.

BOOK/introduction/ppc/changelog.xml

-              r88ef769
+              r03e6a40
 -->
     <listitem>
+      <para>03 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add --mandir=/usr/share/man to HFSUtils configure command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+   <listitem>
       <para>24 October 2013</para>
       <itemizedlist>

BOOK/introduction/ppc64-64/changelog.xml

-              r88ef769
+              r03e6a40
 <!-- Changelog template
     <listitem>
+   <listitem>
       <para>Date</para>
       <itemizedlist>
 …
 -->
     <listitem>
+      <para>03 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add --mandir=/usr/share/man to HFSUtils configure command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
       <para>24 October 2013</para>
       <itemizedlist>

BOOK/introduction/ppc64/changelog.xml

-              r88ef769
+              r03e6a40
 -->
+    <listitem>
+      <para>09 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Fix Boot method Util-linux configure
+          command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>03 February 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add --mandir=/usr/share/man to HFSUtils configure command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
     <listitem>
       <para>08 November 2013</para>

BOOK/introduction/x86/changelog.xml

-              r88ef769
+              r03e6a40
 -->
     <listitem>
+      <para>11 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Prevent GRUB from trying to build mkfont, to avoid
+          linking to host system libraries.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
       <para>24 October 2013</para>
       <itemizedlist>

BOOK/materials/common/introduction.xml

-              r88ef769
+              r03e6a40
 following MD5 or SHA1 checksum lists:</para>
   <para><ulink url="/files/packages/git/MD5SUMS">MD5SUMS</ulink>:</para>
+  <para><ulink url="&packages-root;MD5SUMS">MD5SUMS</ulink>:</para>
 <screen><userinput>pushd ${CLFS}/sources
 …
 popd</userinput></screen>
   <para><ulink url="/files/packages/git/SHA1SUMS">SHA1SUMS</ulink>:</para>
+  <para><ulink url="&packages-root;SHA1SUMS">SHA1SUMS</ulink>:</para>
 <screen><userinput>pushd ${CLFS}/sources

BOOK/materials/common/packages.xml

-              r88ef769
+              r03e6a40
     <varlistentry>
+      <term>ACL (&acl-version;) - <token>&acl-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&acl-home;"/></para>
+        <para>Download: <ulink url="&acl-url;"/></para>
+        <para>MD5 sum: <literal>&acl-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Attr (&attr-version;) - <token>&attr-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&attr-home;"/></para>
+        <para>Download: <ulink url="&attr-url;"/></para>
+        <para>MD5 sum: <literal>&attr-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
       <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
       <listitem>
 …
     <varlistentry>
+      <term>CLFS Network Scripts (&clfs-network-scripts-version;) - <token>&clfs-network-scripts-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&clfs-network-scripts-home;"/></para>
+        <para>Download: <ulink url="&clfs-network-scripts-url;"/></para>
+        <para>MD5 sum: <literal>&clfs-network-scripts-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
       <term>ClooG (&cloog-version;) - <token>&cloog-size;</token>:</term>
       <listitem>
 …
     <varlistentry>
+      <term>D-Bus (&dbus-version;) - <token>&dbus-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&dbus-home;"/></para>
+        <para>Download: <ulink url="&dbus-url;"/></para>
+        <para>MD5 sum: <literal>&dbus-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
       <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
       <listitem>
 …
     <varlistentry>
-      <term>EGLIBC (&eglibc-version;) - <token>&eglibc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&eglibc-home;"/></para>
-        <para>Download: <ulink url="&eglibc-url;"/></para>
-        <para>MD5 sum: <literal>&eglibc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
       <term>E2fsprogs (&e2fsprogs-version;) - <token>&e2fsprogs-size;</token>:</term>
       <listitem>
 …
         <para>Download: <ulink url="&eudev-url;"/></para>
         <para>MD5 sum: <literal>&eudev-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Expat (&expat-version;) - <token>&expat-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&expat-home;"/></para>
+        <para>Download: <ulink url="&expat-url;"/></para>
+        <para>MD5 sum: <literal>&expat-md5;</literal></para>
       </listitem>
     </varlistentry>
 …
     <varlistentry>
+      <term>GLIBC (&glibc-version;) - <token>&glibc-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&glibc-home;"/></para>
+        <para>Download: <ulink url="&glibc-url;"/></para>
+        <para>MD5 sum: <literal>&glibc-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
       <term>GMP (&gmp-version;) - <token>&gmp-size;</token>:</term>
       <listitem>
 …
     <varlistentry>
+      <term>Gperf (&gperf-version;) - <token>&gperf-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&gperf-home;"/></para>
+        <para>Download: <ulink url="&gperf-url;"/></para>
+        <para>MD5 sum: <literal>&gperf-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
       <term>Grep (&grep-version;) - <token>&grep-size;</token>:</term>
       <listitem>
 …
     <varlistentry>
+      <term>Intltool (&intltool-version;) - <token>&intltool-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&intltool-home;"/></para>
+        <para>Download: <ulink url="&intltool-url;"/></para>
+        <para>MD5 sum: <literal>&intltool-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
       <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
       <listitem>
 …
     <varlistentry>
+      <term>Libee (&libee-version;) - <token>&libee-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libee-home;"/></para>
+        <para>Download: <ulink url="&libee-url;"/></para>
+        <para>MD5 sum: <literal>&libee-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Libestr (&libestr-version;) - <token>&libestr-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libestr-home;"/></para>
+        <para>Download: <ulink url="&libestr-url;"/></para>
+        <para>MD5 sum: <literal>&libestr-md5;</literal></para>
+      <term>Libcap (&libcap-version;) - <token>&libcap-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libcap-home;"/></para>
+        <para>Download: <ulink url="&libcap-url;"/></para>
+        <para>MD5 sum: <literal>&libcap-md5;</literal></para>
       </listitem>
     </varlistentry>
 …
       <term>Man (&man-version;) - <token>&man-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&man-home;"/></para>
         <para>Download: <ulink url="&man-url;"/></para>
         <para>MD5 sum: <literal>&man-md5;</literal></para>
 …
     <varlistentry>
       <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&procps-home;"/></para>
         <para>Download: <ulink url="&procps-url;"/></para>
         <para>MD5 sum: <literal>&procps-md5;</literal></para>
+      <term>Procps-ng (&procps-ng-version;) - <token>&procps-ng-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&procps-ng-home;"/></para>
+        <para>Download: <ulink url="&procps-ng-url;"/></para>
+        <para>MD5 sum: <literal>&procps-ng-md5;</literal></para>
       </listitem>
     </varlistentry>
 …
     <varlistentry>
-      <term>Rsyslog (&rsyslog-version;) - <token>&rsyslog-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&rsyslog-home;"/></para>
-        <para>Download: <ulink url="&rsyslog-url;"/></para>
-        <para>MD5 sum: <literal>&rsyslog-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
       <term>Sed (&sed-version;) - <token>&sed-size;</token>:</term>
       <listitem>
 …
         <para>Download: <ulink url="&sysvinit-url;"/></para>
         <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Systemd (&systemd-version;) - <token>&systemd-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&systemd-home;"/></para>
+        <para>Download: <ulink url="&systemd-url;"/></para>
+        <para>MD5 sum: <literal>&systemd-md5;</literal></para>
       </listitem>
     </varlistentry>
 …
         <para>Download: <ulink url="&vim-url;"/></para>
         <para>MD5 sum: <literal>&vim-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>XML::Parser  (&xml-parser-version;) - <token>&xml-parser-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&xml-parser-home;"/></para>
+        <para>Download: <ulink url="&xml-parser-url;"/></para>
+        <para>MD5 sum: <literal>&xml-parser-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/materials/common/patches.xml

-              r88ef769
+              r03e6a40
     </varlistentry>
+    <varlistentry>
+      <term>Coreutils Noman Patch - <token>&coreutils-noman-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&coreutils-noman-patch;"/></para>
+        <para>MD5 sum: <literal>&coreutils-noman-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 <!-- GCC Branch Update Area -->
     <varlistentry>
 …
         url="&patches-root;&gcc-branch_update-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>Iana-Etc Get Fix Patch - <token>&iana-etc-get_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iana-etc-get_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&iana-etc-get_fix-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 …
     <varlistentry>
-      <term>Procps Fix HZ Errors Patch - <token>&procps-fix_HZ_errors-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&procps-fix_HZ_errors-patch;"/></para>
-        <para>MD5 sum: <literal>&procps-fix_HZ_errors-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>Procps ps cgroup Patch - <token>&procps-ps_cgroup-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&procps-ps_cgroup-patch;"/></para>
-        <para>MD5 sum: <literal>&procps-ps_cgroup-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
       <term>Readline Branch Update - <token>&readline-branch_update-patch-size;</token>:</term>
       <listitem>
 …
         url="&patches-root;&readline-branch_update-patch;"/></para>
         <para>MD5 sum: <literal>&readline-branch_update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Systemd Compat Patch - <token>&systemd-compat-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&systemd-compat-patch;"/></para>
+        <para>MD5 sum: <literal>&systemd-compat-patch-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/network/alpha-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/common/choose.xml

-              r88ef769
+              r03e6a40
   <?dbhtml filename="choose.html"?>
   <title>DHCP or Static Networking?</title>
+  <title>Systemd Networking?</title>
   <indexterm zone="ch-network-choose">
 …
   <para> There are two different ways you can proceed from this point
+  to configure your network. Dynamic will allow you to take advantage of
+  a DHCP server to get all your configuration information. Static you become
+  responsible for setting up your options.</para>
+  to configure your network. You can use Systemd, or install the
+  CLFS-Network-Scripts.</para>
   <para>To configure a Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+  <para>To use systemd to configure a Network Interface, Follow <xref linkend="ch-systemd-network"/>.</para>
   <para>To configure a DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
+  <para>To use CLFS-network-scripts to configure a Network Interface, Follow <xref linkend="ch-scripts-network-scripts"/>.</para>
 </sect1>

BOOK/network/common/dhcpcd.xml

-              r88ef769
+              r03e6a40
   </sect2>
+  <sect2 id="conf-dhcpcd" role="configuration">
+    <title>Creating the DHCP Network Interface Configuration File</title>
+    <para>The following is an example for the eth0 interface. Refer to the
+    dhcpcd.conf man page for more information. This step may be skipped if
+    default behavior of dhcpcd is required.</para>
+    <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
+    using the following commands. Adjust appropriately for additional options:</para>
+<screen><userinput>cd /etc &amp;&amp;
+cat &gt; dhcpcd.conf &lt;&lt; "EOF"
+<literal># dhcpcd configuration eth0 interface
+# See dhcpcd.conf(5) for details.
+interface eth0
+# dhcpcd-run-hooks uses these options.
+option subnet_mask, routers, domain_name_servers
+# The default timeout for waiting for a DHCP response is 30 seconds
+# which may be too long or too short and can be changed here.
+timeout 16</literal>
+EOF</userinput></screen>
+    <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+  </sect2>
+  <sect2>
+    <title>Configuring the Network Interface at boot</title>
+    <para>Enabling of the Network Interface configuration is
+    done per interface. To enable Network Interface
+    configuration at boot, run:</para>
+<screen role="nodump"><userinput>systemctl enable dhcpcd@eth0</userinput></screen>
+    <para>To disable previously enabled Network Interface
+    configuration at boot, run:</para>
+<screen role="nodump"><userinput>systemctl disable dhcpcd@eth0</userinput></screen>
+    <para>To manually start the Network Interface configuration,
+    run:</para>
+<screen role="nodump"><userinput>systemctl start dhcpcd@eth0</userinput></screen>
+    <para>Replace eth0 with the correct Network Interface
+    name as described on the beginning of this page.</para>
+  </sect2>
   <sect2 id="contents-dhcpcd" role="content">
     <title>Contents of dhcpcd</title>

BOOK/network/common/hostname.xml

-              r88ef769
+              r03e6a40
   <?dbhtml filename="hostname.html"?>
   <title>Configuring the localnet Script</title>
+  <title>Configuring the system hostname</title>
   <indexterm zone="ch-network-hostname">
     <primary sortas="d-localnet">localnet</primary>
+    <primary sortas="d-hostname">hostname</primary>
   <secondary>configuring</secondary></indexterm>
+  <para>Part of the job of the <command>localnet</command> script is
+  setting the system's hostname. This needs to be configured in the
+  <filename>/etc/sysconfig/network</filename> file.</para>
+  <para>Systemd reads <filename>/etc/hostname</filename> to determine which
+  hostname should be set.</para>
   <para>Create the <filename>/etc/sysconfig/network</filename> file
   and enter a hostname by running:</para>
+  <para>Create the <filename>/etc/hostname</filename> file and enter a hostname
+  by running:</para>
   <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
+  <screen><userinput>echo "<replaceable>[clfs]</replaceable>" &gt; /etc/hostname</userinput></screen>
   <para><replaceable>[clfs]</replaceable> needs to be replaced with the

BOOK/network/common/hosts.xml

-              r88ef769
+              r03e6a40
   <para>If a network card is to be configured, decide on the IP address,
   FQDN, and possible aliases for use in the
+  fully-qualified domain name (FQDN), and possible aliases for use in the
   <filename>/etc/hosts</filename> file. The syntax is:</para>
 …
   are:</para>
+<screen><literal>  Class Networks
+  A     10.0.0.0
+  B     172.16.0.0 through 172.31.0.255
+  C     192.168.0.0 through 192.168.255.255</literal></screen>
+<screen><literal>Private Network Address Range       Normal Prefix
+.0.0.1 - 10.255.255.254           8
+.x.0.1 - 172.x.255.254           16
+.168.y.1 - 192.168.y.254         24</literal></screen>
+  <para>x can be any number in the range 16-31. y can be any number in the
+  range 0-255.</para>
   <para>A valid IP address could be 192.168.1.1. A valid FQDN for this
   IP could be <uri>www.linuxfromscratch.org</uri> (not recommended
+  IP could be <uri>www.cross-lfs.org</uri> (not recommended
   because this is a valid registered domain address and could cause
   domain name server issues).</para>
   <para>Even if not using a network card, an FQDN is still required.
+  <para>Even if not using a network card, a valid FQDN is still required.
   This is necessary for certain programs to operate correctly.</para>
   <para>Create the  <filename>/etc/hosts</filename> file by running:</para>
+  <para>Create the <filename>/etc/hosts</filename> file by running:</para>
 <screen><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
 …
 .0.0.1 localhost
 <replaceable>[192.168.1.1]</replaceable> <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable>
+<replaceable>[192.168.1.1]</replaceable> <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> <replaceable>[alias ...]</replaceable>
 # End /etc/hosts (network card version)</literal>
 …
   values need to be changed for specific users or requirements (if
   assigned an IP address by a network/system administrator and the
   machine will be connected to an existing network).</para>
+  machine will be connected to an existing network). The optional
+  alias name(s) can be omitted.</para>
   <para>If a network card is not going to be configured, create the

BOOK/network/common/resolv.xml

-              r88ef769
+              r03e6a40
 EOF</userinput></screen>
+    <para>The <replaceable>domain</replaceable> statement can be omitted or
+    replaced with a <replaceable>search</replaceable> statement. See the man
+    page for resolv.conf for more details.</para>
     <para>Replace <replaceable>[IP address of the nameserver]</replaceable>
     with the IP address of the DNS most appropriate for the setup. There will

BOOK/network/common/sysconfig-network.xml

-              r88ef769
+              r03e6a40
     <para>Which interfaces are brought up and down by the network script
     depends on the files and directories in the <filename
     class="directory">/etc/sysconfig/network-devices</filename> hierarchy.
+    class="directory">/etc/sysconfig</filename> hierarchy.
     This directory should contain a sub-directory for each interface to be
     configured, such as <filename>ifconfig.xyz</filename>, where
 …
     address(es), subnet masks, and so forth.</para>
+    <note><para>Udev may assign random Network Card Interface names
+    for some network cards such as enp2s1. If you are not sure what
+    your Network Card Interface name is, you can always run
+    <command>ip l</command> after you have booted your system. Again,
+    it is important that <filename>ifconfig.xyz</filename> is named
+    after correct Network Card Interface name (e.g.
+    <filename>ifconfig.enp2s1</filename> or
+    <filename>ifconfig.eth0</filename>) or Systemd will fail to bring
+    up your network interface.</para></note>
     <para>The following command creates a sample <filename>ipv4</filename>
     file for the <emphasis>eth0</emphasis> device:</para>
 <screen><userinput>cd /etc/sysconfig/network-devices &amp;&amp;
 mkdir -v ifconfig.eth0 &amp;&amp;
 cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF"
 <literal>ONBOOT="yes"
+<screen><userinput>mkdir -pv /etc/sysconfig &amp;&amp;
+cd /etc/sysconfig &amp;&amp;
+cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
+<literal>IFACE="eth0"
 SERVICE="ipv4-static"
 IP="192.168.1.1"
 …
 EOF</userinput></screen>
+    <para os="var-ob">The values of these variables must be changed in every file to match
+    the proper setup. If the <envar>ONBOOT</envar> variable is set to
+    <quote>yes</quote> the network script will bring up the Network Interface
+    Card (NIC) during booting of the system. If set to anything but
+    <quote>yes</quote> the NIC will be ignored by the network script and not
+    be brought up.</para>
+    <para os="var-ob">The values of these variables must be changed in every
+    file to match the proper setup.</para>
+    <para os="var-s">The <envar>SERVICE</envar> variable defines the method used for
+    obtaining the IP address. The CLFS-Bootscripts package has a modular IP
+    assignment format, and creating additional files in the <filename
+    class="directory">/etc/sysconfig/network-devices/services</filename>
+    <para os="var-i">The <envar>IFACE</envar> variable defines the interface
+    name, for example, eth0. It is required for all network device configuration
+    files.</para>
+    <para os="var-s">The <envar>SERVICE</envar> variable defines the method used
+    for obtaining the IP address. The CLFS-Network-Scripts package has a modular
+    IP assignment format, and creating additional files in the <filename
+    class="directory">/lib/services</filename>
     directory allows other IP assignment methods.</para>
 …
     <envar>PREFIX</envar> variable according to your specific subnet.</para>
+    <para>To configure another DHCP Interface, Follow <xref linkend="ch-network-dhcp"/>.</para>
+    <para>For more information see the <command>ifup</command> man page.</para>
+    <para>To configure another DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
+  </sect2>
+  <sect2>
+    <title>Configuring the Network Interface at boot</title>
+    <para>Enabling of the Network Interface configuration is
+    done per interface. To enable Network Interface
+    configuration at boot, run:</para>
+<screen role="nodump"><userinput>systemctl enable ifupdown@eth0</userinput></screen>
+    <para>To disable previously enabled Network Interface
+    configuration at boot, run:</para>
+<screen role="nodump"><userinput>systemctl disable ifupdown@eth0</userinput></screen>
+    <para>To manually start the Network Interface configuration,
+    run:</para>
+<screen role="nodump"><userinput>systemctl start ifupdown@eth0</userinput></screen>
+    <para>Replace eth0 with the correct Network Interface
+    name as described on the beginning of this page.</para>
   </sect2>

BOOK/network/mips-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/mips64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/mips64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/multilib/dhcpcd.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/dhcpcd.xml"
+  xpointer="xpointer(id('conf-dhcpcd'))"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/dhcpcd.xml"
   xpointer="xpointer(id('contents-dhcpcd'))"/>

BOOK/network/ppc-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/ppc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/ppc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/sparc-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/sparc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/sparc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/x86-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/x86_64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/network/x86_64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
 </chapter>

BOOK/packages.ent

-              r88ef769
+              r03e6a40
 <!ENTITY aboot-home "http://sourceforge.net/projects/aboot">
+<!ENTITY acl-version "2.2.52">
+<!ENTITY acl-size "384 KB">
+<!ENTITY acl-url "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
+<!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
+<!ENTITY acl-home "http://acl.bestbits.at/">
+<!ENTITY attr-version "2.4.47">
+<!ENTITY attr-size "340 KB">
+<!ENTITY attr-url "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
+<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
+<!ENTITY attr-home "http://acl.bestbits.at/">
 <!ENTITY arcload-version "0.5">
 <!ENTITY arcload-size "48 KB">
 …
 <!ENTITY autoconf-home "&gnu-software;autoconf">
 <!ENTITY automake-version2 "1.14.1">
 <!ENTITY automake-version "&automake-version2;">
+<!ENTITY automake-version2 "1.14">
+<!ENTITY automake-version "&automake-version2;.1">
 <!ENTITY automake-size "1,489 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
 …
 <!ENTITY automake-home "&gnu-software;automake">
 <!ENTITY bash-version "4.2">
 <!ENTITY bash-size "6,848 KB">
+<!ENTITY bash-version "4.3">
+<!ENTITY bash-size "7,956 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
 <!ENTITY bash-md5 "3fb927c7c33022f1c327f14a81c0d4b0">
+<!ENTITY bash-md5 "81348932d5da294953e15d4814c74dd1">
 <!ENTITY bash-home "&gnu-software;bash">
 <!ENTITY bc-version "1.06.95">
-<!ENTITY bc-dir "&bc-version;">
 <!ENTITY bc-size "284 KB">
 <!ENTITY bc-url "http://alpha.gnu.org/gnu/bc/bc-&bc-version;.tar.bz2">
 …
 <!ENTITY bzip2-home "http://www.bzip.org/">
 <!ENTITY check-version "0.9.11">
 <!ENTITY check-size "691 KB">
+<!ENTITY check-version "0.9.12">
+<!ENTITY check-size "730 KB">
 <!ENTITY check-url "http://sourceforge.net/projects/check/files/check/&check-version;/check-&check-version;.tar.gz">
 <!ENTITY check-md5 "fd5a03979bcab9fb80ba005b55f54178">
+<!ENTITY check-md5 "46fe540d1a03714c7a1967dbc6d484e7">
 <!ENTITY check-home "http://check.sourceforge.net/">
+<!ENTITY cloog-version "0.18.1">
+<!ENTITY cloog-size "3,857 KB">
+<!ENTITY clfs-network-scripts-version "20140224">
+<!ENTITY clfs-network-scripts-size "22 KB">
+<!ENTITY clfs-network-scripts-url "http://cross-lfs.org/files/clfs-network-scripts-&clfs-network-scripts-version;.tar.xz">
+<!ENTITY clfs-network-scripts-md5 "831308d5e80bdaa3f494dc218ee43f78">
+<!ENTITY clfs-network-scripts-home " ">
+<!ENTITY cloog-version "0.18.2">
+<!ENTITY cloog-size "2,377 KB">
 <!ENTITY cloog-url "http://www.bastoul.net/cloog/pages/download/cloog-&cloog-version;.tar.gz">
 <!ENTITY cloog-md5 "e34fca0540d840e5d0f6427e98c92252">
+<!ENTITY cloog-md5 "69116aa6cd5e73f6b688d871875e1292">
 <!ENTITY cloog-home "http://cloog.org">
 …
 <!ENTITY coreutils-home "&gnu-software;coreutils">
+<!ENTITY dbus-version "1.8.0">
+<!ENTITY dbus-size "1,861 KB">
+<!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
+<!ENTITY dbus-md5 "059fbe84e39fc99c67a14f15b1f39dff">
+<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dejagnu-version "1.5.1">
 <!ENTITY dejagnu-size "568 KB">
 …
 <!ENTITY dejagnu-home "&gnu-software;dejagnu">
 <!ENTITY dhcpcd-version "6.1.0">
 <!ENTITY dhcpcd-size "114 KB KB">
+<!ENTITY dhcpcd-version "6.3.2">
+<!ENTITY dhcpcd-size "137 KB">
 <!ENTITY dhcpcd-url "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
 <!ENTITY dhcpcd-md5 "6070040c57492925af9ac6aed980de2a">
+<!ENTITY dhcpcd-md5 "bb7d8e8533161fbe0eee3b8830fdbdf4">
 <!ENTITY dhcpcd-home "http://roy.marples.name/projects/dhcpcd">
 …
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
+<!ENTITY eglibc-version "2.18">
+<!ENTITY eglibc-revision "24148">
+<!ENTITY eglibc-fversion "&eglibc-version;-r&eglibc-revision;">
+<!ENTITY eglibc-size "11,943 KB">
+<!ENTITY eglibc-url "http://cross-lfs.org/files/eglibc-&eglibc-fversion;.tar.xz">
+<!ENTITY eglibc-md5 "8b3dc01f6ee5f1654b98213e8d4721a4">
+<!ENTITY eglibc-home "http://www.eglibc.org/home">
+<!ENTITY eglibc-ld-name "ld-&eglibc-version;.so">
+<!ENTITY glibc-version "2.19">
+<!ENTITY glibc-size "12,083 KB">
+<!ENTITY glibc-url "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-&glibc-version;.tar.xz">
+<!ENTITY glibc-md5 "e26b8cc666b162f999404b03970f14e4">
+<!ENTITY glibc-home "http://www.gnu.org/software/libc/">
+<!ENTITY glibc-ld-name "ld-&glibc-version;.so">
 <!ENTITY elftoaout-version "2.3">
 …
 <!ENTITY elftoaout-md5 "be3bd6f7ba8ae107cbdbaa820ba64f86">
 <!ENTITY elftoaout-home " ">
+<!ENTITY expat-version "2.1.0">
+<!ENTITY expat-size "556 KB">
+<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.gz">
+<!ENTITY expat-md5 "dd7dab7a5fea97d2a6a43f511449b7cd">
+<!ENTITY expat-home " ">
 <!ENTITY expect-version "5.45">
 …
 <!ENTITY expect-lib-version "5.43">
 <!ENTITY file-version "5.16">
 <!ENTITY file-size "659 KB">
+<!ENTITY file-version "5.18">
+<!ENTITY file-size "715 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
 <!--<!ENTITY file-url "&packages-root;file-&file-version;.tar.gz">-->
 <!ENTITY file-md5 "359c0cf41c3d438d17b4d293f3b950dc">
+<!ENTITY file-md5 "d420d8f2990cd344673acfbf8d76ff5a">
 <!ENTITY file-home "http://www.darwinsys.com/file">
 …
 <!ENTITY findutils-home "&gnu-software;findutils">
 <!ENTITY flex-version "2.5.37">
 <!ENTITY flex-size "1,276 KB">
+<!ENTITY flex-version "2.5.39">
+<!ENTITY flex-size "1,612 KB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2">
 <!ENTITY flex-md5 "c75940e1fc25108f2a7b3ef42abdae06">
+<!ENTITY flex-md5 "77d44c6bb8c0705e0017ab9a84a1502b">
 <!ENTITY flex-home "http://flex.sourceforge.net">
 <!ENTITY gawk-version "4.1.0">
 <!ENTITY gawk-size "2,004 KB">
+<!ENTITY gawk-version "4.1.1">
+<!ENTITY gawk-size "2,197 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
 <!ENTITY gawk-md5 "b18992ff8faf3217dab55d2d0aa7d707">
+<!ENTITY gawk-md5 "a2a26543ce410eb74bc4a508349ed09a">
 <!ENTITY gawk-home "&gnu-software;gawk">
 …
 <!ENTITY gcc-home "http://gcc.gnu.org">
 <!ENTITY gettext-version "0.18.3.1">
 <!ENTITY gettext-size "16,342 KB">
+<!ENTITY gettext-version "0.18.3.2">
+<!ENTITY gettext-size "15,832 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
 <!ENTITY gettext-md5 "3fc808f7d25487fc72b5759df7419e02">
+<!ENTITY gettext-md5 "241aba309d07aa428252c74b40a818ef">
 <!ENTITY gettext-home "&gnu-software;gettext">
 <!ENTITY gmp-version "5.1.3">
 <!ENTITY gmp-size "1,819 KB">
 <!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;.tar.xz">
 <!ENTITY gmp-md5 "e5fe367801ff067b923d1e6a126448aa">
+<!ENTITY gmp-version "6.0.0">
+<!ENTITY gmp-size "1,904 KB">
+<!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;a.tar.xz">
+<!ENTITY gmp-md5 "1e6da4e434553d2811437aa42c7f7c76">
 <!ENTITY gmp-home "http://gmplib.org/">
+<!ENTITY grep-version "2.15">
+<!ENTITY grep-size "1,267 KB">
+<!ENTITY gperf-version "3.0.4">
+<!ENTITY gperf-size "968 KB">
+<!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
+<!ENTITY gperf-md5 "c1f1db32fb6598d6a93e6e88796a8632">
+<!ENTITY gperf-home "&gnu-software;gperf">
+<!ENTITY grep-version "2.18">
+<!ENTITY grep-size "1,213 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
 <!ENTITY grep-md5 "8cab8ca52bcae735af40278423c7c942">
+<!ENTITY grep-md5 "7439f8266f50844b56cc3e2721606541">
 <!ENTITY grep-home "&gnu-software;grep">
 …
+<!ENTITY intltool-version "0.50.2">
+<!ENTITY intltool-size "192 KB">
+<!ENTITY intltool-url "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
+<!ENTITY intltool-md5 "23fbd879118253cb99aeac067da5f591">
+<!ENTITY intltool-home "http://freedesktop.org/wiki/Software/intltool">
 <!ENTITY iproute2-version "3.12.0">
 <!ENTITY iproute2-size "425 KB">
 …
 <!ENTITY iputils-home "http://www.linuxfoundation.org/en/Net:Iputils">
 <!ENTITY isl-version "0.12.1">
 <!ENTITY isl-size "1,161 KB">
+<!ENTITY isl-version "0.12.2">
+<!ENTITY isl-size "1,171 KB">
 <!ENTITY isl-url "http://isl.gforge.inria.fr/isl-&isl-version;.tar.lzma">
 <!ENTITY isl-md5 "d7a723a508056b9dc5a25c5ca7d1d74f">
 <!ENTITY isl-home "http://garage.kotnet.org/~skimo/isl/">
+<!ENTITY isl-md5 "b7d59eb79d3884e14b9788cc396f7687">
+<!ENTITY isl-home "http://freecode.com/projects/isl">
 <!ENTITY kbd-version "2.0.1">
 <!ENTITY kbd-size "2,009 KB">
 <!ENTITY kbd-url "ftp://devel.altlinux.org/pub/people/legion/kbd/kbd-&kbd-version;.tar.gz">
 <!ENTITY kbd-md5 "cc0ee9f2537d8636cae85a8c6541ed2e">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd/">
 <!ENTITY kmod-version "15">
 <!ENTITY kmod-size "1,454 KB">
+<!ENTITY kbd-size "951 KB">
+<!ENTITY kbd-url "http://kbd-project.org/download/kbd-&kbd-version;.tar.xz">
+<!ENTITY kbd-md5 "55453cb09d90370005e696949092b8f6">
+<!ENTITY kbd-home "http://kbd-project.org/">
+<!ENTITY kmod-version "17">
+<!ENTITY kmod-size "1,484 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
 <!ENTITY kmod-md5 "d03372179ed2cfa0c52b6672cf438901">
+<!ENTITY kmod-md5 "bc36d28b12dcb2b664a35411560c5610">
 <!ENTITY kmod-home "http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary">
 <!ENTITY less-version "460">
 <!ENTITY less-size "311 KB">
+<!ENTITY less-version "462">
+<!ENTITY less-size "312 KB">
 <!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
 <!ENTITY less-md5 "c3b603140aed2beb6091fdbc27f80ff0">
+<!ENTITY less-md5 "55a001838501ed8a129682de047960df">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less">
+<!ENTITY libee-version "0.4.1">
+<!ENTITY libee-size "352 KB">
+<!ENTITY libee-url "http://www.libee.org/download/files/download/libee-&libee-version;.tar.gz">
+<!ENTITY libee-md5 "7bbf4160876c12db6193c06e2badedb2">
+<!ENTITY libee-home "http://www.libee.org/">
+<!ENTITY libestr-version "0.1.5">
+<!ENTITY libestr-size "326 KB">
+<!ENTITY libestr-url "http://libestr.adiscon.com/files/download/libestr-&libestr-version;.tar.gz">
+<!ENTITY libestr-md5 "f180c0cdc82883d161eba3f2e8a34eb4">
+<!ENTITY libestr-home "http://libestr.adiscon.com/">
+<!ENTITY libcap-version "2.24">
+<!ENTITY libcap-size "68 KB">
+<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
+<!ENTITY libcap-md5 "d43ab9f680435a7fff35b4ace8d45b80">
+<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
 <!ENTITY libtool-version "2.4.2">
 …
 <!ENTITY linux-dl-version "3.0">
 <!ENTITY linux-version "3.12">
 <!ENTITY linux-size "76,385 KB">
+<!ENTITY linux-version "3.12.15">
+<!ENTITY linux-size "76,414 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.xz">
 <!ENTITY linux-md5 "cc6ee608854e0da4b64f6c1ff8b6398c">
+<!ENTITY linux-md5 "4eb2b7f62fd504d07b77f54bcd3cb758">
 <!ENTITY linux-home "http://www.kernel.org">
 …
 <!ENTITY man-version "1.6g">
 <!ENTITY man-size "252 KB">
 <!ENTITY man-url "http://primates.ximian.com/~flucifredi/man/man-&man-version;.tar.gz">
+<!ENTITY man-url "&packages-root;man-&man-version;.tar.gz">
 <!ENTITY man-md5 "ba154d5796928b841c9c69f0ae376660">
+<!ENTITY man-home "http://primates.ximian.com/~flucifredi/man">
+<!ENTITY man-pages-version "3.55">
+<!ENTITY man-pages-size "1,177 KB">
+<!ENTITY man-pages-version "3.64">
+<!ENTITY man-pages-size "1,222 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
 <!ENTITY man-pages-md5 "443b13defb23df578aa11c6c768f2c7d">
+<!ENTITY man-pages-md5 "e39da1ac5a5effd4514809301bad47a8">
 <!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
 <!ENTITY mpc-version "1.0.1">
 <!ENTITY mpc-size "616 KB">
+<!ENTITY mpc-version "1.0.2">
+<!ENTITY mpc-size "624 KB">
 <!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
 <!ENTITY mpc-md5 "b32a2e1a3daa392372fbd586d1ed3679">
+<!ENTITY mpc-md5 "68fadff3358fb3e7976c7a398a0af4c3">
 <!ENTITY mpc-home "http://www.multiprecision.org/">
 …
 <!ENTITY patch-home "http://savannah.gnu.org/projects/patch">
 <!ENTITY perl-version "5.18.1">
 <!ENTITY perl-size "14,060 KB">
+<!ENTITY perl-version "5.18.2">
+<!ENTITY perl-size "14,059 KB">
 <!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
 <!ENTITY perl-md5 "4ec1a3f3824674552e749ae420c5e68c">
+<!ENTITY perl-md5 "d549b16ee4e9210988da39193a9389c1">
 <!ENTITY perl-home "http://www.perl.org">
 …
 <!ENTITY powerpcutils-home "http://packages.qa.debian.org/p/powerpc-utils.html">
 <!ENTITY procps-version "3.2.8">
 <!ENTITY procps-size "280 KB">
 <!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz">
 <!ENTITY procps-md5 "9532714b6846013ca9898984ba4cd7e0">
 <!ENTITY procps-home "http://procps.sourceforge.net">
 <!ENTITY psmisc-version "22.20">
 <!ENTITY psmisc-size "428 KB">
+<!ENTITY procps-ng-version "3.3.9">
+<!ENTITY procps-ng-size "548 KB">
+<!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
+<!ENTITY procps-ng-md5 "0980646fa25e0be58f7afb6b98f79d74">
+<!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
+<!ENTITY psmisc-version "22.21">
+<!ENTITY psmisc-size "458 KB">
 <!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
 <!ENTITY psmisc-md5 "a25fc99a6dc7fa7ae6e4549be80b401f">
+<!ENTITY psmisc-md5 "935c0fd6eb208288262b385fa656f1bf">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net">
+<!ENTITY readline-version2 "6">
+<!ENTITY readline-version "&readline-version2;.2">
+<!ENTITY readline-size "2,228 KB">
+<!ENTITY readline-version "6.3">
+<!ENTITY readline-size "2,469 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
 <!ENTITY readline-md5 "67948acb2ca081f23359d0256e9a271c">
+<!ENTITY readline-md5 "33c8fb279e981274f485fd91da77e94a">
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
-<!ENTITY rsyslog-version "6.4.2">
-<!ENTITY rsyslog-size "2,519 KB">
-<!ENTITY rsyslog-url "http://www.rsyslog.com/files/download/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
-<!ENTITY rsyslog-md5 "7de0124ec7d67ce2bfda0009ab1263ee">
-<!ENTITY rsyslog-home "http://www.rsyslog.com/">
 <!ENTITY sed-version "4.2.2">
 …
 <!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
 <!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
+<!ENTITY systemd-version "212">
+<!ENTITY systemd-size "2,723 KB">
+<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
+<!ENTITY systemd-md5 "257a75fff826ff91cb1ce567091cf270">
+<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
 <!ENTITY tar-version "1.27.1">
 …
 <!ENTITY tcl-home "http://www.tcl.tk">
 <!ENTITY tzdata-version "2013h">
 <!ENTITY tzdata-size "227 KB">
+<!ENTITY tzdata-version "2014b">
+<!ENTITY tzdata-size "221 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
 <!ENTITY tzdata-md5 "d310abe42cbe87e76ceb69e2c7003c92">
+<!ENTITY tzdata-md5 "c58d556612396d4ca5a17807a79924e5">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 …
 <!ENTITY texinfo-home "&gnu-software;texinfo">
 <!ENTITY eudev-version "1.3">
 <!ENTITY eudev-size "1,679 KB">
+<!ENTITY eudev-version "1.5.3">
+<!ENTITY eudev-size "1,724 KB">
 <!ENTITY eudev-url "ftp://mirror.ovh.net/gentoo-distfiles/distfiles/eudev-&eudev-version;.tar.gz">
 <!ENTITY eudev-md5 "164df78f6f0093578a20bdd00335845f">
+<!ENTITY eudev-md5 "51380938b489385cc394f4ebabc048f0">
 <!ENTITY eudev-home "http://www.gentoo.org/proj/en/eudev/">
 …
 <!ENTITY util-linux-major-version "2.24">
 <!ENTITY util-linux-version "&util-linux-major-version;">
 <!ENTITY util-linux-size "3,532 KB">
+<!ENTITY util-linux-version "&util-linux-major-version;.1">
+<!ENTITY util-linux-size "3,544 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.xz">
 <!ENTITY util-linux-md5 "4fac6443427f575fc5f3531a4ad2ca01">
+<!ENTITY util-linux-md5 "88d46ae23ca599ac5af9cf96b531590f">
 <!ENTITY util-linux-blkid-id "1.1.0">
 <!ENTITY util-linux-uuid-id "1.3.0">
 …
 <!ENTITY vim-home "http://www.vim.org">
+<!ENTITY xml-parser-version "2.42_01">
+<!ENTITY xml-parser-size "240 KB">
+<!ENTITY xml-parser-url "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
+<!ENTITY xml-parser-md5 "a4650aebcc464bb91113c2c356da8210">
+<!ENTITY xml-parser-home "https://github.com/chorny/XML-Parser">
 <!ENTITY xz-version "5.0.5">
 <!ENTITY xz-size "908 KB">

BOOK/patches.ent

-              r88ef769
+              r03e6a40
 <!-- Start of Common Patches -->
 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-7.patch">
 <!ENTITY bash-branch_update-patch-md5 "4dfb1ce9b5d0040eae06e66157ab213a">
 <!ENTITY bash-branch_update-patch-size "58 KB">
+<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
+<!ENTITY bash-branch_update-patch-md5 "a0ae18e2dc5c9c5e125e0ea3fa6febbe">
+<!ENTITY bash-branch_update-patch-size "9.002 KB">
 <!-- Binutils branch update area
 …
 <!ENTITY coreutils-uname-patch-size "4.9 KB">
+<!ENTITY coreutils-noman-patch "coreutils-&coreutils-version;-noman-1.patch">
+<!ENTITY coreutils-noman-patch-md5 "6ed8f515391580e51f170a32af6fc7b9">
+<!ENTITY coreutils-noman-patch-size "14 KB">
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
 <!ENTITY gcc-specs-patch-md5 "14aa064a113f2cae0f877039bb4a6357">
 …
 <!-- GCC branch update area -->
 <!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch">
 <!ENTITY gcc-branch_update-patch-md5 "7739dbf68ba5736cbf4676f30b358e74">
 <!ENTITY gcc-branch_update-patch-size "258 KB">
+<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-2.patch">
+<!ENTITY gcc-branch_update-patch-md5 "30b9b9e35cb742edf380b0c05c9a5879">
+<!ENTITY gcc-branch_update-patch-size "1,964 KB">
+<!ENTITY iana-etc-get_fix-patch "iana-etc-&iana-etc-version;-get_fix-1.patch">
+<!ENTITY iana-etc-get_fix-patch-md5 "73aee2dc34cf4d990cc22fe323d89f27">
+<!ENTITY iana-etc-get_fix-patch-size "1.1 KB">
+<!ENTITY iana-etc-numbers_update-date "20140202">
+<!ENTITY iana-etc-numbers_update-patch "iana-etc-&iana-etc-version;-numbers_update-&iana-etc-numbers_update-date;-2.patch.xz">
+<!ENTITY iana-etc-numbers_update-patch-md5 "b0e7051fef0b3ba064209a5f3d23bd2a">
+<!ENTITY iana-etc-numbers_update-patch-size "282 KB">
+<!ENTITY iana-etc-numbers_update-date "20120610">
+<!ENTITY iana-etc-numbers_update-patch "iana-etc-&iana-etc-version;-numbers_update-&iana-etc-numbers_update-date;-2.patch">
+<!ENTITY iana-etc-numbers_update-patch-md5 "826fb780d13caafb7cb99b9c346f2102">
+<!ENTITY iana-etc-numbers_update-patch-size "3,760 KB">
+<!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-1.patch">
+<!ENTITY iputils-fixes-patch-md5 "a2e77de7fd1fc4417bce0af3e6ffdfcb">
+<!ENTITY iputils-fixes-patch-size "153 KB">
+<!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-2.patch">
+<!ENTITY iputils-fixes-patch-md5 "c2344acdd81607685886f617da7d66e0">
+<!ENTITY iputils-fixes-patch-size "158 KB">
 <!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch">
 …
 <!ENTITY man-i18n-patch-size "11 KB">
 <!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-1.patch">
 <!ENTITY mpfr-fixes-patch-md5 "9c3b271ded070f8cb202459165a87f88">
 <!ENTITY mpfr-fixes-patch-size "23 KB">
+<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-2.patch">
+<!ENTITY mpfr-fixes-patch-md5 "2951be1103eb20a4acff2a8fce29ca22">
+<!ENTITY mpfr-fixes-patch-size "30 KB">
 <!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
 …
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 <!ENTITY perl-libc-patch-md5 "63eda1cc319206788ea93c58f395417c">
 <!ENTITY perl-libc-patch-size "1.603 KB">
+<!ENTITY perl-libc-patch-md5 "0959d8c1d370ce152b0d2a6df5ccfd7e">
+<!ENTITY perl-libc-patch-size "1.657 KB">
 <!ENTITY procps-ps_cgroup-patch "procps-&procps-version;-ps_cgroup-1.patch">
 <!ENTITY procps-ps_cgroup-patch-md5 "3c478ef88fad23353e332b1b850ec630">
 <!ENTITY procps-ps_cgroup-patch-size "3.1 KB">
+<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
+<!ENTITY readline-branch_update-patch-md5 "dbb0a021abfd0a0012b62c66e6943802">
+<!ENTITY readline-branch_update-patch-size "1.920 KB">
+<!ENTITY procps-fix_HZ_errors-patch "procps-&procps-version;-fix_HZ_errors-1.patch">
+<!ENTITY procps-fix_HZ_errors-patch-md5 "2ea4c8e9a2c2a5a291ec63c92d7c6e3b">
+<!ENTITY procps-fix_HZ_errors-patch-size "2.4 KB">
+<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-3.patch">
+<!ENTITY readline-branch_update-patch-md5 "af788f5b1cfc5db9efc9e0fa0268a574">
+<!ENTITY readline-branch_update-patch-size "4.9 KB">
+<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
+<!ENTITY systemd-compat-patch-md5 "09bfa3f4b09620555aa107e48a4f850b">
+<!ENTITY systemd-compat-patch-size "9.244 KB">
 <!ENTITY tar-man-patch "tar-&tar-version;-manpage-1.patch">
 …
 <!-- Vim branch update patch area -->
 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-1.patch">
 <!ENTITY vim-branch_update-patch-md5 "b5fdb7f4e4cc27932a9183c8e289029d">
 <!ENTITY vim-branch_update-patch-size "460 KB">
+<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-2.patch">
+<!ENTITY vim-branch_update-patch-md5 "aa2e7384582ddd94ce7e5d91bebce78f">
+<!ENTITY vim-branch_update-patch-size "2,740 KB">
 <!-- Start of multilib patches -->
 …
 <!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
 <!ENTITY perl-multilib-patch-md5 "d339c17439ac986d9593c86db93d545c">
 <!ENTITY perl-multilib-patch-size "1.946 KB">
+<!ENTITY perl-multilib-patch-md5 "5b79ffc5337193d4f725d4bfd3c60997">
+<!ENTITY perl-multilib-patch-size "2.000 KB">
 <!-- Start of Pure64 patches -->
 …
 <!ENTITY aboot-alpha-patch-size "175 KB">
 <!ENTITY eglibc-alpha_fixes-patch "glibc-&glibc-version;-alpha_fixes-1.patch">
 <!ENTITY eglibc-alpha_fixes-patch-md5 "5d279206a752199e39a4e99c4950271d">
 <!ENTITY eglibc-alpha_fixes-patch-size "7 KB">
+<!ENTITY glibc-alpha_fixes-patch "glibc-&glibc-version;-alpha_fixes-1.patch">
+<!ENTITY glibc-alpha_fixes-patch-md5 "5d279206a752199e39a4e99c4950271d">
+<!ENTITY glibc-alpha_fixes-patch-size "7 KB">
 <!-- Start of mips/mips64 patches -->

BOOK/prologue/common/hostreqs.xml

-              r88ef769
+              r03e6a40
     <listitem>
       <para><emphasis role="strong">Glibc-2.2.5</emphasis> (Versions
       greater than &eglibc-version; are not recommended as they have
+      greater than &glibc-version; are not recommended as they have
       not been tested)</para>
     </listitem>
 …
     <listitem>
       <para><emphasis role="strong">XZ-Utils-4.999.8beta</emphasis></para>
+      <para><emphasis role="strong">XZ Utils-4.999.8beta</emphasis></para>
     </listitem>

BOOK/prologue/common/prerequisites.xml

r88ef769	r03e6a40
41	41	<listitem>
42	42	<para remap="verbatim">The Linux Users' Guide
43		<ulink url="http://www.~~linuxhq.com/guides/LUG/guide.html~~"/></para>
	43	<ulink url="http://www.tldp.org/pub/Linux/docs/ldp-archived/users-guide/"/></para>
44	44
45	45	<para>This guide covers the usage of assorted Linux software.</para>

BOOK/temp-system/64/binutils.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ea'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='be'])"/>

BOOK/temp-system/64/check.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-testsuite-tools-check" role="wrap">
+<sect1 id="ch-temp-system-check" role="wrap">
   <?dbhtml filename="check.html"?>
   <title>Check-&check-version;</title>
   <indexterm zone="ch-testsuite-tools-check">
+  <indexterm zone="ch-temp-system-check">
     <primary sortas="a-Check">Check</primary>
   </indexterm>
 …
 <screen os="d"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/check.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/64/cloog.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/cloog.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/cloog.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='c'])"/>

BOOK/temp-system/64/gcc.xml

-              r88ef769
+              r03e6a40
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --enable-cloog-backend=isl --with-gmp=/tools --with-mpfr=/tools \
+    --with-mpc=/tools --with-isl=/tools --disable-isl-version-check \
+    --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
     --with-cloog=/tools --with-system-zlib \
     --with-native-system-header-dir=/tools/include --enable-checking=release \

BOOK/temp-system/64/gmp.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/gmp.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='c'])"/>

BOOK/temp-system/64/util-linux.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-chroot-util-linux" role="wrap">
+<sect1 id="ch-temp-system-util-linux" role="wrap">
   <?dbhtml filename="util-linux.html"?>
   <title>Util-linux-&util-linux-version;</title>
   <indexterm zone="ch-chroot-util-linux">
+  <indexterm zone="ch-temp-system-util-linux">
     <primary sortas="a-Util-linux">Util-linux</primary>
     <secondary>chroot</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 …
 <screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
+    --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/alpha-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>

BOOK/temp-system/common/bash.xml

-              r88ef769
+              r03e6a40
 <!--
     <variablelist os="c">
       <title>The meaning of the configure option:</title>
+      <title>The meaning of the new configure option:</title>
       <varlistentry>
 …
 <c:command>make install</c:command>
-    <c:para>Make a link for programs that use <c:command>sh</c:command> for
-    a shell:</c:para>
-<c:command>ln -sv bash /tools/bin/sh</c:command>
   </c:install>

BOOK/temp-system/common/bison.xml

-              r88ef769
+              r03e6a40
 <screen os='s2'><userinput>cp -v Makefile.in{,.orig}
 sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='t3'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='t4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/common/check.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-testsuite-tools-check" role="wrap">
+<sect1 id="ch-temp-system-check" role="wrap">
   <?dbhtml filename="check.html"?>
   <title>Check-&check-version;</title>
   <indexterm zone="ch-testsuite-tools-check">
+  <indexterm zone="ch-temp-system-check">
     <primary sortas="a-Check">Check</primary>
   </indexterm>
 …
 <screen os="d"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    <variablelist os="e">
+      <title>The meaning of the new configure option:</title>
+      <varlistentry>
+        <term><parameter>PKG_CONFIG=</parameter></term>
+        <listitem>
+          <para>Prevents check from using <command>pkg-config</command> to
+          search for additional packages that may be on the host but
+          won't exist inside the temporary build environment.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
     <para os="f">Build the package:</para>
 …
           <para>Awk script for generating C unit tests for use with the C the
           Check unit testing framework</para>
           <indexterm zone="ch-testsuite-tools-check checkmk">
+          <indexterm zone="ch-temp-system-check checkmk">
             <primary sortas="b-check">checkmk</primary>
           </indexterm>
 …
           <para>Contains functions that allow Check to be called from a test
           program</para>
           <indexterm zone="ch-testsuite-tools-check libcheck">
+          <indexterm zone="ch-temp-system-check libcheck">
             <primary sortas="c-libcheck">libcheck.{a,so};</primary>
           </indexterm>

BOOK/temp-system/common/choose.xml

r88ef769	r03e6a40
36	36	<para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
37	37	(having been compiled with GCC-4.1.2 or greater). The reason for the
38		kernel version requirement is that eglibc is built to generate the library
	38	kernel version requirement is that glibc is built to generate the library
39	39	for the smallest version of the Linux kernel expected to be supported.</para>
40	40

BOOK/temp-system/common/cloog.xml

-              r88ef769
+              r03e6a40
     --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/cloog.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/cloog.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
     <para os="c">Compile the package:</para>

BOOK/temp-system/common/coreutils.xml

-              r88ef769
+              r03e6a40
 EOF</userinput></screen>
+    <para os="p1">Apply a patch to prevent Coreutils from generating manpages :</para>
+<screen os="p2"><userinput>patch -Np1 -i ../&coreutils-noman-patch;</userinput></screen>
     <para os="bd">Prepare Coreutils for compilation:</para>
 …
     </variablelist>
-    <para os="s1">Apply a sed to allow completion of the build:</para>
-<screen os="s2"><userinput>cp -v Makefile{,.orig}
-sed -e 's/^#run_help2man\|^run_help2man/#&amp;/' \
-  -e 's/^\##run_help2man/run_help2man/' Makefile.orig > Makefile</userinput></screen>
    <para os="bf">Compile the package:</para>

BOOK/temp-system/common/gawk.xml

-              r88ef769
+              r03e6a40
   <sect2 role="installation">
     <title>Installation of Gawk</title>
-    <para os="s1">Apply a sed which will allow the build system to complete without error:</para>
-<screen os="s2"><userinput>cp -v extension/Makefile.in{,.orig}
-sed -e 's/check-recursive all-recursive: check-for-shared-lib-support/check-recursive all-recursive:/' \
-  extension/Makefile.in.orig > extension/Makefile.in</userinput></screen>
     <para os="a">Prepare Gawk for compilation:</para>

BOOK/temp-system/common/gcc.xml

-              r88ef769
+              r03e6a40
   --enable-c99 --enable-shared --enable-threads=posix --disable-multilib \
   --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
+  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
+  --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
+  --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
+  --disable-libstdcxx-pch --with-gmp=/tools --with-mpfr=/tools \
+  --with-mpc=/tools --with-isl=/tools --with-cloog=/tools --with-system-zlib \
   --with-native-system-header-dir=/tools/include --disable-libssp \
+  --disable-install-libiberty --enable-checking=release \
+  --enable-libstdcxx-time</userinput></screen>
+  --enable-checking=release --enable-libstdcxx-time</userinput></screen>
     <variablelist os="cl">
       <title>The meaning of the new configure options:</title>
+      <title>The meaning of the new configure option:</title>
       <varlistentry os="cl1">

BOOK/temp-system/common/gettext.xml

-              r88ef769
+              r03e6a40
 <screen os="b"><userinput>cd gettext-tools</userinput></screen>
+    <para os="t1">When cross-compiling the Gettext configure script assumes we
+    don't have a working wcwidth when we do. The following will fix possible
+    <para os="t1">When cross-compiling, the Gettext
+    <command>configure</command> script assumes we don't have a working wcwidth
+    even when when we do. The following will fix possible
     compilation errors because of this assumption:</para>
 …
     --disable-shared --cache-file=config.cache</userinput></screen>
+    <variablelist os="e">
+      <title>The meaning of the configure options:</title>
+    <para os="e">Compile the required programs and support library:</para>
+      <varlistentry os="e1">
+        <term><parameter>--disable-shared</parameter></term>
+        <listitem>
+          <para>This tells Gettext not to create a shared library.</para>
+        </listitem>
+      </varlistentry>
+<screen os="f"><userinput>make -C gnulib-lib
+make -C src msgfmt msgmerge xgettext</userinput></screen>
+    </variablelist>
+    <para os="g">Install the <command>msgfmt</command>,
+    <command>msgmerge</command> and <command>xgettext</command> binaries:</para>
+    <para os="f">Compile the package:</para>
+<screen os="g"><userinput>make -C gnulib-lib
+make -C src msgfmt</userinput></screen>
+    <para os="h">Install the <command>msgfmt</command> binary:</para>
+<screen os="i"><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
+<screen os="h"><userinput>cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
   </sect2>

BOOK/temp-system/common/grep.xml

r88ef769	r03e6a40
40	40	assumes there is no usable <filename>regex.h</filename> installed and
41	41	instead uses the one included with Grep. This switch forces the use of
42		the regex functions from EGLIBC.</para>
	42	the regex functions from GLIBC.</para>
43	43	</listitem>
44	44	</varlistentry>

BOOK/temp-system/common/make.xml

r88ef769	r03e6a40
27	27	xpointer="xpointer(//*[@os='a'])"/>
28	28
29		<screen os="aa"><userinput>./configure --prefix=/tools \
	29	<screen os="aa"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
30	30	--build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
31	31

BOOK/temp-system/common/ncurses.xml

-              r88ef769
+              r03e6a40
         <term><parameter>--with-build-cc=gcc</parameter></term>
         <listitem>
+          <para>This tells Ncurses what type of compiler we are using.</para>
+          <para>This tells Ncurses which compiler to use to build native tools
+          when cross-compiling.</para>
         </listitem>
       </varlistentry>

BOOK/temp-system/common/texinfo.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
 <screen os="b"><userinput>./configure --prefix=/tools \
+<screen os="b"><userinput>PERL=/usr/bin/perl ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    <variablelist os="ba">
+      <title>The meaning of the new configure option:</title>
+      <varlistentry>
+        <term><parameter>PERL=/usr/bin/perl</parameter></term>
+        <listitem>
+          <para>This forces Texinfo to use
+          <filename class="directory">/usr/bin</filename> as the location of
+          <command>perl</command>, as some host systems may have it in
+          <filename class="directory">/bin</filename>.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/common/util-linux.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-chroot-util-linux" role="wrap">
+<sect1 id="ch-temp-system-util-linux" role="wrap">
   <?dbhtml filename="util-linux.html"?>
   <title>Util-linux-&util-linux-version;</title>
   <indexterm zone="ch-chroot-util-linux">
+  <indexterm zone="ch-temp-system-util-linux">
     <primary sortas="a-Util-linux">Util-linux</primary>
     <secondary>chroot</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 …
 <screen os="b"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-makeinstall-chown --disable-su --disable-login</userinput></screen>
+    --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
+    <variablelist os="c">
+      <title>The meaning of the new configure option:</title>
+      <varlistentry>
+        <term><parameter>--disable-makeinstall-chown</parameter></term>
+        <listitem>
+          <para>This prevents Util-linux from trying to perform any
+          chown commands when it is installed.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/common/vim.xml

-              r88ef769
+              r03e6a40
     --with-tlib=ncurses</userinput></screen>
+    <variablelist os="f">
+      <title>The meaning of the new configure options:</title>
+      <varlistentry>
+        <term><parameter>--enable-multibyte</parameter></term>
+        <listitem>
+          <para>This optional but highly recommended switch enables support
+          for editing files in multibyte character encodings. This is needed
+          if using a locale with a multibyte character set. This switch is
+          also helpful to be able to edit text files initially created in
+          Linux distributions like Fedora that use UTF-8 as a default
+          character set.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--enable-gui=no --disable-gtktest --disable-xim --with-features=normal --disable-gpm --without-x --disable-netbeans</parameter></term>
+        <listitem>
+          <para>These options prevent Vim from trying to link to libraries
+          that might be on the host but won't exist inside the temporary
+          build environment.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--with-tlib=ncurses</parameter></term>
+        <listitem>
+          <para>Tells Vim to use Ncurses as its terminal library.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/vim.xml"
 …
     xpointer="xpointer(//*[@os='j'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/vim.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+<screen os="k"><userinput>make install</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen os="tv2"><userinput>cat &gt; /tools/etc/vimrc &lt;&lt; "EOF"
 <literal>" Begin /etc/vimrc
+<literal>" Begin /tools/etc/vimrc
 set nocompatible
 …
 syntax on
 " End /etc/vimrc</literal>
+" End /tools/etc/vimrc</literal>
 EOF</userinput></screen>

BOOK/temp-system/common/xz.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-temp-system-xz">
     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
     <secondary>temporary system</secondary>
   </indexterm>
 …
   <sect2 role="installation">
     <title>Installation of XZ-Utils</title>
+    <title>Installation of XZ Utils</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/mips-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>

BOOK/temp-system/mips64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>

BOOK/temp-system/mips64-64/gcc.xml

-              r88ef769
+              r03e6a40
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --enable-cloog-backend=isl --with-gmp=/tools --with-mpfr=/tools \
+    --with-mpc=/tools --with-isl=/tools --disable-isl-version-check \
+    --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
     --with-cloog=/tools --with-system-zlib --enable-checking=release \
     --enable-libstdcxx-time --with-native-system-header-dir=/tools/include</userinput></screen>

BOOK/temp-system/mips64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>

BOOK/temp-system/mips64/choose.xml

r88ef769	r03e6a40
32	32	xpointer="xpointer(//*[@os='d'])"/>
33	33
34		<para>To chroot, you will also need a Linux Kernel-2.6.32 or greater (having been compiled with GCC-4.1.2 or greater). The reason for the kernel version requirement is that eglibc is built to generate the library for the smallest version of the Linux kernel expected to be supported.</para>
	34	<para>To chroot, you will also need a Linux Kernel-2.6.32 or greater (having been compiled with GCC-4.1.2 or greater). The reason for the kernel version requirement is that glibc is built to generate the library for the smallest version of the Linux kernel expected to be supported.</para>
35	35
36	36	<para>To check your kernel version, run <command>cat /proc/version</command> - if it does not say that you are running a 2.6.32 or later Linux kernel, compiled with GCC 4.1.2 or later, you cannot chroot.</para>

BOOK/temp-system/mips64/gcc.xml

-              r88ef769
+              r03e6a40
   --enable-c99 --enable-shared --enable-threads=posix \
   --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
+  --disable-libstdcxx-pch --with-abi=64 --enable-cloog-backend=isl \
+  --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
+  --disable-isl-version-check --with cloog=/tools --with-system-zlib \
+  --disable-libstdcxx-pch --with-abi=64 --with-gmp=/tools --with-mpfr=/tools \
+  --with-mpc=/tools --with-isl=/tools --with cloog=/tools --with-system-zlib \
   --enable-checking=release --enable-libstdcxx-time \
   --with-native-system-header-dir=/tools/include</userinput></screen>

BOOK/temp-system/multilib/binutils.xml

-              r88ef769
+              r03e6a40
     --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
-    <variablelist os="ea">
-      <title>The meaning of the new configure options:</title>
-      <varlistentry>
-        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Tells the compiler to use our 64-bit build flags.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"

BOOK/temp-system/multilib/bison.xml

-              r88ef769
+              r03e6a40
     href="../common/bison.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='t3'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='t4'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/multilib/check.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-testsuite-tools-check" role="wrap">
+<sect1 id="ch-temp-system-check" role="wrap">
   <?dbhtml filename="check.html"?>
   <title>Check-&check-version;</title>
   <indexterm zone="ch-testsuite-tools-check">
+  <indexterm zone="ch-temp-system-check">
     <primary sortas="a-Check">Check</primary>
   </indexterm>
 …
 <screen os="d"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/check.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/multilib/choose.xml

r88ef769	r03e6a40
32	32	<para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
33	33	(having been compiled with GCC-4.1.2 or greater). The reason for the
34		kernel version requirement is that eglibc is built to generate the library
	34	kernel version requirement is that glibc is built to generate the library
35	35	for the smallest version of the Linux kernel expected to be supported.</para>
36	36

BOOK/temp-system/multilib/cloog.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/cloog.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/cloog.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='c'])"/>

BOOK/temp-system/multilib/coreutils.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/coreutils.xml"
     xpointer="xpointer(//*[@os='bd'])"/>
 …
     href="../common/coreutils.xml"
     xpointer="xpointer(//*[@os='be1'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/multilib/gawk.xml

-              r88ef769
+              r03e6a40
   <sect2 role="installation">
     <title>Installation of Gawk</title>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/multilib/gcc.xml

-              r88ef769
+              r03e6a40
   --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
   --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
+  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
+  --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
+  --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
+  --disable-libstdcxx-pch --with-gmp=/tools --with-mpfr=/tools \
+  --with-mpc=/tools --with-isl=/tools --with-cloog=/tools --with-system-zlib \
   --with-native-system-header-dir=/tools/include --disable-libssp \
+  --disable-install-libiberty  --enable-libstdcxx-time \
+  --enable-checking=release</userinput></screen>
+  --enable-libstdcxx-time --enable-checking=release</userinput></screen>
     <variablelist os="dd">

BOOK/temp-system/multilib/gettext.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='h'])"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
   </sect2>

BOOK/temp-system/multilib/gmp.xml

-              r88ef769
+              r03e6a40
     --libdir=/tools/lib64 --enable-cxx</userinput></screen>
+    <variablelist os="ba">
+      <title>The meaning of the new configure option:</title>
+      <varlistentry>
+        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
+        <listitem>
+          <para>Tells the compiler to use our 64-bit build flags.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"

BOOK/temp-system/multilib/make.xml

r88ef769	r03e6a40
27	27	xpointer="xpointer(//*[@os='a'])"/>
28	28
29		<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
	29	<screen os="aa"><userinput>PKG_CONFIG= CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
30	30	--build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
31	31

BOOK/temp-system/multilib/texinfo.xml

-              r88ef769
+              r03e6a40
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>PERL=/usr/bin/perl CC="${CC} ${BUILD64}" \
+./configure --prefix=/tools \
    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/multilib/util-linux.xml

-              r88ef769
+              r03e6a40
 ]>
 <sect1 id="ch-boot-util-linux" role="wrap">
+<sect1 id="ch-temp-system-util-linux" role="wrap">
   <?dbhtml filename="util-linux.html"?>
   <title>Util-linux-&util-linux-version;</title>
   <indexterm zone="ch-boot-util-linux">
+  <indexterm zone="ch-temp-system-util-linux">
     <primary sortas="a-Util-linux">Util-linux</primary>
     <secondary>boot</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 …
     xpointer="xpointer(//*[@os='a'])"/>
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= \
+  ./configure --prefix=/tools --exec-prefix=/tools \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
+    --libdir=/tools/lib64 --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/temp-system/multilib/vim.xml

-              r88ef769
+              r03e6a40
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='g'])"/>

BOOK/temp-system/multilib/xz.xml

-              r88ef769
+              r03e6a40
   <indexterm zone="ch-temp-system-xz">
     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
     <secondary>temporary system</secondary>
   </indexterm>
 …
   <sect2 role="installation">
     <title>Installation of XZ-Utils</title>
+    <title>Installation of XZ Utils</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 …
 <screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
      --build=${CLFS_HOST} --host=${CLFS_TARGET}\
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --libdir=/tools/lib64</userinput></screen>

BOOK/temp-system/ppc-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>

BOOK/temp-system/ppc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>

BOOK/temp-system/ppc64-64/gcc.xml

-              r88ef769
+              r03e6a40
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --enable-cloog-backend=isl --with-gmp=/tools --with-mpfr=/tools \
+    --with-mpc=/tools --with-isl=/tools --disable-isl-version-check \
+    --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
     --with-cloog=/tools --with-system-zlib \
     --with-native-system-header-dir=/tools/include --enable-checking=release \

BOOK/temp-system/ppc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>

BOOK/temp-system/sparc-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>

BOOK/temp-system/sparc64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>

BOOK/temp-system/sparc64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>

BOOK/temp-system/x86-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>

BOOK/temp-system/x86_64-64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>

BOOK/temp-system/x86_64-chapter.xml

-              r88ef769
+              r03e6a40
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
 …
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>

BOOK/users_groups.ent

-              r88ef769
+              r03e6a40
 <!ENTITY uid-adm "3">
 <!ENTITY uid-lp "10">
+<!ENTITY uid-messagebus "27">
 <!ENTITY uid-mail "30">
 <!ENTITY uid-news "31">
 …
 <!ENTITY gid-console "17">
 <!ENTITY gid-cdrw "18">
+<!ENTITY gid-messagebus "27">
+<!ENTITY gid-systemd-journal "28">
 <!ENTITY gid-mail "30">
 <!ENTITY gid-news "31">
+<!ENTITY gid-wheel "39">
 <!ENTITY gid-users "1000">
 <!ENTITY gid-nogroup "65533">
-<!ENTITY gid-nobody "65534">

patches/iputils-s20121221-fixes-2.patch

-              r88ef769
+              r03e6a40
 Submitted By: William Harrington <kb0iic at cross-lfs dot org>
 Date: 2013-08-06
+Date: 2014-04-01
 Initial Package Version: s20121221
 Upstream Status: Unknown
 Origin: Unknown
+Upstream Status: Applied
+Origin: git://git.linux-ipv6.org/gitroot/iputils.git
 Description: Contains Fixes for Various Issues and Manpages
 diff -Naur iputils-s20121221.orig/Makefile iputils-s20121221/Makefile
 --- iputils-s20121221.orig/Makefile     2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/Makefile  2013-08-06 18:09:09.448346619 +0000
+@@ -2,8 +2,6 @@
+ # Configuration
+ #
+-# CC
+-CC=gcc
+ # Path to parent kernel include files directory
+ LIBC_INCLUDE=/usr/include
+ # Libraries
+@@ -36,7 +34,7 @@
+ # GNU TLS library for ping6 [yes|no|static]
+ USE_GNUTLS=yes
+-# Crypto library for ping6 [shared|static]
++# Crypto library for ping6 [shared|static|no]
+ USE_CRYPTO=shared
+ # Resolv library for ping6 [yes|static]
+ USE_RESOLV=yes
+@@ -48,11 +46,10 @@
+ # -------------------------------------
+ # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
+-# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
+-CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
+-CCOPTOPT=-O3
+-GLIBCFIX=-D_GNU_SOURCE
+-DEFINES=
++# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
++CFLAGS?=-O3 -g
++CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
++CPPFLAGS+=-D_GNU_SOURCE
+ LDLIB=
+ FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
+@@ -63,7 +60,10 @@
+        LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS))
+        DEF_CRYPTO = -DUSE_GNUTLS
+ else
++ifneq ($(USE_CRYPTO),no)
+        LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
++       DEF_CRYPTO = -DUSE_OPENSSL
++endif
+ endif
+ # USE_RESOLV: LIB_RESOLV
+@@ -110,7 +110,6 @@
+ IPV6_TARGETS=tracepath6 traceroute6 ping6
+ TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
+-CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
+ LDLIBS=$(LDLIB) $(ADDLIB)
+ UNAME_N:=$(shell uname -n)
+@@ -129,6 +128,7 @@
+        $(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@
+ %.o: %.c
+        $(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
++LINK.o += $(CFLAGS)
+ $(TARGETS): %: %.o
+        $(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
++++ iputils-s20121221/Makefile  2014-04-02 01:01:49.917694047 +0000
@@ -149,7 +149,7 @@
  DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
 …
 diff -Naur iputils-s20121221.orig/doc/arping.8 iputils-s20121221/doc/arping.8
 --- iputils-s20121221.orig/doc/arping.8 1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/arping.8      2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/arping.8      2014-04-02 01:07:09.997700654 +0000
@@ -0,0 +1,109 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "ARPING" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "ARPING" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +arping \- send ARP REQUEST to a neighbour host
 …
 diff -Naur iputils-s20121221.orig/doc/clockdiff.8 iputils-s20121221/doc/clockdiff.8
 --- iputils-s20121221.orig/doc/clockdiff.8      1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/clockdiff.8   2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/clockdiff.8   2014-04-02 01:07:10.829700671 +0000
@@ -0,0 +1,81 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "CLOCKDIFF" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "CLOCKDIFF" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +clockdiff \- measure clock difference between hosts
 …
 diff -Naur iputils-s20121221.orig/doc/index.html iputils-s20121221/doc/index.html
 --- iputils-s20121221.orig/doc/index.html       1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/index.html    2013-01-04 10:38:35.000000000 +0000
++++ iputils-s20121221/doc/index.html    2014-04-02 01:05:52.917699063 +0000
@@ -0,0 +1,175 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +><DT
 +><A
 +HREF="r918.html"
++HREF="r926.html"
 +>traceroute6</A
 +>&nbsp;--&nbsp;traces path to a network host</DT
 +><DT
 +><A
 +HREF="r983.html"
++HREF="r991.html"
 +>tftpd</A
 +>&nbsp;--&nbsp;Trivial File Transfer Protocol server</DT
 +><DT
 +><A
 +HREF="r1056.html"
++HREF="r1064.html"
 +>ninfod</A
 +>&nbsp;--&nbsp;Respond to IPv6 Node Information Queries</DT
 +><DT
 +><A
 +HREF="r1125.html"
++HREF="r1133.html"
 +>rdisc</A
 +>&nbsp;--&nbsp;network router discovery daemon</DT
 +><DT
 +><A
 +HREF="r1269.html"
++HREF="r1277.html"
 +>pg3</A
 +>&nbsp;--&nbsp;send stream of UDP packets</DT
 …
 diff -Naur iputils-s20121221.orig/doc/iputils.html iputils-s20121221/doc/iputils.html
 --- iputils-s20121221.orig/doc/iputils.html     1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/iputils.html  2013-01-04 10:38:35.000000000 +0000
++++ iputils-s20121221/doc/iputils.html  2014-04-02 01:05:55.845699123 +0000
@@ -0,0 +1,491 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 diff -Naur iputils-s20121221.orig/doc/ninfod.8 iputils-s20121221/doc/ninfod.8
 --- iputils-s20121221.orig/doc/ninfod.8 1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/ninfod.8      2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/ninfod.8      2014-04-02 01:07:11.809700691 +0000
@@ -0,0 +1,72 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "NINFOD" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "NINFOD" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +ninfod \- Respond to IPv6 Node Information Queries
 …
 diff -Naur iputils-s20121221.orig/doc/pg3.8 iputils-s20121221/doc/pg3.8
 --- iputils-s20121221.orig/doc/pg3.8    1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/pg3.8 2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/pg3.8 2014-04-02 01:07:12.697700709 +0000
@@ -0,0 +1,86 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "PG3" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "PG3" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +pg3, ipg, pgset \- send stream of UDP packets
 …
 diff -Naur iputils-s20121221.orig/doc/ping.8 iputils-s20121221/doc/ping.8
 --- iputils-s20121221.orig/doc/ping.8   1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/ping.8        2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/ping.8        2014-04-02 01:07:13.053700717 +0000
@@ -0,0 +1,428 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "PING" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "PING" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +ping, ping6 \- send ICMP ECHO_REQUEST to network hosts
 …
 +The maximum IP header length is too small for options like
 +RECORD_ROUTE to be completely useful.
 +There's not much that that can be done about this, however.
++There's not much that can be done about this, however.
 +.TP 0.2i
 +\(bu
 …
 +and the latest versions are  available in source form at
 +http://www.skbuff.net/iputils/iputils-current.tar.bz2.
+diff -Naur iputils-s20121221.orig/doc/r1056.html iputils-s20121221/doc/r1056.html
+--- iputils-s20121221.orig/doc/r1056.html       1970-01-01 00:00:00.000000000 +0000
++++ iputils-s20121221/doc/r1056.html    2013-01-04 10:38:35.000000000 +0000
+diff -Naur iputils-s20121221.orig/doc/ping.sgml iputils-s20121221/doc/ping.sgml
+--- iputils-s20121221.orig/doc/ping.sgml        2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/doc/ping.sgml     2014-04-02 01:02:05.429694367 +0000
+@@ -600,7 +600,7 @@
+  <listitem><para>
+ The maximum IP header length is too small for options like
+ RECORD_ROUTE to be completely useful.
+-There's not much that that can be done about this, however.
++There's not much that can be done about this, however.
+  </para></listitem>
+  <listitem><para>
+ Flood pinging is not recommended in general, and flood pinging the
+diff -Naur iputils-s20121221.orig/doc/r1064.html iputils-s20121221/doc/r1064.html
+--- iputils-s20121221.orig/doc/r1064.html       1970-01-01 00:00:00.000000000 +0000
++++ iputils-s20121221/doc/r1064.html    2014-04-02 01:05:52.849699061 +0000
@@ -0,0 +1,343 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +REL="PREVIOUS"
 +TITLE="tftpd"
 +HREF="r983.html"><LINK
++HREF="r991.html"><LINK
 +REL="NEXT"
 +TITLE="rdisc"
 +HREF="r1125.html"></HEAD
++HREF="r1133.html"></HEAD
 +><BODY
 +CLASS="REFENTRY"
 …
 +VALIGN="bottom"
 +><A
 +HREF="r983.html"
++HREF="r991.html"
 +ACCESSKEY="P"
 +>Prev</A
 …
 +VALIGN="bottom"
 +><A
 +HREF="r1125.html"
++HREF="r1133.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +CLASS="REFNAMEDIV"
 +><A
 +NAME="AEN1061"
++NAME="AEN1069"
 +></A
 +><H2
 …
 +CLASS="REFSYNOPSISDIV"
 +><A
 +NAME="AEN1064"
++NAME="AEN1072"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1073"
++NAME="AEN1081"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1078"
++NAME="AEN1086"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1110"
++NAME="AEN1118"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1117"
++NAME="AEN1125"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1121"
++NAME="AEN1129"
 +></A
 +><H2
 …
 +VALIGN="top"
 +><A
 +HREF="r983.html"
++HREF="r991.html"
 +ACCESSKEY="P"
 +>Prev</A
 …
 +VALIGN="top"
 +><A
 +HREF="r1125.html"
++HREF="r1133.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +>
 \ No newline at end of file
 diff -Naur iputils-s20121221.orig/doc/r1125.html iputils-s20121221/doc/r1125.html
 --- iputils-s20121221.orig/doc/r1125.html       1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r1125.html    2013-01-04 10:38:35.000000000 +0000
+diff -Naur iputils-s20121221.orig/doc/r1133.html iputils-s20121221/doc/r1133.html
+--- iputils-s20121221.orig/doc/r1133.html       1970-01-01 00:00:00.000000000 +0000
++++ iputils-s20121221/doc/r1133.html    2014-04-02 01:05:52.889699062 +0000
@@ -0,0 +1,567 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +REL="PREVIOUS"
 +TITLE="ninfod"
 +HREF="r1056.html"><LINK
++HREF="r1064.html"><LINK
 +REL="NEXT"
 +TITLE="pg3"
 +HREF="r1269.html"></HEAD
++HREF="r1277.html"></HEAD
 +><BODY
 +CLASS="REFENTRY"
 …
 +VALIGN="bottom"
 +><A
 +HREF="r1056.html"
++HREF="r1064.html"
 +ACCESSKEY="P"
 +>Prev</A
 …
 +VALIGN="bottom"
 +><A
 +HREF="r1269.html"
++HREF="r1277.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +CLASS="REFNAMEDIV"
 +><A
 +NAME="AEN1130"
++NAME="AEN1138"
 +></A
 +><H2
 …
 +CLASS="REFSYNOPSISDIV"
 +><A
 +NAME="AEN1133"
++NAME="AEN1141"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1146"
++NAME="AEN1154"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1163"
++NAME="AEN1171"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1235"
++NAME="AEN1243"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1240"
++NAME="AEN1248"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1253"
++NAME="AEN1261"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1257"
++NAME="AEN1265"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1263"
++NAME="AEN1271"
 +></A
 +><H2
 …
 +VALIGN="top"
 +><A
 +HREF="r1056.html"
++HREF="r1064.html"
 +ACCESSKEY="P"
 +>Prev</A
 …
 +VALIGN="top"
 +><A
 +HREF="r1269.html"
++HREF="r1277.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +>
 \ No newline at end of file
 diff -Naur iputils-s20121221.orig/doc/r1269.html iputils-s20121221/doc/r1269.html
 --- iputils-s20121221.orig/doc/r1269.html       1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r1269.html    2013-01-04 10:38:35.000000000 +0000
+diff -Naur iputils-s20121221.orig/doc/r1277.html iputils-s20121221/doc/r1277.html
+--- iputils-s20121221.orig/doc/r1277.html       1970-01-01 00:00:00.000000000 +0000
++++ iputils-s20121221/doc/r1277.html    2014-04-02 01:05:52.917699063 +0000
@@ -0,0 +1,428 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +REL="PREVIOUS"
 +TITLE="rdisc"
 +HREF="r1125.html"></HEAD
++HREF="r1133.html"></HEAD
 +><BODY
 +CLASS="REFENTRY"
 …
 +VALIGN="bottom"
 +><A
 +HREF="r1125.html"
++HREF="r1133.html"
 +ACCESSKEY="P"
 +>Prev</A
 …
 +CLASS="REFNAMEDIV"
 +><A
 +NAME="AEN1274"
++NAME="AEN1282"
 +></A
 +><H2
 …
 +CLASS="REFSYNOPSISDIV"
 +><A
 +NAME="AEN1277"
++NAME="AEN1285"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1286"
++NAME="AEN1294"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1297"
++NAME="AEN1305"
 +></A
 +><H2
 …
 +>Name of Ethernet device to test. See
 +<A
 +HREF="r1269.html#PG3.WARNING"
++HREF="r1277.html#PG3.WARNING"
 +>warning</A
 +> below.
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1357"
++NAME="AEN1365"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1362"
++NAME="AEN1370"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1366"
++NAME="AEN1374"
 +></A
 +><H2
 …
 +VALIGN="top"
 +><A
 +HREF="r1125.html"
++HREF="r1133.html"
 +ACCESSKEY="P"
 +>Prev</A
 …
 diff -Naur iputils-s20121221.orig/doc/r3.html iputils-s20121221/doc/r3.html
 --- iputils-s20121221.orig/doc/r3.html  1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r3.html       2013-01-04 10:38:35.000000000 +0000
++++ iputils-s20121221/doc/r3.html       2014-04-02 01:05:52.589699056 +0000
@@ -0,0 +1,1585 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +>The maximum IP header length is too small for options like
 +RECORD_ROUTE to be completely useful.
 +There's not much that that can be done about this, however.
++There's not much that can be done about this, however.
 + </P
 +></LI
 …
 diff -Naur iputils-s20121221.orig/doc/r466.html iputils-s20121221/doc/r466.html
 --- iputils-s20121221.orig/doc/r466.html        1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r466.html     2013-01-04 10:38:35.000000000 +0000
++++ iputils-s20121221/doc/r466.html     2014-04-02 01:05:52.637699057 +0000
@@ -0,0 +1,597 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 diff -Naur iputils-s20121221.orig/doc/r625.html iputils-s20121221/doc/r625.html
 --- iputils-s20121221.orig/doc/r625.html        1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r625.html     2013-01-04 10:38:35.000000000 +0000
++++ iputils-s20121221/doc/r625.html     2014-04-02 01:05:52.677699058 +0000
@@ -0,0 +1,428 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 diff -Naur iputils-s20121221.orig/doc/r720.html iputils-s20121221/doc/r720.html
 --- iputils-s20121221.orig/doc/r720.html        1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r720.html     2013-01-04 10:38:35.000000000 +0000
++++ iputils-s20121221/doc/r720.html     2014-04-02 01:05:52.713699058 +0000
@@ -0,0 +1,431 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +>,
 +<A
 +HREF="r983.html"
++HREF="r991.html"
 +><SPAN
 +CLASS="CITEREFENTRY"
 …
 diff -Naur iputils-s20121221.orig/doc/r819.html iputils-s20121221/doc/r819.html
 --- iputils-s20121221.orig/doc/r819.html        1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r819.html     2013-01-04 10:38:35.000000000 +0000
@@ -0,0 +1,436 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++++ iputils-s20121221/doc/r819.html     2014-04-02 01:05:52.749699059 +0000
+@@ -0,0 +1,457 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +REL="NEXT"
 +TITLE="traceroute6"
 +HREF="r918.html"></HEAD
++HREF="r926.html"></HEAD
 +><BODY
 +CLASS="REFENTRY"
 …
 +VALIGN="bottom"
 +><A
 +HREF="r918.html"
++HREF="r926.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +>pktlen</I
 +></TT
++>] [-m <TT
++CLASS="REPLACEABLE"
++><I
++>max_hops</I
++></TT
 +>] [-p <TT
 +CLASS="REPLACEABLE"
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN838"
++NAME="AEN840"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN847"
++NAME="AEN849"
 +></A
 +><H2
 …
 +><CODE
 +CLASS="OPTION"
++>-m</CODE
++></DT
++><DD
++><P
++>Set maximum hops (or maximum TTLs) to <TT
++CLASS="REPLACEABLE"
++><I
++>max_hops</I
++></TT
++>
++instead of 30.
++  </P
++></DD
++><DT
++><CODE
++CLASS="OPTION"
 +>-p</CODE
 +></DT
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN873"
++NAME="AEN881"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN885"
++NAME="AEN893"
 +></A
 +><H2
 …
 +>,
 +<A
 +HREF="r918.html"
++HREF="r926.html"
 +><SPAN
 +CLASS="CITEREFENTRY"
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN899"
++NAME="AEN907"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN904"
++NAME="AEN912"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN912"
++NAME="AEN920"
 +></A
 +><H2
 …
 +VALIGN="top"
 +><A
 +HREF="r918.html"
++HREF="r926.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +>
 \ No newline at end of file
 diff -Naur iputils-s20121221.orig/doc/r918.html iputils-s20121221/doc/r918.html
 --- iputils-s20121221.orig/doc/r918.html        1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r918.html     2013-01-04 10:38:35.000000000 +0000
+diff -Naur iputils-s20121221.orig/doc/r926.html iputils-s20121221/doc/r926.html
+--- iputils-s20121221.orig/doc/r926.html        1970-01-01 00:00:00.000000000 +0000
++++ iputils-s20121221/doc/r926.html     2014-04-02 01:05:52.777699060 +0000
@@ -0,0 +1,315 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +REL="NEXT"
 +TITLE="tftpd"
 +HREF="r983.html"></HEAD
++HREF="r991.html"></HEAD
 +><BODY
 +CLASS="REFENTRY"
 …
 +VALIGN="bottom"
 +><A
 +HREF="r983.html"
++HREF="r991.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +CLASS="REFNAMEDIV"
 +><A
 +NAME="AEN923"
++NAME="AEN931"
 +></A
 +><H2
 …
 +CLASS="REFSYNOPSISDIV"
 +><A
 +NAME="AEN926"
++NAME="AEN934"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN947"
++NAME="AEN955"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN953"
++NAME="AEN961"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN965"
++NAME="AEN973"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN972"
++NAME="AEN980"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN977"
++NAME="AEN985"
 +></A
 +><H2
 …
 +VALIGN="top"
 +><A
 +HREF="r983.html"
++HREF="r991.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +>
 \ No newline at end of file
 diff -Naur iputils-s20121221.orig/doc/r983.html iputils-s20121221/doc/r983.html
 --- iputils-s20121221.orig/doc/r983.html        1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/r983.html     2013-01-04 10:38:35.000000000 +0000
+diff -Naur iputils-s20121221.orig/doc/r991.html iputils-s20121221/doc/r991.html
+--- iputils-s20121221.orig/doc/r991.html        1970-01-01 00:00:00.000000000 +0000
++++ iputils-s20121221/doc/r991.html     2014-04-02 01:05:52.809699060 +0000
@@ -0,0 +1,376 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 +<HTML
 +><HEAD
 …
 +REL="PREVIOUS"
 +TITLE="traceroute6"
 +HREF="r918.html"><LINK
++HREF="r926.html"><LINK
 +REL="NEXT"
 +TITLE="ninfod"
 +HREF="r1056.html"></HEAD
++HREF="r1064.html"></HEAD
 +><BODY
 +CLASS="REFENTRY"
 …
 +VALIGN="bottom"
 +><A
 +HREF="r918.html"
++HREF="r926.html"
 +ACCESSKEY="P"
 +>Prev</A
 …
 +VALIGN="bottom"
 +><A
 +HREF="r1056.html"
++HREF="r1064.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 +CLASS="REFNAMEDIV"
 +><A
 +NAME="AEN988"
++NAME="AEN996"
 +></A
 +><H2
 …
 +CLASS="REFSYNOPSISDIV"
 +><A
 +NAME="AEN991"
++NAME="AEN999"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN996"
++NAME="AEN1004"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1020"
++NAME="AEN1028"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1031"
++NAME="AEN1039"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1044"
++NAME="AEN1052"
 +></A
 +><H2
 …
 +CLASS="REFSECT1"
 +><A
 +NAME="AEN1050"
++NAME="AEN1058"
 +></A
 +><H2
 …
 +VALIGN="top"
 +><A
 +HREF="r918.html"
++HREF="r926.html"
 +ACCESSKEY="P"
 +>Prev</A
 …
 +VALIGN="top"
 +><A
 +HREF="r1056.html"
++HREF="r1064.html"
 +ACCESSKEY="N"
 +>Next</A
 …
 diff -Naur iputils-s20121221.orig/doc/rarpd.8 iputils-s20121221/doc/rarpd.8
 --- iputils-s20121221.orig/doc/rarpd.8  1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/rarpd.8       2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/rarpd.8       2014-04-02 01:07:14.009700736 +0000
@@ -0,0 +1,84 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "RARPD" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "RARPD" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +rarpd \- answer RARP REQUESTs
 …
 diff -Naur iputils-s20121221.orig/doc/rdisc.8 iputils-s20121221/doc/rdisc.8
 --- iputils-s20121221.orig/doc/rdisc.8  1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/rdisc.8       2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/rdisc.8       2014-04-02 01:07:15.013700757 +0000
@@ -0,0 +1,122 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "RDISC" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "RDISC" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +rdisc \- network router discovery daemon
 …
 diff -Naur iputils-s20121221.orig/doc/tftpd.8 iputils-s20121221/doc/tftpd.8
 --- iputils-s20121221.orig/doc/tftpd.8  1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/tftpd.8       2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/tftpd.8       2014-04-02 01:07:15.681700771 +0000
@@ -0,0 +1,85 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "TFTPD" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "TFTPD" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +tftpd \- Trivial File Transfer Protocol server
 …
 diff -Naur iputils-s20121221.orig/doc/tracepath.8 iputils-s20121221/doc/tracepath.8
 --- iputils-s20121221.orig/doc/tracepath.8      1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/tracepath.8   2013-01-04 10:38:27.000000000 +0000
@@ -0,0 +1,100 @@
++++ iputils-s20121221/doc/tracepath.8   2014-04-02 01:07:16.381700785 +0000
+@@ -0,0 +1,104 @@
 +.\" This manpage has been automatically generated by docbook2man
 +.\" from a DocBook document.  This tool can be found at:
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "TRACEPATH" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "TRACEPATH" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +tracepath, tracepath6 \- traces path to a network host discovering MTU along this path
 +.SH SYNOPSIS
++
 +\fBtracepath\fR [\fB-n\fR] [\fB-b\fR] [\fB-l \fIpktlen\fB\fR] [\fB-p \fIport\fB\fR] \fB\fIdestination\fB\fR
++\fBtracepath\fR [\fB-n\fR] [\fB-b\fR] [\fB-l \fIpktlen\fB\fR] [\fB-m \fImax_hops\fB\fR] [\fB-p \fIport\fB\fR] \fB\fIdestination\fB\fR
++
 +.SH "DESCRIPTION"
 …
 +Sets the initial packet length to \fIpktlen\fR instead of
 +65535 for \fBtracepath\fR or 128000 for \fBtracepath6\fR.
++.TP
++\fB-m\fR
++Set maximum hops (or maximum TTLs) to \fImax_hops\fR
++instead of 30.
 +.TP
 +\fB-p\fR
 …
 +and the latest versions are  available in source form at
 +http://www.skbuff.net/iputils/iputils-current.tar.bz2.
+diff -Naur iputils-s20121221.orig/doc/tracepath.sgml iputils-s20121221/doc/tracepath.sgml
+--- iputils-s20121221.orig/doc/tracepath.sgml   2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/doc/tracepath.sgml        2014-04-02 01:05:20.625698396 +0000
+@@ -18,6 +18,7 @@
+ <arg choice="opt">-n</arg>
+ <arg choice="opt">-b</arg>
+ <arg choice="opt">-l <replaceable/pktlen/</arg>
++<arg choice="opt">-m <replaceable/max_hops/</arg>
+ <arg choice="opt">-p <replaceable/port/</arg>
+ <arg choice="req"><replaceable/destination/</arg>
+ </cmdsynopsis>
+@@ -67,6 +68,14 @@
+   </para></listitem>
+  </varlistentry>
++ <varlistentry>
++  <term><option/-m/</term>
++  <listitem><para>
++Set maximum hops (or maximum TTLs) to <replaceable/max_hops/
++instead of 30.
++  </para></listitem>
++ </varlistentry>
++
+  <varlistentry>
+   <term><option/-p/</term>
+   <listitem><para>
 diff -Naur iputils-s20121221.orig/doc/traceroute6.8 iputils-s20121221/doc/traceroute6.8
 --- iputils-s20121221.orig/doc/traceroute6.8    1970-01-01 00:00:00.000000000 +0000
 +++ iputils-s20121221/doc/traceroute6.8 2013-01-04 10:38:27.000000000 +0000
++++ iputils-s20121221/doc/traceroute6.8 2014-04-02 01:07:17.193700802 +0000
@@ -0,0 +1,42 @@
 +.\" This manpage has been automatically generated by docbook2man
 …
 +.\" Please send any bug reports, improvements, comments, patches,
 +.\" etc. to Steve Cheng <steve@ggi-project.org>.
 +.TH "TRACEROUTE6" "8" "04 January 2013" "iputils-121221" "System Manager's Manual: iputils"
++.TH "TRACEROUTE6" "8" "01 April 2014" "iputils-121221" "System Manager's Manual: iputils"
 +.SH NAME
 +traceroute6 \- traces path to a network host
 …
 +and the latest versions are  available in source form at
 +http://www.skbuff.net/iputils/iputils-current.tar.bz2.
+diff -Naur iputils-s20121221.orig/ping6.c iputils-s20121221/ping6.c
+--- iputils-s20121221.orig/ping6.c      2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/ping6.c   2013-08-06 18:09:09.448346619 +0000
+@@ -168,8 +168,10 @@
+diff -Naur iputils-s20121221.orig/ninfod/ninfod.c iputils-s20121221/ninfod/ninfod.c
+--- iputils-s20121221.orig/ninfod/ninfod.c      2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/ninfod/ninfod.c   2014-04-02 01:01:49.937694047 +0000
+@@ -139,6 +139,7 @@
+ static int opt_d = 0;  /* debug */
+ static int opt_h = 0;  /* help */
+ static char *opt_p = NINFOD_PIDFILE;   /* pidfile */
++static int got_signal = 0;     /* loop unless true */
+ int opt_v = 0;         /* verbose */
+ static uid_t opt_u;
+ #ifdef USE_GNUTLS
+ # include <gnutls/openssl.h>
+-#else
++# define USE_CRYPTO
++#elif defined USE_OPENSSL
+ # include <openssl/md5.h>
++# define USE_CRYPTO
+ #endif
+@@ -391,25 +392,70 @@
+ /* --------- */
+ static void sig_handler(int sig)
+ {
++       if (!got_signal)
++               DEBUG(LOG_INFO, "singnal(%d) received, quitting.\n", sig);
++       got_signal = 1;
++}
++
++static void setup_sighandlers(void)
++{
++       struct sigaction act;
++       sigset_t smask;
++       sigemptyset(&smask);
++       sigaddset(&smask, SIGHUP);
++       sigaddset(&smask, SIGINT);
++       sigaddset(&smask, SIGQUIT);
++       sigaddset(&smask, SIGTERM);
++
++       memset(&act, 0, sizeof(act));
++       act.sa_handler = sig_handler;
++       act.sa_mask = smask;
++
++       sigaction(SIGHUP, &act, NULL);
++       sigaction(SIGINT, &act, NULL);
++       sigaction(SIGQUIT, &act, NULL);
++       sigaction(SIGTERM, &act, NULL);
++}
++
++static void set_logfile(void)
++{
++       setbuf(stderr, NULL);
++#if ENABLE_DEBUG
++       openlog(NINFOD, 0, LOG_USER);
++#endif
++}
++
++static void cleanup_pidfile(void)
++{
+        int err;
+ /* Node Information query */
+@@ -326,6 +328,7 @@
+ #if !PING6_NONCE_MEMORY
+ static int niquery_nonce(__u8 *nonce, int fill)
+ {
++# ifdef USE_CRYPTO
+        static __u8 digest[MD5_DIGEST_LENGTH];
+        static int seq = -1;
+-       DEBUG(LOG_INFO, "singnal(%d) received, quit.\n", sig);
+-       err = unlink(opt_p);
+-       if (err < 0) {
++       if (daemonized && opt_p) {
++               err = unlink(opt_p);
+                DEBUG(LOG_ERR, "failed to unlink file '%s' : %s\n",
+                                opt_p, strerror(errno));
+-               exit(1);
+        }
+-       /* closelog() */
++}
+@@ -348,6 +351,10 @@
+                        return -1;
+                return ntohsp((__u16 *)nonce);
+        }
++# else
++       fprintf(stderr, "ping6: function not available; crypto disabled\n");
++       exit(3);
++# endif
+ }
+ #endif
+@@ -502,6 +509,7 @@
+ static int niquery_option_subject_name_handler(int index, const char *arg)
+ {
++#ifdef USE_CRYPTO
+        static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
+        unsigned char *dnptrs[2], **dpp, **lastdnptr;
+        int n;
+@@ -627,6 +635,10 @@
+        free(idn);
+        free(name);
+        exit(1);
+-       exit(0);
++static FILE *fopen_excl(const char *file)
++{
++#ifndef __linux__
++       int fd;
++       FILE *fp;
++
++       fd = open(file, O_CREAT | O_RDWR | O_EXCL,
++                 S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
++       if (fd < 0)
++               return NULL;
++
++       return fdopen(file, "w+");
 +#else
++       fprintf(stderr, "ping6: function not available; crypto disabled\n");
++       exit(3);
++       return fopen(file, "w+x");
 +#endif
+ }
+ int niquery_option_help_handler(int index, const char *arg)
+ static void do_daemonize(void)
+ {
+        FILE *fp = NULL;
+-       struct sigaction act;
+-       sigset_t smask;
+        pid_t pid;
+        if (opt_p) {
+@@ -427,22 +473,7 @@
+                        }
+                }
+-               sigemptyset(&smask);
+-               sigaddset(&smask, SIGHUP);
+-               sigaddset(&smask, SIGINT);
+-               sigaddset(&smask, SIGQUIT);
+-               sigaddset(&smask, SIGTERM);
+-
+-               memset(&act, 0, sizeof(act));
+-               act.sa_handler = sig_handler;
+-               act.sa_mask = smask;
+-
+-               sigaction(SIGHUP, &act, NULL);
+-               sigaction(SIGINT, &act, NULL);
+-               sigaction(SIGQUIT, &act, NULL);
+-               sigaction(SIGTERM, &act, NULL);
+-
+-               fp = fopen(opt_p, "w+");
++               fp = fopen_excl(opt_p);
+                if (!fp) {
+                        DEBUG(LOG_ERR, "failed to open file '%s': %s\n",
+                              opt_p, strerror(errno));
+@@ -455,9 +486,6 @@
+                unlink(opt_p);
+                exit(1);
+        }
+-#if ENABLE_DEBUG
+-       openlog(NINFOD, 0, LOG_USER);
+-#endif
+        daemonized = 1;
+        if (fp) {
+@@ -634,8 +662,10 @@
+ int main (int argc, char **argv)
+ {
+        int sock_errno = 0;
++       int ret;
+        appname = argv[0];
++       set_logfile();
+        limit_capabilities();
+@@ -659,19 +689,18 @@
+                exit(1);
+        }
+-       setbuf(stderr, NULL);
+-
+-       if (!opt_d)
+-               do_daemonize();
+-
+        /* initialize */
+        if (init_sock(sock) < 0)
+                exit(1);
++       setup_sighandlers();
++       if (!opt_d)
++               do_daemonize();
++
+        init_core(1);
+        /* main loop */
+-       while(1) {
++       while (!got_signal) {
+                struct packetcontext *p;
+                struct icmp6_hdr *icmph;
+ #if ENABLE_DEBUG
+@@ -689,11 +718,13 @@
+                        continue;
+                }
+-               while (1) {
++               while (!got_signal) {
+                        memset(p, 0, sizeof(*p));
+                        p->sock = sock;
+                        if (ni_recv(p) < 0) {
++                               if (got_signal)
++                                       break;
+                                if (errno == EAGAIN || errno == EINTR)
+                                        continue;
+                                /* XXX: syslog */
+@@ -736,5 +767,9 @@
+                pr_nodeinfo(p); /* this frees p */
+        }
++
++       cleanup_pidfile();
++
++       exit(0);
+ }
+diff -Naur iputils-s20121221.orig/ping_common.c iputils-s20121221/ping_common.c
+--- iputils-s20121221.orig/ping_common.c        2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/ping_common.c     2014-04-02 01:01:49.941694047 +0000
+@@ -630,6 +630,7 @@
+                        fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n");
+        }
+ #endif
++#ifdef SO_MARK
+        if (options & F_MARK) {
+                int ret;
+@@ -644,6 +645,7 @@
+                        fprintf(stderr, "Warning: Failed to set mark %d\n", mark);
+                }
+        }
++#endif
+        /* Set some SNDTIMEO to prevent blocking forever
+         * on sends, when device is too slow or stalls. Just put limit
+diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c
+--- iputils-s20121221.orig/rdisc.c      2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/rdisc.c   2014-04-02 01:01:49.941694047 +0000
+@@ -1128,12 +1128,10 @@
+                (void) close(sock);
+                return;
+        }
+-       if (interfaces)
+-               interfaces = (struct interface *)ALLIGN(realloc((char *)interfaces,
+-                                        numifs * sizeof(struct interface)));
+-       else
+-               interfaces = (struct interface *)ALLIGN(malloc(numifs *
+-                                               sizeof(struct interface)));
++       if (interfaces != NULL)
++               (void) free(interfaces);
++       interfaces = (struct interface *)ALLIGN(malloc(numifs *
++                                       sizeof(struct interface)));
+        if (interfaces == NULL) {
+                logerr("out of memory\n");
+                (void) close(sock);
 diff -Naur iputils-s20121221.orig/tracepath.c iputils-s20121221/tracepath.c
 --- iputils-s20121221.orig/tracepath.c  2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/tracepath.c       2013-08-06 18:08:56.048346586 +0000
+@@ -73,13 +73,10 @@
++++ iputils-s20121221/tracepath.c       2014-04-02 01:01:49.941694047 +0000
+@@ -32,6 +32,9 @@
+ #define IP_PMTUDISC_PROBE      3
+ #endif
++#define MAX_HOPS_LIMIT         255
++#define MAX_HOPS_DEFAULT       30
++
+ struct hhistory
+ {
+        int     hops;
+@@ -43,6 +46,7 @@
+ struct sockaddr_in target;
+ __u16 base_port;
++int max_hops = MAX_HOPS_DEFAULT;
+ const int overhead = 28;
+ int mtu = 65535;
+@@ -73,13 +77,10 @@
  void print_host(const char *a, const char *b, int both)
 …
                 plen = HOST_COLUMN_SIZE - 1;
         printf("%*s", HOST_COLUMN_SIZE - plen, "");
+@@ -315,7 +316,7 @@
+        setlocale(LC_ALL, "");
+ #endif
+-       while ((ch = getopt(argc, argv, "nbh?l:p:")) != EOF) {
++       while ((ch = getopt(argc, argv, "nbh?l:m:p:")) != EOF) {
+                switch(ch) {
+                case 'n':
+                        no_resolve = 1;
+@@ -330,6 +331,14 @@
+                                exit(1);
+                        }
+                        break;
++               case 'm':
++                       max_hops = atoi(optarg);
++                       if (max_hops < 0 || max_hops > MAX_HOPS_LIMIT) {
++                               fprintf(stderr,
++                                       "Error: max hops must be 0 .. %d (inclusive).\n",
++                                       MAX_HOPS_LIMIT);
++                       }
++                       break;
+                case 'p':
+                        base_port = atoi(optarg);
+                        break;
+@@ -405,7 +414,7 @@
+                exit(1);
+        }
+-       for (ttl=1; ttl<32; ttl++) {
++       for (ttl = 1; ttl <= max_hops; ttl++) {
+                int res;
+                int i;
 diff -Naur iputils-s20121221.orig/tracepath6.c iputils-s20121221/tracepath6.c
 --- iputils-s20121221.orig/tracepath6.c 2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/tracepath6.c      2013-08-06 18:08:56.048346586 +0000
+@@ -86,13 +86,10 @@
++++ iputils-s20121221/tracepath6.c      2014-04-02 01:01:49.941694047 +0000
+@@ -42,6 +42,9 @@
+ #define IPV6_PMTUDISC_DO       3
+ #endif
++#define MAX_HOPS_LIMIT         255
++#define MAX_HOPS_DEFAULT       30
++
+ struct hhistory
+ {
+        int     hops;
+@@ -55,6 +58,7 @@
+ struct sockaddr_storage target;
+ socklen_t targetlen;
+ __u16 base_port;
++int max_hops = MAX_HOPS_DEFAULT;
+ int overhead;
+ int mtu;
+@@ -86,13 +90,10 @@
  void print_host(const char *a, const char *b, int both)
 …
                 plen = HOST_COLUMN_SIZE - 1;
         printf("%*s", HOST_COLUMN_SIZE - plen, "");
+@@ -387,7 +388,7 @@
+        setlocale(LC_ALL, "");
+ #endif
+-       while ((ch = getopt(argc, argv, "nbh?l:p:")) != EOF) {
++       while ((ch = getopt(argc, argv, "nbh?l:m:p:")) != EOF) {
+                switch(ch) {
+                case 'n':
+                        no_resolve = 1;
+@@ -398,6 +399,14 @@
+                case 'l':
+                        mtu = atoi(optarg);
+                        break;
++               case 'm':
++                       max_hops = atoi(optarg);
++                       if (max_hops < 0 || max_hops > MAX_HOPS_LIMIT) {
++                               fprintf(stderr,
++                                       "Error: max hops must be 0 .. %d (inclusive).\n",
++                                       MAX_HOPS_LIMIT);
++                       }
++                       break;
+                case 'p':
+                        base_port = atoi(optarg);
+                        break;
+@@ -523,7 +532,7 @@
+                exit(1);
+        }
+-       for (ttl=1; ttl<32; ttl++) {
++       for (ttl = 1; ttl <= max_hops; ttl++) {
+                int res;
+                int i;

patches/mpfr-3.1.2-fixes-2.patch

-              r88ef769
+              r03e6a40
 Submitted By: William Harrington (kb0iic at cross-lfs dot org)
 Date: 2013-11-11
+Date: 2014-03-10
 Initial Package Version: 3.1.2
 Origin: Upstream
 Upstream Status: Applied
 Description: Contains all upstream patches of mpfr current.
+Description: Contains all upstream patches of mpfr current to patch level 5.
+diff -Naur mpfr-3.1.2.orig/PATCHES mpfr-3.1.2/PATCHES
+--- mpfr-3.1.2.orig/PATCHES     2013-03-13 15:37:38.000000000 +0000
++++ mpfr-3.1.2/PATCHES  2013-11-11 23:55:16.818732551 +0000
+@@ -0,0 +1,3 @@
++clang-divby0
++fits-smallneg
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES        2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES        2013-09-26 10:52:52.000000000 +0000
+@@ -0,0 +1 @@
 +exp_2
 diff -Naur mpfr-3.1.2.orig/VERSION mpfr-3.1.2/VERSION
 --- mpfr-3.1.2.orig/VERSION     2013-03-13 15:37:28.000000000 +0000
 +++ mpfr-3.1.2/VERSION  2013-11-11 23:55:16.818732551 +0000
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION        2013-03-13 15:37:28.000000000 +0000
++++ mpfr-3.1.2-b/VERSION        2013-09-26 10:52:52.000000000 +0000
@@ -1 +1 @@
 -3.1.2
 +3.1.2-p3
 diff -Naur mpfr-3.1.2.orig/src/exp_2.c mpfr-3.1.2/src/exp_2.c
 --- mpfr-3.1.2.orig/src/exp_2.c 2013-03-13 15:37:28.000000000 +0000
 +++ mpfr-3.1.2/src/exp_2.c      2013-11-11 23:55:16.810732551 +0000
++3.1.2-p1
+diff -Naurd mpfr-3.1.2-a/src/exp_2.c mpfr-3.1.2-b/src/exp_2.c
+--- mpfr-3.1.2-a/src/exp_2.c    2013-03-13 15:37:28.000000000 +0000
++++ mpfr-3.1.2-b/src/exp_2.c    2013-09-26 10:52:52.000000000 +0000
@@ -204,7 +204,7 @@
            for (k = 0; k < K; k++)
 …
+             }
            mpfr_set_z (s, ss, MPFR_RNDN);
+diff -Naur mpfr-3.1.2.orig/src/fits_u.h mpfr-3.1.2/src/fits_u.h
+--- mpfr-3.1.2.orig/src/fits_u.h        2013-03-13 15:37:35.000000000 +0000
++++ mpfr-3.1.2/src/fits_u.h     2013-11-11 23:55:16.818732551 +0000
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h     2013-03-13 15:37:37.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h     2013-09-26 10:52:52.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2"
++#define MPFR_VERSION_STRING "3.1.2-p1"
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c  2013-03-13 15:37:34.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c  2013-09-26 10:52:52.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2";
++  return "3.1.2-p1";
+ }
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES        2013-09-26 10:56:55.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES        2013-09-26 10:56:55.000000000 +0000
+@@ -0,0 +1 @@
++fits-smallneg
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION        2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/VERSION        2013-09-26 10:56:55.000000000 +0000
+@@ -1 +1 @@
+-3.1.2-p1
++3.1.2-p2
+diff -Naurd mpfr-3.1.2-a/src/fits_u.h mpfr-3.1.2-b/src/fits_u.h
+--- mpfr-3.1.2-a/src/fits_u.h   2013-03-13 15:37:35.000000000 +0000
++++ mpfr-3.1.2-b/src/fits_u.h   2013-09-26 10:56:55.000000000 +0000
@@ -32,17 +32,20 @@
    int res;
 …
    for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++);
 diff -Naur mpfr-3.1.2.orig/src/fits_uintmax.c mpfr-3.1.2/src/fits_uintmax.c
 --- mpfr-3.1.2.orig/src/fits_uintmax.c  2013-03-13 15:37:33.000000000 +0000
 +++ mpfr-3.1.2/src/fits_uintmax.c       2013-11-11 23:55:16.818732551 +0000
+diff -Naurd mpfr-3.1.2-a/src/fits_uintmax.c mpfr-3.1.2-b/src/fits_uintmax.c
+--- mpfr-3.1.2-a/src/fits_uintmax.c     2013-03-13 15:37:33.000000000 +0000
++++ mpfr-3.1.2-b/src/fits_uintmax.c     2013-09-26 10:56:55.000000000 +0000
@@ -27,51 +27,19 @@
  #include "mpfr-intmax.h"
 …
+-
 -  e = MPFR_GET_EXP (f);
++/* Note: though mpfr-impl.h is included in fits_u.h, we also include it
++   above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not
++   defined; this is necessary to avoid an empty translation unit, which
++   is forbidden by ISO C. Without this, a failing test can be reproduced
++   by creating an invalid stdint.h somewhere in the default include path
++   and by compiling MPFR with "gcc -ansi -pedantic-errors". */
+-
 -  /* first compute prec(MAXIMUM); fits in an int */
 -  for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++);
 …
 -  if (e <= prec - 1)
 -    return 1;
+-
++/* Note: though mpfr-impl.h is included in fits_u.h, we also include it
++   above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not
++   defined; this is necessary to avoid an empty translation unit, which
++   is forbidden by ISO C. Without this, a failing test can be reproduced
++   by creating an invalid stdint.h somewhere in the default include path
++   and by compiling MPFR with "gcc -ansi -pedantic-errors". */
 -  /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */
 -  if (e >= prec + 1)
 …
  #endif
+diff -Naur mpfr-3.1.2.orig/src/mpfr-impl.h mpfr-3.1.2/src/mpfr-impl.h
+--- mpfr-3.1.2.orig/src/mpfr-impl.h     2013-03-13 15:37:36.000000000 +0000
++++ mpfr-3.1.2/src/mpfr-impl.h  2013-11-11 23:55:16.818732551 +0000
+@@ -468,8 +468,16 @@
+ #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1)
+ /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0
+-   at compile time. */
+-#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)
++   at compile time.
++   Clang with -fsanitize=undefined is a bit similar due to a bug:
++     http://llvm.org/bugs/show_bug.cgi?id=17381
++   but even without its sanitizer, it may be better to use the
++   double_zero version until IEEE 754 division by zero is properly
++   supported:
++     http://llvm.org/bugs/show_bug.cgi?id=17000
++*/
++#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \
++    defined(__clang__)
+ static double double_zero = 0.0;
+ # define DBL_NAN (double_zero/double_zero)
+ # define DBL_POS_INF ((double) 1.0/double_zero)
+@@ -501,6 +509,8 @@
+    (with Xcode 2.4.1, i.e. the latest one). */
+ #define LVALUE(x) (&(x) == &(x) || &(x) != &(x))
+ #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX))
++/* The DOUBLE_ISNAN(x) macro is also valid on long double x
++   (assuming that the compiler isn't too broken). */
+ #ifdef MPFR_NANISNAN
+ /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations.
+    The + must not be replaced by a ||. With gcc -ffast-math, NaN is
+diff -Naur mpfr-3.1.2.orig/src/mpfr.h mpfr-3.1.2/src/mpfr.h
+--- mpfr-3.1.2.orig/src/mpfr.h  2013-03-13 15:37:37.000000000 +0000
++++ mpfr-3.1.2/src/mpfr.h       2013-11-11 23:55:16.818732551 +0000
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h     2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h     2013-09-26 10:56:55.000000000 +0000
@@ -27,7 +27,7 @@
  #define MPFR_VERSION_MAJOR 3
  #define MPFR_VERSION_MINOR 1
  #define MPFR_VERSION_PATCHLEVEL 2
 -#define MPFR_VERSION_STRING "3.1.2"
 +#define MPFR_VERSION_STRING "3.1.2-p3"
+-#define MPFR_VERSION_STRING "3.1.2-p1"
++#define MPFR_VERSION_STRING "3.1.2-p2"
  /* Macros dealing with MPFR VERSION */
  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
 diff -Naur mpfr-3.1.2.orig/src/version.c mpfr-3.1.2/src/version.c
 --- mpfr-3.1.2.orig/src/version.c       2013-03-13 15:37:34.000000000 +0000
 +++ mpfr-3.1.2/src/version.c    2013-11-11 23:55:16.818732551 +0000
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c  2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c  2013-09-26 10:56:55.000000000 +0000
@@ -25,5 +25,5 @@
  const char *
  mpfr_get_version (void)
+ {
 -  return "3.1.2";
 +  return "3.1.2-p3";
+-  return "3.1.2-p1";
++  return "3.1.2-p2";
+ }
 diff -Naur mpfr-3.1.2.orig/tests/tfits.c mpfr-3.1.2/tests/tfits.c
 --- mpfr-3.1.2.orig/tests/tfits.c       2013-03-13 15:37:45.000000000 +0000
 +++ mpfr-3.1.2/tests/tfits.c    2013-11-11 23:55:16.818732551 +0000
+diff -Naurd mpfr-3.1.2-a/tests/tfits.c mpfr-3.1.2-b/tests/tfits.c
+--- mpfr-3.1.2-a/tests/tfits.c  2013-03-13 15:37:45.000000000 +0000
++++ mpfr-3.1.2-b/tests/tfits.c  2013-09-26 10:56:55.000000000 +0000
@@ -33,155 +33,176 @@
  #include "mpfr-intmax.h"
 …
 -  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
 -    ERROR1;
+-
++  RND_LOOP (r)
++    {
 -  /* Check INF */
 -  mpfr_set_inf (x, 1);
 …
 -  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
 -    ERROR1;
+-
--  /* Check Zero */
--  MPFR_SET_ZERO (x);
--  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
+-
--  /* Check small op */
--  mpfr_set_str1 (x, "1@-1");
--  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
+-
--  /* Check 17 */
--  mpfr_set_ui (x, 17, MPFR_RNDN);
--  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
+-
--  /* Check all other values */
--  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
--  mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
--  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR1;
--  mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
--  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR1;
+-
--  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
--  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
--  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
--  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
+-
--  mpfr_set_si (x, 1, MPFR_RNDN);
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
+-
--  /* Check negative value */
--  mpfr_set_si (x, -1, MPFR_RNDN);
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR1;
-+  RND_LOOP (r)
-+    {
++
 +      /* Check NAN */
 +      mpfr_set_nan (x);
 …
 +      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (6);
++
+-  /* Check Zero */
+-  MPFR_SET_ZERO (x);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
 +      /* Check INF */
 +      mpfr_set_inf (x, 1);
 …
 +      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (12);
++
+-  /* Check small op */
+-  mpfr_set_str1 (x, "1@-1");
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
 +      /* Check Zero */
 +      MPFR_SET_ZERO (x);
 …
 +      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (18);
++
+-  /* Check 17 */
+-  mpfr_set_ui (x, 17, MPFR_RNDN);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
 +      /* Check small positive op */
 +      mpfr_set_str1 (x, "1@-1");
 …
 +      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (24);
++
+-  /* Check all other values */
+-  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
+-  mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR1;
 +      /* Check 17 */
 +      mpfr_set_ui (x, 17, MPFR_RNDN);
 …
 +      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (30);
++
+-  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
 +      /* Check all other values */
 +      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
 …
 +      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (37);
++
+-  mpfr_set_si (x, 1, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
 +      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
 +      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
 …
 +      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (43);
++
+-  /* Check negative value */
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
 +      mpfr_set_si (x, 1, MPFR_RNDN);
 +      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
 …
 -  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
 -    ERROR1;
+-
--  /* Check INF */
--  mpfr_set_inf (x, 1);
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
+-
--  /* Check Zero */
--  MPFR_SET_ZERO (x);
--  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
+-
--  /* Check small op */
--  mpfr_set_str1 (x, "1@-1");
--  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
+-
--  /* Check 17 */
--  mpfr_set_ui (x, 17, MPFR_RNDN);
--  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
+-
--  /* Check hugest */
--  mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
+-
--  /* Check all other values */
--  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
--  mpfr_add_ui (x, x, 1, MPFR_RNDN);
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
--  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
--  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
--  mpfr_add_ui (x, x, 1, MPFR_RNDN);
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
--  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_sub_ui (x, x, 1, MPFR_RNDN);
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
+-
--  /* Check negative value */
--  mpfr_set_si (x, -1, MPFR_RNDN);
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
 +  RND_LOOP (r)
 +    {
 …
 +      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (53);
++
+-  /* Check INF */
+-  mpfr_set_inf (x, 1);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
 +      /* Check INF */
 +      mpfr_set_inf (x, 1);
 …
 +      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (55);
++
+-  /* Check Zero */
+-  MPFR_SET_ZERO (x);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
 +      /* Check Zero */
 +      MPFR_SET_ZERO (x);
 …
 +      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (57);
++
+-  /* Check small op */
+-  mpfr_set_str1 (x, "1@-1");
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
 +      /* Check positive small op */
 +      mpfr_set_str1 (x, "1@-1");
 …
 +      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (59);
++
+-  /* Check 17 */
+-  mpfr_set_ui (x, 17, MPFR_RNDN);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
 +      /* Check 17 */
 +      mpfr_set_ui (x, 17, MPFR_RNDN);
 …
 +      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (61);
++
+-  /* Check hugest */
+-  mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
 +      /* Check hugest */
 +      mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
 …
 +      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (63);
++
+-  /* Check all other values */
+-  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
+-  mpfr_add_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
+-  mpfr_add_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_sub_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
 +      /* Check all other values */
 +      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
 …
 +      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
 +        ERROR1 (69);
++
+-  /* Check negative value */
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
 +      /* Check negative op */
 +      for (i = 1; i <= 4; i++)
 …
+ }
+-
+diff -Naur mpfr-3.1.2.orig/tests/tget_flt.c mpfr-3.1.2/tests/tget_flt.c
+--- mpfr-3.1.2.orig/tests/tget_flt.c    2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2/tests/tget_flt.c 2013-11-11 23:55:16.818732551 +0000
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES        2013-10-09 13:34:21.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES        2013-10-09 13:34:21.000000000 +0000
+@@ -0,0 +1 @@
++clang-divby0
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION        2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/VERSION        2013-10-09 13:34:21.000000000 +0000
+@@ -1 +1 @@
+-3.1.2-p2
++3.1.2-p3
+diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h
+--- mpfr-3.1.2-a/src/mpfr-impl.h        2013-03-13 15:37:36.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr-impl.h        2013-10-09 13:34:21.000000000 +0000
+@@ -468,8 +468,16 @@
+ #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1)
+ /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0
+-   at compile time. */
+-#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)
++   at compile time.
++   Clang with -fsanitize=undefined is a bit similar due to a bug:
++     http://llvm.org/bugs/show_bug.cgi?id=17381
++   but even without its sanitizer, it may be better to use the
++   double_zero version until IEEE 754 division by zero is properly
++   supported:
++     http://llvm.org/bugs/show_bug.cgi?id=17000
++*/
++#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \
++    defined(__clang__)
+ static double double_zero = 0.0;
+ # define DBL_NAN (double_zero/double_zero)
+ # define DBL_POS_INF ((double) 1.0/double_zero)
+@@ -501,6 +509,8 @@
+    (with Xcode 2.4.1, i.e. the latest one). */
+ #define LVALUE(x) (&(x) == &(x) || &(x) != &(x))
+ #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX))
++/* The DOUBLE_ISNAN(x) macro is also valid on long double x
++   (assuming that the compiler isn't too broken). */
+ #ifdef MPFR_NANISNAN
+ /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations.
+    The + must not be replaced by a ||. With gcc -ffast-math, NaN is
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h     2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h     2013-10-09 13:34:21.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p2"
++#define MPFR_VERSION_STRING "3.1.2-p3"
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c  2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c  2013-10-09 13:34:21.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p2";
++  return "3.1.2-p3";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tget_flt.c mpfr-3.1.2-b/tests/tget_flt.c
+--- mpfr-3.1.2-a/tests/tget_flt.c       2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tget_flt.c       2013-10-09 13:34:21.000000000 +0000
@@ -28,9 +28,17 @@
  main (void)
 …
 +  float infp;
 +#endif
++
 +  tests_start_mpfr ();
++
 +#if !defined(MPFR_ERRDIVZERO)
 +  /* The definition of DBL_POS_INF involves a division by 0. This makes
 …
    mpfr_clear (x);
    mpfr_clear (y);
 diff -Naur mpfr-3.1.2.orig/tests/tset_ld.c mpfr-3.1.2/tests/tset_ld.c
 --- mpfr-3.1.2.orig/tests/tset_ld.c     2013-03-13 15:37:44.000000000 +0000
 +++ mpfr-3.1.2/tests/tset_ld.c  2013-11-11 23:55:16.818732551 +0000
+diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c
+--- mpfr-3.1.2-a/tests/tset_ld.c        2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tset_ld.c        2013-10-09 13:34:21.000000000 +0000
@@ -47,8 +47,11 @@
  static int
 …
    LONGDOUBLE_NAN_ACTION (d, goto yes);
    return 0;
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES        2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/PATCHES        2013-11-15 00:51:49.323334999 +0000
+@@ -0,0 +1 @@
++printf-alt0
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION        2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/VERSION        2013-11-15 00:51:49.323334999 +0000
+@@ -1 +1 @@
+-3.1.2-p3
++3.1.2-p4
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h     2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/src/mpfr.h     2013-11-15 00:51:49.323334999 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p3"
++#define MPFR_VERSION_STRING "3.1.2-p4"
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
+--- mpfr-3.1.2-a/src/vasprintf.c        2013-03-13 15:37:37.000000000 +0000
++++ mpfr-3.1.2-b/src/vasprintf.c        2013-11-15 00:51:49.267334408 +0000
+@@ -1040,7 +1040,7 @@
+ }
+ /* Determine the different parts of the string representation of the regular
+-   number P when SPEC.SPEC is 'e', 'E', 'g', or 'G'.
++   number P when spec.spec is 'e', 'E', 'g', or 'G'.
+    DEC_INFO contains the previously computed exponent and string or is NULL.
+    return -1 if some field > INT_MAX */
+@@ -1167,7 +1167,7 @@
+ }
+ /* Determine the different parts of the string representation of the regular
+-   number P when SPEC.SPEC is 'f', 'F', 'g', or 'G'.
++   number P when spec.spec is 'f', 'F', 'g', or 'G'.
+    DEC_INFO contains the previously computed exponent and string or is NULL.
+    return -1 if some field of number_parts is greater than INT_MAX */
+@@ -1559,7 +1559,7 @@
+             /* fractional part */
+             {
+               np->point = MPFR_DECIMAL_POINT;
+-              np->fp_trailing_zeros = (spec.spec == 'g' && spec.spec == 'G') ?
++              np->fp_trailing_zeros = (spec.spec == 'g' || spec.spec == 'G') ?
+                 spec.prec - 1 : spec.prec;
+             }
+           else if (spec.alt)
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c  2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/src/version.c  2013-11-15 00:51:49.323334999 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p3";
++  return "3.1.2-p4";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
+--- mpfr-3.1.2-a/tests/tsprintf.c       2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tsprintf.c       2013-11-15 00:51:49.267334408 +0000
+@@ -456,10 +456,16 @@
+   check_sprintf ("1.999900  ", "%-#10.7RG", x);
+   check_sprintf ("1.9999    ", "%-10.7RG", x);
+   mpfr_set_ui (x, 1, MPFR_RNDN);
++  check_sprintf ("1.", "%#.1Rg", x);
++  check_sprintf ("1.   ", "%-#5.1Rg", x);
++  check_sprintf ("  1.0", "%#5.2Rg", x);
+   check_sprintf ("1.00000000000000000000000000000", "%#.30Rg", x);
+   check_sprintf ("1", "%.30Rg", x);
+   mpfr_set_ui (x, 0, MPFR_RNDN);
+-  check_sprintf ("0.000000000000000000000000000000", "%#.30Rg", x);
++  check_sprintf ("0.", "%#.1Rg", x);
++  check_sprintf ("0.   ", "%-#5.1Rg", x);
++  check_sprintf ("  0.0", "%#5.2Rg", x);
++  check_sprintf ("0.00000000000000000000000000000", "%#.30Rg", x);
+   check_sprintf ("0", "%.30Rg", x);
+   /* following tests with precision 53 bits */
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES        2013-12-01 11:07:49.575329762 +0000
++++ mpfr-3.1.2-b/PATCHES        2013-12-01 11:07:49.751331625 +0000
+@@ -0,0 +1 @@
++custom_init_set
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION        2013-12-01 11:07:49.571329714 +0000
++++ mpfr-3.1.2-b/VERSION        2013-12-01 11:07:49.747331585 +0000
+@@ -1 +1 @@
+-3.1.2-p4
++3.1.2-p5
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h     2013-12-01 11:07:49.571329714 +0000
++++ mpfr-3.1.2-b/src/mpfr.h     2013-12-01 11:07:49.747331585 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p4"
++#define MPFR_VERSION_STRING "3.1.2-p5"
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+@@ -861,7 +861,7 @@
+     _t = (mpfr_kind_t) _k;                                     \
+     _s = 1;                                                    \
+   } else {                                                     \
+-    _t = (mpfr_kind_t) -k;                                     \
++    _t = (mpfr_kind_t) - _k;                                   \
+     _s = -1;                                                   \
+   }                                                            \
+   _e = _t == MPFR_REGULAR_KIND ? (e) :                         \
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c  2013-12-01 11:07:49.575329762 +0000
++++ mpfr-3.1.2-b/src/version.c  2013-12-01 11:07:49.747331585 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p4";
++  return "3.1.2-p5";
+ }

patches/perl-5.18.2-Configure_multilib-1.patch

-              r88ef769
+              r03e6a40
 Rediffed: Against 5.18.0 by William Harrington on 2013-05-28
 Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
+Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
 diff -Naur perl-5.18.1.orig/Configure perl-5.18.1/Configure
 --- perl-5.18.1.orig/Configure  2013-08-12 02:44:47.000000000 +0000
 +++ perl-5.18.1/Configure       2013-08-13 16:47:20.188650223 +0000
+diff -Naur perl-5.18.2.orig/Configure perl-5.18.2/Configure
+--- perl-5.18.2.orig/Configure  2014-01-06 17:46:42.000000000 -0500
++++ perl-5.18.2/Configure       2014-01-10 02:38:43.000000000 -0500
@@ -6219,6 +6219,8 @@
  : The default "style" setting is made in installstyle.U

patches/perl-5.18.2-libc-1.patch

-              r88ef769
+              r03e6a40
 Rediffed: Against 5.18.0 by William Harrington on 2013-05-27
 Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
+Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
 diff -Naur perl-5.18.1.orig/hints/linux.sh perl-5.18.1/hints/linux.sh
 --- perl-5.18.1.orig/hints/linux.sh     2013-08-12 02:44:48.000000000 +0000
 +++ perl-5.18.1/hints/linux.sh  2013-08-13 16:46:38.594653439 +0000
+diff -Naur perl-5.18.2.orig/hints/linux.sh perl-5.18.2/hints/linux.sh
+--- perl-5.18.2.orig/hints/linux.sh     2014-01-06 17:46:45.000000000 -0500
++++ perl-5.18.2/hints/linux.sh  2014-01-10 02:34:36.000000000 -0500
@@ -66,9 +66,9 @@
  # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they

scripts/patch/perl-patch.sh

-              r88ef769
+              r03e6a40
+#
 cd /usr/src
 if ! [ -e perl-${VERSION}.tar.gz  ]; then
   wget http://www.cpan.org/src/perl-${VERSION}.tar.gz
+if ! [ -e perl-${VERSION}.tar.bz2  ]; then
+  wget http://www.cpan.org/src/perl-${VERSION}.tar.bz2
 fi
 …
+#
 rm -rf perl-${VERSION} perl-${VERSION}.orig
 tar xvf perl-${VERSION}.tar.gz
+tar xvf perl-${VERSION}.tar.bz2
 mv perl-${VERSION} perl-${VERSION}.orig
 CURRENTDIR=$(pwd -P)

Context Navigation

Legend: