Sync systemd and development branches.

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

13 files changed, 165 insertions, 58 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 07a8326b0..6d0fab88a 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -361,6 +361,41 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Check dependency info -->
+  <bridgehead renderas="sect2" id="check-dep">Check</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>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>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Coreutils dependency info -->
   <bridgehead renderas="sect2" id="coreutils-dep">Coreutils</bridgehead>
 
@@ -412,7 +447,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No test suite available</seg>
+          <seg></seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1241,7 +1276,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No test suite available</seg>
+          <seg>Check</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1600,7 +1635,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No test suite available</seg>
+          <seg>Diffutils</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 83a7bf33f..6c26c1077 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,52 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-05-27</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to Procps-3.3.8. Fixes 
+          <ulink url="&lfs-ticket-root;3354">#3354</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Perl-5.18.0. Fixes 
+          <ulink url="&lfs-ticket-root;3344">#3344</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Automake-1.13.2. Fixes 
+          <ulink url="&lfs-ticket-root;3347">#3347</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to GMP-5.1.2. Fixes 
+          <ulink url="&lfs-ticket-root;3352">#3352</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Linux-3.9.4. Fixes 
+          <ulink url="&lfs-ticket-root;3348">#3348</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add a reference to a book on configuring
+          the kernel.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update check program dependencies.  Thanks to 
+          Gilles Espinasse for the patch. Fixes 
+          <ulink url="&lfs-ticket-root;3353">#3353</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-05-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Expand discussion of file system types and 
+          make ext4 the example LFS partition type. Fixes 
+          <ulink url="&lfs-ticket-root;3346">#3346</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-05-18</para>
       <itemizedlist>
         <listitem>
@@ -51,7 +97,6 @@
       </itemizedlist>
     </listitem>
 
-
     <listitem>
       <para>2013-05-12</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 11b2ad8f3..a953cf5f2 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -28,9 +28,9 @@
     <!--<listitem>
       <para>Autoconf &autoconf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Automake &automake-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
@@ -88,9 +88,9 @@
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GMP &gmp-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Grep &grep-version;</para>
     </listitem>-->
@@ -121,9 +121,9 @@
     <listitem>
       <para>Less &less-version;</para>
     </listitem>
-    <!--<listitem>
-      <para>LFS-Bootscripts &lfs-bootscripts-version;</para>
-    </listitem>-->
+    <listitem>
+      <para>LFS-Network-Scripts &lfs-network-scripts-version;</para>
+    </listitem>
     <listitem>
       <para>Libpipeline &libpipeline-version;</para>
     </listitem>
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index cb49da0b4..a5b9df3d9 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -10,23 +10,49 @@
 
   <title>Creating a File System on the Partition</title>
 
-  <para>Now that a blank partition has been set up, the file system can be created.
-  The most widely-used system in the Linux world is the second extended file
-  system (<systemitem class="filesystem">ext2</systemitem>), but with newer
-  high-capacity hard disks, journaling file systems are becoming increasingly
-  popular. The third extended filesystem (<systemitem
-  class="filesystem">ext3</systemitem>) is a widely used enhancement to
-  <systemitem class="filesystem">ext2</systemitem>, which adds journaling
-  capabilities and is compatible with the E2fsprogs utilities.
-  We will create an <systemitem class="filesystem">ext3</systemitem>
-  file system. Instructions for creating other file systems can be found at
-  <ulink url="&blfs-root;view/svn/postlfs/filesystems.html"/>.</para>
+  <para>Now that a blank partition has been set up, the file system can be
+  created.  LFS can use any file system recognized by the Linux kernel, but the 
+  most common types are ext3 and ext4.  The choice of file system can be 
+  complex and depends on the characteristics of the files and the size of 
+  the partition.  For example:</para>
 
-  <para>To create an <systemitem class="filesystem">ext3</systemitem> file
-  system on the LFS partition, run the following:</para>
+  <variablelist>
+    <varlistentry>
+      <term>ext2</term>
+      <listitem><para>is suitable for small partitions that are updated infrequently
+      such as /boot.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>ext3</term>
+      <listitem><para>is an upgrade to ext2 that includes a journal
+      to help recover the partition's status in the case of an unclean 
+      shutdown.  It is commonly used as a general purpose file system.
+      </para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>ext4</term>
+      <listitem><para>is the latest version of the ext file system family of
+      partition types.  It provides several new capabilties including
+      nano-second timestamps, creation and use of very large files (16 TB), and
+      speed improvements.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 
-<screen role="nodump"><userinput>mke2fs -jv /dev/<replaceable>&lt;xxx&gt;</replaceable></userinput></screen>
+  <para>Other file sytems, including FAT32, NTFS, ReiserFS, JFS, and XFS are
+  useful for specialized purposes.  More information about these file systems
+  can be found at <ulink
+  url="http://en.wikipedia.org/wiki/Comparison_of_file_systems"/>.</para>
 
