Merged from trunk to r11067.

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

10 files changed, 87 insertions, 42 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 05fdadff4..2e522620e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,16 +36,40 @@
     </listitem>
 -->
     <listitem>
-      <para>2016-05-17</para>
+      <para>2016-05-18</para>
       <itemizedlist>
         <listitem>
-          <para>[renodr] - Updated to linux-4.6. Merged from trunk r11060.</para>
+          <para>[dj] - Enhance the stripping commands at the end
+          of Chapter 6. Merged from trunk r11064.</para>
         </listitem>
         <listitem>
-          <para>[renodr] - Update to perl-5.24.0. Merged from trunk r11060.</para>
+          <para>[dj] - Added stages page to Chapter 2. Merged from trunk
+          r11063.</para>
         </listitem>
         <listitem>
-          <para>[renodr] - Updated to tar-1.29. Merged from trunk r11060.</para>
+          <para>[dj] - Made editorial changes to the kernel section. Merged
+          from trunk r11062.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Moved Host System Requirements to Chapter 2
+          and made minor editorial changes. Merged from trunk r11061.</para>
+        </listitem>
+     </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2016-05-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rendor] - Updated to tar-1.29. Merged from trunk r11060.</para>
+        </listitem>
+        <listitem>
+          <para>[rendor] - Updated to linux-4.6. Merged from trunk
+          r11060.</para>
+        </listitem>
+        <listitem>
+          <para>[rendor] - Updated to perl-5.24.0. Merged from trunk
+          r11060.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -55,19 +79,19 @@
       <itemizedlist>
         <listitem>
           <para>[renodr] - Updated to file-5.27. Merged from trunk
-          r11056.</para>
+          r11057.</para>
         </listitem>
         <listitem>
           <para>[renodr] - Updated to man-pages-4.06. Merged from trunk
-          r11056.</para>
+          r11057.</para>
         </listitem>
         <listitem>
           <para>[renodr] - Updated to perl-5.22.2. Merged from trunk
-          r11056.</para>
+          r11057.</para>
         </listitem>
         <listitem>
           <para>[renodr] - Updated size requirements. Merged from trunk
-          r11056.</para>
+          r11057.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter02/chapter02.xml b/chapter02/chapter02.xml
index aa62827bb..4c329f134 100644
--- a/chapter02/chapter02.xml
+++ b/chapter02/chapter02.xml
@@ -12,6 +12,8 @@
   <title>Preparing a New Partition</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hostreqs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingpartition.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingfilesystem.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlfs.xml"/>
diff --git a/prologue/hostreqs.xml b/chapter02/hostreqs.xml
index e2358ecf6..5e92f8a8b 100644
--- a/prologue/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -18,8 +18,8 @@
     <quote>&lt;package-name&gt;-dev</quote>. Be sure to install those if
     your distribution provides them.</para>
 
-   <para>Earlier versions of the listed software packages may work, but has not
-   been tested.</para>
+   <para>Earlier versions of the listed software packages may work, but have
+   not been tested.</para>
 
   <itemizedlist spacing="compact">
 
@@ -130,7 +130,7 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Tar-1.18</emphasis></para>
+      <para><emphasis role="strong">Tar-1.22</emphasis></para>
     </listitem>
 
     <listitem>
@@ -143,16 +143,21 @@
 
   </itemizedlist>
 
-  <para>Note that the symlinks mentioned above are required to build an LFS
-  system using the instructions contained within this book. Symlinks that
-  point to other software (such as dash, mawk, etc.) may work, but are not
-  tested or supported by the LFS development team, and may require either
-  deviation from the instructions or additional patches to some
-  packages.</para>
+  <important>
+    <para>Note that the symlinks mentioned above are required to build an LFS
+    system using the instructions contained within this book. Symlinks that
+    point to other software (such as dash, mawk, etc.) may work, but are not
+    tested or supported by the LFS development team, and may require either
+    deviation from the instructions or additional patches to some
+    packages.</para>
+  </important>
 
   <!-- Use an empty sect2 element to prevent a pdf warning.  -->
-  <sect2 id="version-check" xreflabel="Section vii, Host System Requirements">
-  <title> </title>
+  <bridgehead renderas="sect2" 
+              id="version-check" 
+              xreflabel="Host System Requirements">
+  </bridgehead>
+  <!--<title> </title>-->
 
   <para >To see whether your host system has all the appropriate versions, and
   the ability to compile programs, run the following:</para>
@@ -234,5 +239,5 @@ bash library-check.sh</userinput></screen>
 or all absent, but not only one or two present.</para>
 
 
-</sect2>
+<!--</sect2>-->
 </sect1>
diff --git a/chapter02/introduction.xml b/chapter02/introduction.xml
index 11e4e1883..007bdad8b 100644
--- a/chapter02/introduction.xml
+++ b/chapter02/introduction.xml
@@ -10,8 +10,9 @@
 
   <title>Introduction</title>
 
-  <para>In this chapter, the partition which will host the LFS system is
-  prepared. We will create the partition itself, create a file system
-  on it, and mount it.</para>
+  <para>In this chapter, the host tools needed for building LFS
+  are checked and, if necessary, installed.  Then a partition which will 
+  host the LFS system is prepared. We will create the partition 
+  itself, create a file system on it, and mount it.</para>
 
 </sect1>
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 14858b17b..8a0700be2 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -42,7 +42,6 @@
 
   <sect2 role="installation">
     <title>Installation of Perl</title>
