Updates from LFS development.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10483 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

21 files changed, 80 insertions, 62 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6961afade..e0aa771c8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-02-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Change kmod instructions to allow
+          installation of man pages.  Fixes
+          <ulink url="&lfs-ticket-root;3502">#3502</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-02-17</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 6766005fa..decec8b6f 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -72,7 +72,7 @@ cd ../binutils-build</userinput></screen>
 
     <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure   \
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure     \
     --prefix=/tools            \
     --with-sysroot=$LFS        \
     --with-lib-path=/tools/lib \
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 69d0e3ff3..9ebf763e7 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -53,7 +53,7 @@ cd ../binutils-build</userinput></screen>
 <screen><userinput remap="configure">CC=$LFS_TGT-gcc                \
 AR=$LFS_TGT-ar                 \
 RANLIB=$LFS_TGT-ranlib         \
-../binutils-&binutils-version;/configure   \
+../binutils-&binutils-version;/configure     \
     --prefix=/tools            \
     --disable-nls              \
     --with-lib-path=/tools/lib \
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index d53394504..ae6f50026 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -51,8 +51,9 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
 
     <para>Now prepare Expect for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools --with-tcl=/tools/lib \
-  --with-tclinclude=/tools/include</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools       \
+            --with-tcl=/tools/lib \
+            --with-tclinclude=/tools/include</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index e96c469ad..6fb0792c4 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -77,7 +77,7 @@ esac</userinput></screen>
 do
   cp -uv $file{,.orig}
   sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&amp;@g' \
-  -e 's@/usr@/tools@g' $file.orig &gt; $file
+      -e 's@/usr@/tools@g' $file.orig &gt; $file
   echo '
 #undef STANDARD_STARTFILE_PREFIX_1
 #undef STANDARD_STARTFILE_PREFIX_2
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 9a6ad2415..23d0a3a4a 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -56,13 +56,13 @@ cd ../gcc-build</userinput></screen>
     <para>Prepare Libstdc++ for compilation:</para>
 
 <screen><userinput remap="configure">../gcc-&gcc-version;/libstdc++-v3/configure \
-    --host=$LFS_TGT                      \
-    --prefix=/tools                      \
-    --disable-multilib                   \
-    --disable-shared                     \
-    --disable-nls                        \
-    --disable-libstdcxx-threads          \
-    --disable-libstdcxx-pch              \
+    --host=$LFS_TGT                 \
+    --prefix=/tools                 \
+    --disable-multilib              \
+    --disable-shared                \
+    --disable-nls                   \
+    --disable-libstdcxx-threads     \
+    --disable-libstdcxx-pch         \
     --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
 
     <variablelist>