+  <para>LFS assumes that the root file system (/) is of type ext4.  To create
+  an <systemitem class="filesystem">ext4</systemitem> file system on the LFS
+  partition, run the following:</para>
+
+<screen role="nodump"><userinput>mkfs -v -t ext4 /dev/<replaceable>&lt;xxx&gt;</replaceable></userinput></screen>
+
+<!--
   <para>Replace <replaceable>&lt;xxx&gt;</replaceable> with the name of the LFS
   partition (<filename class="devicefile">sda5</filename> in our previous
   example).</para>
@@ -61,7 +87,7 @@ make #note that we intentionally don't 'make install' here!
 cd /tmp
 rm -rfv e2fsprogs-&e2fsprogs-version;</userinput></screen>
   </note>
-
+-->
   <para>If you are using an existing <systemitem class="filesystem">swap
   </systemitem> partition, there is no need to format it. If a new
   <systemitem class="filesystem"> swap</systemitem> partition was created,
diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml
index 09378afc8..5a6000f73 100644
--- a/chapter02/mounting.xml
+++ b/chapter02/mounting.xml
@@ -26,7 +26,7 @@
   running:</para>
 
 <screen role="nodump"><userinput>mkdir -pv $LFS
-mount -v -t ext3 /dev/<replaceable>&lt;xxx&gt;</replaceable> $LFS</userinput></screen>
+mount -v -t ext4 /dev/<replaceable>&lt;xxx&gt;</replaceable> $LFS</userinput></screen>
 
   <para>Replace <replaceable>&lt;xxx&gt;</replaceable> with the designation of the LFS
   partition.</para>
@@ -36,9 +36,9 @@ mount -v -t ext3 /dev/<replaceable>&lt;xxx&gt;</replaceable> $LFS</userinput></s
   class="directory">/usr</filename>), mount them using:</para>
 
 <screen role="nodump"><userinput>mkdir -pv $LFS
-mount -v -t ext3 /dev/<replaceable>&lt;xxx&gt;</replaceable> $LFS
+mount -v -t ext4 /dev/<replaceable>&lt;xxx&gt;</replaceable> $LFS
 mkdir -v $LFS/usr
-mount -v -t ext3 /dev/<replaceable>&lt;yyy&gt;</replaceable> $LFS/usr</userinput></screen>
+mount -v -t ext4 /dev/<replaceable>&lt;yyy&gt;</replaceable> $LFS/usr</userinput></screen>
 
   <para>Replace <replaceable>&lt;xxx&gt;</replaceable> and
   <replaceable>&lt;yyy&gt;</replaceable> with the appropriate partition
diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml
index 2bdb71fa1..339c42d05 100644
--- a/chapter06/gmp.xml
+++ b/chapter06/gmp.xml
@@ -79,7 +79,7 @@
 
 <screen><userinput remap="test">make check 2>&amp;1 | tee gmp-check-log</userinput></screen>
 
-    <para>Ensure that all 184 tests in the test suite passed.
+    <para>Ensure that all 185 tests in the test suite passed.
     Check the results by issuing the following command:</para>
 
 <screen><userinput remap="test">awk '/tests passed/{total+=$2} ; END{print total}' gmp-check-log</userinput></screen>
diff --git a/chapter06/libdbus.xml b/chapter06/libdbus.xml
index ba3916d12..a22d5d8fc 100644
--- a/chapter06/libdbus.xml
+++ b/chapter06/libdbus.xml
@@ -51,8 +51,8 @@
 <screen><userinput remap="make">make -C dbus libdbus-1.la</userinput></screen>
 
     <para>This package does come with a testsuite, but it is not
-    possible to run it because only part of the package is
-    installed.</para>
+    possible to run it because only part of the package was
+    built.</para>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 314aa1cb7..fce564bd5 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -74,14 +74,10 @@
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>The test suite needs some custom modifications for LFS.
-    The <command>which</command> command is not available, and the
-    <command>slabtop</command> test may return more than 999,999 objects. 
-    Also fix one test that fails when scripting does not use a tty device.
+    Remove the test that fails when scripting does not use a tty device.
     To run the test suite, run the following commands:</para>
 
-<screen><userinput remap="test">sed -i -e 's|exec which sleep|exec echo /tools/bin/sleep|' \
-       -e 's|&amp;9|9999999|'             testsuite/config/unix.exp
-sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
+<screen><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
 
 make check</userinput></screen>
 
@@ -93,7 +89,7 @@ make check</userinput></screen>
 <filename class="directory">/usr</filename> is not mounted.</para>
 
 <screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib
-ln -sfv ../../lib/libprocps.so.1.1.1 /usr/lib/libprocps.so</userinput></screen>
+ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 3bac8536c..4d9122552 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -49,6 +49,9 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
+    <note><para>Two tests in the test suite fail due to out of date
+    perl code.</para></note>
+
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml
index 26b40296b..490e44644 100644
--- a/chapter08/fstab.xml
+++ b/chapter08/fstab.xml
@@ -36,7 +36,7 @@ EOF</userinput></screen>
   with the values appropriate for the system, for example, <filename
   class="partition">sda2</filename>, <filename
   class="partition">sda5</filename>, and <systemitem
-  class="filesystem">ext3</systemitem>. For details on the six
+  class="filesystem">ext4</systemitem>. For details on the six
   fields in this file, see <command>man 5 fstab</command>.</para>
 
   <para>Filesystems with MS-DOS or Windows origin (i.e.: vfat, ntfs, smbfs, cifs,
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 7eed8d290..00309b469 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -61,7 +61,9 @@
     url="&hints-root;kernel-configuration.txt"/>.  BLFS has some information
     regarding particular kernel configuration requirements of packages outside
     of LFS at <ulink
-    url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>.  </para>
+    url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>.  Additional
+    information about configuring and building the kernel can be found at
+    <ulink url="http://www.kroah.com/lkn/"/> </para>
 
     <note><para>Due to recent changes in <application>udev</application>, be sure to
     select:</para>
diff --git a/general.ent b/general.ent
index 1809fe4f0..b1e5a8eed 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SYSTEMD-20130518">
-<!ENTITY releasedate     "May 18, 2013">
+<!ENTITY version         "SYSTEMD-20130529">
+<!ENTITY releasedate     "May 29, 2013">
 <!ENTITY copyrightdate   "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.4">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 255084a68..7536c27e5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -31,11 +31,11 @@
 <!ENTITY autoconf-ch6-du "17.1 MB">
 <!ENTITY autoconf-ch6-sbu "4.5 SBU">
 
-<!ENTITY automake-version "1.13.1">
+<!ENTITY automake-version "1.13.2">
 <!ENTITY am-minor-version "1.13">
-<!ENTITY automake-size "1,392 KB">
+<!ENTITY automake-size "1,408 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "a60380ab11e1481376b7747d1b42ced2">
+<!ENTITY automake-md5 "497f3ea7e85504fe5b1b1b6d27cc71f1">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "100 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU (34.1 SBU with tests)">
@@ -248,10 +248,10 @@
 <!ENTITY glibc-ch6-du "852 MB">
 <!ENTITY glibc-ch6-sbu "17.6 SBU">
 
-<!ENTITY gmp-version "5.1.1">
-<!ENTITY gmp-size "1,771 KB">
+<!ENTITY gmp-version "5.1.2">
+<!ENTITY gmp-size "1,780 KB">
 <!ENTITY gmp-url "ftp://ftp.gmplib.org/pub/gmp-&gmp-version;/gmp-&gmp-version;.tar.xz">
-<!ENTITY gmp-md5 "485b1296e6287fa381e6015b19767989">
+<!ENTITY gmp-md5 "06fe2ca164221c59ce74867155cfc1ac">
 <!ENTITY gmp-home "&gnu-software;gmp/">
 <!ENTITY gmp-ch5-du "39 MB">
 <!ENTITY gmp-ch5-sbu "1.5 SBU">
@@ -395,12 +395,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "9">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "4">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "70,409 KB">
+<!ENTITY linux-size "70,420 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "e406cc1bb5618a4ea88470f4d3d3d6e1">
+<!ENTITY linux-md5 "053095dfe88fbd52e7cc8db302631d99">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -489,10 +489,10 @@
 <!ENTITY patch-ch6-du "3.4 MB">
 <!ENTITY patch-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY perl-version "5.16.3">
-<!ENTITY perl-size "13,403 KB">
+<!ENTITY perl-version "5.18.0">
+<!ENTITY perl-size "13,708 KB">
 <!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "025102de0e4a597cf541e57da80c6aa3">
+<!ENTITY perl-md5 "a832e928adfd36d162d2a5d3b631265c">
 <!ENTITY perl-home "http://www.perl.org/">
 <!ENTITY perl-ch5-du "237 MB">
 <!ENTITY perl-ch5-sbu "1.8 SBU">
@@ -507,10 +507,10 @@
 <!ENTITY pkgconfig-ch6-du "31 MB">
 <!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
 
-<!ENTITY procps-ng-version "3.3.7">
-<!ENTITY procps-ng-size "537 KB">
+<!ENTITY procps-ng-version "3.3.8">
+<!ENTITY procps-ng-size "544 KB">
 <!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
-<!ENTITY procps-ng-md5 "57d2bad8c8fac3d09ee9f5f964e3da9c">
+<!ENTITY procps-ng-md5 "aecbeeda2ab308f8d09dddcb4cb9a572">
 <!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
 <!ENTITY procps-ng-ch6-du "13 MB">
 <!ENTITY procps-ng-ch6-sbu "0.2 SBU">