-
     <para>Prepare Perl for compilation:</para>
 
 <screen><userinput remap="configure">sh Configure -des -Dprefix=/tools -Dlibs=-lm</userinput></screen>
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index 5492e679c..f09131035 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -39,8 +39,14 @@
 
   <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>
+<screen><userinput>/tools/bin/find /usr/lib -type f -name \*.a \
+   -exec /tools/bin/strip --strip-debug {} ';'
+
+/tools/bin/find /lib /usr/lib -type f -name \*.so* \
+   -exec /tools/bin/strip --strip-unneeded {} ';'
+
+/tools/bin/find /{bin,sbin} /usr/{bin,sbin,libexec} -type f \
+    -exec /tools/bin/strip --strip-all {} ';'</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/chapter08/kernel.xml b/chapter08/kernel.xml
index 8bc1423c8..340ceef63 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -122,21 +122,22 @@ File systems  ---&gt;
 
     </variablelist>
 
-<screen role="nodump"><userinput>make LANG=<replaceable>&lt;host_LANG_value&gt;</replaceable> LC_ALL= menuconfig</userinput></screen>
+<screen role="nodump"><userinput>make menuconfig</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the make parameters:</title>
+      <title>The meaning of optional make environment variables:</title>
 
       <varlistentry>
         <term><parameter>LANG=&lt;host_LANG_value&gt; LC_ALL=</parameter></term>
         <listitem>
-          <para>This establishes the locale setting to the one used on the host.
-          This is needed for a proper menuconfig ncurses interface line
-          drawing on UTF-8 linux text console.</para>
-
-          <para>Be sure to replace <replaceable>&lt;host_LANG_value&gt;</replaceable>
-          by the value of the <envar>$LANG</envar> variable from your host.
-          If not set, you could use instead the host's value of <envar>$LC_ALL</envar>
+          <para>This establishes the locale setting to the one used on the
+          host.  This may be needed for a proper menuconfig ncurses interface
+          line drawing on a UTF-8 linux text console.</para>
+
+          <para>If used, be sure to replace
+          <replaceable>&lt;host_LANG_value&gt;</replaceable> by the value of
+          the <envar>$LANG</envar> variable from your host.  You can
+          alternatively use instead the host's value of <envar>$LC_ALL</envar>
           or <envar>$LC_CTYPE</envar>.</para>
         </listitem>
       </varlistentry>
@@ -175,6 +176,14 @@ File systems  ---&gt;
     required to complete the installation. Some files need to be copied to
     the <filename class="directory">/boot</filename> directory.</para>
 
+    <caution>
+      <para>If the host system has a separate /boot partition, the
+      files copied below should go there. The easiest way to do that 
+      is to bind /boot on the host to /mnt/lfs/boot before proceeding:</para>
+
+<screen role="nodump"><userinput>mount --bind /boot /mnt/lfs/boot</userinput></screen>
+    </caution>
+
     <para>The path to the kernel image may vary depending on the platform being
     used. The filename below can be changed to suit your taste, but the stem of
     the filename should be <emphasis>vmlinuz</emphasis> to be compatible with
diff --git a/general.ent b/general.ent
index f7aa1e2bc..01796f0ab 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20160517-systemd">
+<!ENTITY version         "20160518-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "May 17th, 2016">
+<!ENTITY releasedate     "May 18th, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.10">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index ad7f10e06..dd3664b69 100644
--- a/packages.ent
+++ b/packages.ent
@@ -163,7 +163,7 @@
 <!ENTITY file-version "5.27">
 <!ENTITY file-size "756 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "de75665721e3adb0a1d7e03b90c3d7a2">
+<!ENTITY file-md5 "18f1c60aa27a296a26c2e9389ac92ba5">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "15 MB">
 <!ENTITY file-ch5-sbu "less than 0.1 SBU">
@@ -377,7 +377,7 @@
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "6">
 <!ENTITY linux-patch-version "0">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -->
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
 <!ENTITY linux-size "87,365 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
@@ -425,7 +425,7 @@
 <!ENTITY man-pages-version "4.06">
 <!ENTITY man-pages-size "1,419 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "de75665721e3adb0a1d7e03b90c3d7a2">
+<!ENTITY man-pages-md5 "a7b6c7e2a03a4b0d61eee4e52de68a42">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "26 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -440,7 +440,7 @@
 
 <!ENTITY mpfr-version "3.1.4">
 <!ENTITY mpfr-size "1,096 KB">
-<!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
+<!ENTITY mpfr-url "&gnu;mpfr/mpfr-&mpfr-version;.tar.xz">
 <!ENTITY mpfr-md5 "064b2c18185038e404a401b830d59be8">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 <!ENTITY mpfr-ch6-du "47 MB">
diff --git a/prologue/preface.xml b/prologue/preface.xml
index bd2139857..21317757f 100644
--- a/prologue/preface.xml
+++ b/prologue/preface.xml
@@ -17,7 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="standards.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="why.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prerequisites.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hostreqs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="typography.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="organization.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errata.xml"/>