diff --git a/chapter05/stripping.xml b/chapter05/stripping.xml
index 2d8fe6568..ad2cb3ae0 100644
--- a/chapter05/stripping.xml
+++ b/chapter05/stripping.xml
@@ -16,10 +16,11 @@
   debugging symbols. Remove those symbols with:</para>
 
 <screen><userinput>strip --strip-debug /tools/lib/*
-strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
+/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
 
   <para>These commands will skip a number of files, reporting that it does not
-  recognize their file format. Most of these are scripts instead of binaries.</para>
+  recognize their file format. Most of these are scripts instead of binaries.
+  Also use the system strip command to include the strip binary in /tools.</para>
 
   <para>Take care <emphasis>not</emphasis> to use
   <parameter>--strip-unneeded</parameter> on the libraries. The static
diff --git a/chapter05/xz.xml b/chapter05/xz.xml
index bb3bc1a74..ea1ea4966 100644
--- a/chapter05/xz.xml
+++ b/chapter05/xz.xml
@@ -6,10 +6,10 @@
 ]>
 
 <sect1 id="ch-tools-xz" role="wrap">
-  <?dbhtml filename="xz-utils.html"?>
+  <?dbhtml filename="xz.html"?>
 
   <sect1info condition="script">
-    <productname>xz-utils</productname>
+    <productname>xz</productname>
     <productnumber>&xz-version;</productnumber>
     <address>&xz-url;</address>
   </sect1info>
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index 5443326a9..8240d2f35 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -22,9 +22,13 @@ mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
 mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -v  /usr/libexec
 mkdir -pv /usr/{,local/}share/man/man{1..8}
+
 case $(uname -m) in
- x86_64) ln -sv lib /lib64 &amp;&amp; ln -sv lib /usr/lib64 &amp;&amp; ln -sv lib /usr/local/lib64 ;;
+ x86_64) ln -sv lib /lib64     &amp;&amp; 
+         ln -sv lib /usr/lib64 &amp;&amp; 
+         ln -sv lib /usr/local/lib64 ;;
 esac
+
 mkdir -v /var/{log,mail,spool}
 ln -sv /run /var/run
 ln -sv /run/lock /var/lock
diff --git a/chapter06/db.xml b/chapter06/db.xml
index 0a899962b..5549c2ed4 100644
--- a/chapter06/db.xml
+++ b/chapter06/db.xml
@@ -273,7 +273,7 @@
 
 
       <varlistentry id="libdb">
-        <term><filename class="libraryfile">libdb.{so,a}</filename></term>
+        <term><filename class="libraryfile">libdb.{a,so}</filename></term>
         <listitem>
           <para>Contains functions to manipulate database files from C
           programs</para>
@@ -284,7 +284,7 @@
       </varlistentry>
 
       <varlistentry id="libdb_cxx">
-        <term><filename class="libraryfile">libdb_cxx.{so,a}</filename></term>
+        <term><filename class="libraryfile">libdb_cxx.{a,so}</filename></term>
         <listitem>
           <para>Contains functions to manipulate database files from C++
           programs</para>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 7fe9fe94d..83cac4ece 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -70,16 +70,17 @@ cd ../gcc-build</userinput></screen>
 
     <para>Prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">SED=sed                                            \
-../gcc-&gcc-version;/configure --prefix=/usr               \
-                       --enable-shared             \
-                       --enable-threads=posix      \
-                       --enable-__cxa_atexit       \
-                       --enable-clocale=gnu        \
-                       --enable-languages=c,c++    \
-                       --disable-multilib          \
-                       --disable-bootstrap         \
-                       --with-system-zlib</userinput></screen>
+<screen><userinput remap="configure">SED=sed                          \
+../gcc-&gcc-version;/configure           \
+     --prefix=/usr               \
+     --enable-shared             \
+     --enable-threads=posix      \
+     --enable-__cxa_atexit       \
+     --enable-clocale=gnu        \
+     --enable-languages=c,c++    \
+     --disable-multilib          \
+     --disable-bootstrap         \
+     --with-system-zlib</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that
     are not available. See the BLFS Book for instructions on how to
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index d01d99094..114409670 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -58,13 +58,6 @@
 
 <screen><userinput remap="pre">sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile</userinput></screen>
 
-    <para>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 Glibc install because the
-    Glibc autoconf tests would give false results and defeat the goal
-    of achieving a clean build.</para>
-
     <para>Some of the Glibc programs use non-FHS compilant
     <filename class="directory">/var/db</filename> directory to store
     their runtime data. Apply the following patch to make such programs
@@ -72,6 +65,13 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
 
+    <para>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 Glibc install because the
+    Glibc autoconf tests would give false results and defeat the goal
+    of achieving a clean build.</para>
+
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
@@ -80,7 +80,7 @@ cd ../glibc-build</userinput></screen>
 
     <para>Prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../glibc-&glibc-version;/configure          \
+<screen><userinput remap="configure">../glibc-&glibc-version;/configure    \
     --prefix=/usr          \
     --disable-profile      \
     --enable-kernel=&min-kernel; \
@@ -352,7 +352,7 @@ unset ZONEINFO</userinput></screen>
     <para>Then create the <filename>/etc/localtime</filename> file by
     running:</para>
 
-<screen><userinput>ln -sv /usr/share/zoneinfo/<replaceable>&lt;xxx&gt;</replaceable> /etc/localtime</userinput></screen>
+<screen><userinput>ln -sfv /usr/share/zoneinfo/<replaceable>&lt;xxx&gt;</replaceable> /etc/localtime</userinput></screen>
 
     <para>Replace <replaceable>&lt;xxx&gt;</replaceable> with the name of the
     time zone selected (e.g., Canada/Eastern).</para>
@@ -431,9 +431,9 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
         /usr/include/netipx, /usr/include/netiucv, /usr/include/netpacket,
         /usr/include/netrom, /usr/include/netrose, /usr/include/nfs,
         /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
-        /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/getconf,
-        /usr/lib/locale, /usr/share/i18n, /usr/share/zoneinfo, /var/cache/nscd,
-        and /var/lib/nss_db</seg>
+        /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/locale,
+        /usr/libexec/getconf, /usr/share/i18n, /usr/share/zoneinfo,
+        /var/cache/nscd, and /var/lib/nss_db</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index 9832437d1..063433040 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -46,8 +46,8 @@
 <screen><userinput remap="configure">./configure --prefix=/usr          \
             --bindir=/bin          \
             --sysconfdir=/etc      \
-            --disable-manpages     \
             --with-rootlibdir=/lib \
+            --disable-manpages     \
             --with-xz              \
             --with-zlib</userinput></screen>
 
@@ -88,10 +88,10 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the package, and create symlinks for compatibility with
-    Module-Init-Tools, the package that previously handled Linux kernel modules.
-    Also make sure that all libraries are in the correct directory:
-    </para>
+    <para>Install the package, create symlinks for compatibility with
+    Module-Init-Tools (the package that previously handled Linux kernel
+    modules), and manually install the man pages.  Also make sure that all
+    libraries are in the correct directory: </para>
 
 <screen><userinput remap="install">make install
 
@@ -99,7 +99,10 @@ for target in depmod insmod modinfo modprobe rmmod; do
   ln -sv ../bin/kmod /sbin/$target
 done
 
-ln -sv kmod /bin/lsmod</userinput></screen>
+ln -sv kmod /bin/lsmod
+
+cp -v man/*.5 /usr/share/man/man5
+cp -v man/*.8 /usr/share/man/man8</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/pcre.xml b/chapter06/pcre.xml
index 800d0aa04..f44e5003d 100644
--- a/chapter06/pcre.xml
+++ b/chapter06/pcre.xml
@@ -106,7 +106,7 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
 
       <seglistitem>
         <seg>pcregrep, pcretest, and pcre-config</seg>
-        <seg>libpcre.{so,a}, libpcrecpp.{so,a} and libpcreposix.{so,a}</seg>
+        <seg>libpcre.{a,so}, libpcrecpp.{a,so} and libpcreposix.{a,so}</seg>
         <seg>/usr/share/doc/pcre-&pcre-version;</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 0114b1e6b..3dbafd4d7 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -70,7 +70,6 @@
     To run the test suite, run the following commands:</para>
 
 <screen><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
-
 make check</userinput></screen>
 
     <para>Install the package:</para>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 6ad6ecaaa..2b0c334fc 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -90,9 +90,8 @@ ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</us
 
     <para>If desired, install the documentation:</para>
 
-<screen><userinput remap="install">mkdir   -v       /usr/share/doc/readline-&readline-version;
-install -v -m644 doc/*.{ps,pdf,html,dvi} \
-                 /usr/share/doc/readline-&readline-version;</userinput></screen>
+<screen><userinput remap="install">mkdir   -v /usr/share/doc/readline-&readline-version;
+install -v -m644 doc/*.{ps,pdf,html,dvi} /usr/share/doc/readline-&readline-version;</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index acbbbf7ac..0f30426d8 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -69,8 +69,7 @@ find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></scr
     <note>
       <para>If you chose to build Shadow with Cracklib support, run the following:</para>
 
-<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' \
-    etc/login.defs</userinput></screen>
+<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
     </note>
 
     <para>Prepare Shadow for compilation:</para>
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index 14f87829d..5492e679c 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -32,15 +32,15 @@
 
   <para>Then reenter it with:</para>
 
-<screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
+<screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i            \
     HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+    PATH=/bin:/usr/bin:/sbin:/usr/sbin   \
     /tools/bin/bash --login</userinput></screen>
 
   <para>Now the binaries and libraries can be safely stripped:</para>
 
 <screen><userinput>/tools/bin/find /{,usr/}{bin,lib,sbin} -type f \
-  -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
+    -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
 
   <para>A large number of files will be reported as having their file
   format not recognized. These warnings can be safely ignored. These
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 063082be0..5afa8965b 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -50,7 +50,7 @@
     following:</para>
 
 <screen><userinput remap="pre">sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
-     $(grep -rl '/etc/adjtime' .)
+          $(grep -rl '/etc/adjtime' .)
 
 mkdir -pv /var/lib/hwclock</userinput></screen>
 
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index 07deb6183..c71ac45c8 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -6,10 +6,10 @@
 ]>
 
 <sect1 id="ch-system-xz" role="wrap">
-  <?dbhtml filename="xz-utils.html"?>
+  <?dbhtml filename="xz.html"?>
 
   <sect1info condition="script">
-    <productname>xz-utils</productname>
+    <productname>xz</productname>
     <productnumber>&xz-version;</productnumber>
     <address>&xz-url;</address>
   </sect1info>
diff --git a/general.ent b/general.ent
index 5bec10934..74d95a407 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "20140217-SYSTEMD">
-<!ENTITY releasedate     "February 17, 2014">
+<!ENTITY version         "20140218-SYSTEMD">
+<!ENTITY releasedate     "February 18, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->