Merged trunk.

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

18 files changed, 80 insertions, 43 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5b95a7392..090c88442 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,33 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-08-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merged LFS SVN-20140803.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-08-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Move sed to be after acl. Fixes
+          <ulink url="&lfs-ticket-root;3646">#3646</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Remove reference to obsolete /proc/ksyms in 
+          modules boot script.  Fixes
+          <ulink url="&lfs-ticket-root;3644">#3644</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Change internal references to svn to an entitiy.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-07-31</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index 9733b6fd4..0e86d7c2d 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -59,10 +59,10 @@
 
   <note><para>For experienced users, other partitioning schemes are possible.
   The new LFS system can be on a software <ulink
-  url="&blfs-root;/view/svn/postlfs/raid.html">RAID</ulink> array or an <ulink
-  url="&blfs-root;/view/svn/postlfs/aboutlvm.html">LVM</ulink> logical volume.
+  url="&blfs-root;/view/&short-version;/postlfs/raid.html">RAID</ulink> array or an <ulink
+  url="&blfs-root;/view/&short-version;/postlfs/aboutlvm.html">LVM</ulink> logical volume.
   However, some of these options require an <ulink
-  url="&blfs-root;/view/svn/postlfs/initramfs.html">initramfs</ulink>, which is
+  url="&blfs-root;/view/&short-version;/postlfs/initramfs.html">initramfs</ulink>, which is
   an advanced topic.  These partitioning methodologies are not recommended for
   first time LFS users.</para></note>
 
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index b0fd383f8..49612eba7 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -105,6 +105,10 @@ done</userinput></screen>
 
 <screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen>
 
+    <para>Also fix a problem identified upstream:</para>
+
+<screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
+
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 1dce58834..1bd4c4a20 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -95,6 +95,10 @@ mv -v gmp-&gmp-extracted-version; gmp
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
+    <para>As in the first build of GCC, fix a problem identified upstream:</para>
+
+<screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
+
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../gcc-build
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 8af18f57a..5607d86a2 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -28,13 +28,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
diff --git a/chapter06/db.xml b/chapter06/db.xml
index 5549c2ed4..e3c185362 100644
--- a/chapter06/db.xml
+++ b/chapter06/db.xml
@@ -42,7 +42,7 @@
       <para>There are instructions to build this package in the BLFS book if you
       need to build the RPC server or additional language bindings. The
       additional language bindings will require additional packages to be
-      installed. See <ulink url="&blfs-root;view/svn/server/databases.html#db"/>
+      installed. See <ulink url="&blfs-root;view/&short-version;/server/databases.html#db"/>
       for suggested installation instructions.</para>
 
       <para>Also, GDBM <emphasis>could</emphasis> be used in place of Berkeley
@@ -52,7 +52,7 @@
       installed, not with GDBM. If you fully understand the risks versus
       benefits of using GDBM and wish to use it anyway, see the BLFS
       instructions located at <ulink
-      url="&blfs-root;view/svn/general/gdbm.html"/></para>
+      url="&blfs-root;view/&short-version;/general/gdbm.html"/></para>
 
     </tip>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 7b6ab61a1..8dc997b01 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -40,6 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <para>As in Chapter 5, fix a problem identified upstream:</para>
+
+<screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
+
 <!--
     <para>First fix a problem identified upstream that causes some 
     programs to fail:</para>
@@ -77,8 +82,9 @@ cd ../gcc-build</userinput></screen>
      --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
-    build all the GCC supported languages.</para>
+    are not yet available. See the
+    <ulink url="&blfs-root;view/&short-version;/general/gcc.html">BLFS Book</ulink>
+    for instructions on how to build all of GCC's supported languages.</para>
 
     <variablelist>
       <title>The meaning of the new configure option:</title>
@@ -129,10 +135,10 @@ cd ../gcc-build</userinput></screen>
     url="&test-results;"/> and <ulink url="http://gcc.gnu.org/ml/gcc-testresults/"/>.</para>
 
     <para>A few unexpected failures cannot always be avoided. The GCC developers
-    are usually aware of these issues, but have not resolved them yet. In
+    are usually aware of these issues, but have not resolved them yet. <!-- In
     particular, the <filename class="libraryfile">libmudflap</filename> tests
     are known to be particularly problematic as a result of a bug in GCC
-    (<ulink url="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20003"/>).
+    (<ulink url="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20003"/>). -->
     Unless the test results are vastly different from those at the above URL,
     it is safe to continue.</para>
 
@@ -320,7 +326,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
 
         <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},
+        liblto_plugin.so, 
         libquadmath.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a and libtsan.{a,so}</seg>
 
@@ -500,7 +506,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libmudflap">
         <term><filename class="libraryfile">libmudflap</filename></term>
         <listitem>
@@ -511,7 +517,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="libquadmath">
         <term><filename class="libraryfile">libquadmath</filename></term>
         <listitem>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index d86037f33..5f4c98d66 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -46,7 +46,7 @@
     common requirement on a base Linux system, remove the dependency on Berkeley
     DB by applying the commands below.  If the <command>arpd</command> binary is
     needed, instructions for compiling Berkeley DB can be found in the BLFS Book
-    at <ulink url="&blfs-root;view/svn/server/databases.html#db"/>.
+    at <ulink url="&blfs-root;view/&short-version;/server/databases.html#db"/>.
     </para>
 
 <screen><userinput remap="pre">sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 170aa2388..443c4c5ac 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -47,7 +47,7 @@
 
 <screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
-    <para>This version of Perl now builds the Compress::Raw::Zlib ane 
+    <para>This version of Perl now builds the Compress::Raw::Zlib and 
     Compress::Raw::BZip2 modules. By
     default Perl will use an internal copy of the sources for the build.
     Issue the following command so that Perl will use the libraries
diff --git a/chapter06/pkgmgt.xml b/chapter06/pkgmgt.xml
index 67ffd1cd7..b4734aba0 100644
--- a/chapter06/pkgmgt.xml
+++ b/chapter06/pkgmgt.xml
@@ -51,14 +51,10 @@
 
     <itemizedlist>
       <listitem>
-        <para>If one of the toolchain packages (Glibc, GCC or Binutils) needs
-        to be upgraded to a newer minor version, it is safer to rebuild LFS.
-        Though you <emphasis>may</emphasis> be able to get by rebuilding all
-        the packages in their dependency order, we do not recommend it. For
-        example, if glibc-2.2.x needs to be updated to glibc-2.3.x, it is safer
-        to rebuild. For micro version updates, a simple reinstallation usually
-        works, but is not guaranteed. For example, upgrading from glibc-2.3.4
-        to glibc-2.3.5 will not usually cause any problems.</para>
+        <para>If Glibc needs to be upgraded to a newer version, (e.g.  from
+        glibc-2.19 to glibc-2.20, it is safer to rebuild LFS.  Though you
+        <emphasis>may</emphasis> be able to rebuild all the packages in their
+        dependency order, we do not recommend it.  </para>
       </listitem>
 
       <listitem>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 19086094a..a44fd17a7 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -43,7 +43,7 @@
 
     <note>
       <para>If you would like to enforce the use of strong passwords, refer to
-      <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/> for installing
+      <ulink url="&blfs-root;view/&short-version;/postlfs/cracklib.html"/> for installing
       CrackLib prior to building Shadow. Then add
       <parameter>--with-libcrack</parameter> to the <command>configure</command>
       command below.</para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 840440cac..edadde175 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -34,7 +34,7 @@
 
       <para>If you prefer another editor&mdash;such as Emacs, Joe, or
       Nano&mdash;please refer to <ulink
-      url="&blfs-root;view/svn/postlfs/editors.html"/> for suggested
+      url="&blfs-root;view/&short-version;/postlfs/editors.html"/> for suggested
       installation instructions.</para>
     </tip>
 
@@ -119,7 +119,7 @@ done</userinput></screen>
     additional libraries to be installed. For more information on this
     process, refer to the Vim documentation and the Vim installation page
     in the BLFS book at <ulink
-    url="&blfs-root;view/svn/postlfs/vim.html"/>.</para>
+    url="&blfs-root;view/&short-version;/postlfs/vim.html"/>.</para>
 
   </sect2>
 
diff --git a/chapter07/locale.xml b/chapter07/locale.xml
index 082c4d2d2..75346eee2 100644
--- a/chapter07/locale.xml
+++ b/chapter07/locale.xml
@@ -147,6 +147,6 @@ EOF</userinput></screen>
 
   <para>UTF-8 based locales are not supported well by many programs.
   Work is in progress to document and, if possible, fix such problems, see
-  <ulink url="&blfs-root;view/svn/introduction/locale-issues.html"/>.</para>
+  <ulink url="&blfs-root;view/&short-version;/introduction/locale-issues.html"/>.</para>
 
 </sect1>
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index 65adcc567..1ee23b9fa 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -24,7 +24,7 @@
     fixable by creating udev rules for custom persistent symlinks.
     The case of network cards is covered separately in
     <xref linkend="ch-scripts-network"/>, and sound card configuration can
-    be found in <ulink url="&blfs-root;view/svn/postlfs/devices.html">BLFS</ulink>.</para>
+    be found in <ulink url="&blfs-root;view/&short-version;/postlfs/devices.html">BLFS</ulink>.</para>
 
     <para>For each of your devices that is likely to have this problem
     (even if the problem doesn't exist in your current Linux distribution),
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 6d68f8605..424c5fc09 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -31,7 +31,7 @@
     already have a boot device, you can create one.  In order for the procedure
     below to work, you need to jump ahead to BLFS and install
     <userinput>xorriso</userinput> from the <ulink
-    url="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libisoburn.html">
+    url="http://www.linuxfromscratch.org/blfs/view/&short-version;/multimedia/libisoburn.html">
     libisoburn</ulink> package.</para>
 
 <screen role="nodump"><userinput>cd /tmp &amp;&amp;
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index c31fc1e4a..6e0413aa7 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -61,7 +61,7 @@
     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"/>.  Additional
+    url="&blfs-root;view/&short-version;/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>
 
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index 2a35b2e45..8d9474853 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -21,42 +21,42 @@
   <itemizedlist>
 
     <listitem><para>A text mode browser such as <ulink
-    url='&blfs-root;/view/svn/basicnet/lynx.html'>Lynx</ulink>
+    url='&blfs-root;/view/&short-version;/basicnet/lynx.html'>Lynx</ulink>
     will allow you to easily view the BLFS book in one virtual terminal, while
     building packages in another.</para></listitem>
 
     <listitem><para>The <ulink
-    url='&blfs-root;/view/svn/general/gpm.html'>GPM</ulink> package will allow
+    url='&blfs-root;/view/&short-version;/general/gpm.html'>GPM</ulink> package will allow
     you to perform copy/paste actions in your virtual
     terminals.</para></listitem>
 
     <listitem><para>If you are in a situation where static IP configuration
     does not meet your networking requirements, installing a package
-    such as <ulink url='&blfs-root;/view/svn/basicnet/dhcpcd.html'>dhcpcd</ulink>
+    such as <ulink url='&blfs-root;/view/&short-version;/basicnet/dhcpcd.html'>dhcpcd</ulink>
     or the client portion of <ulink
-    url='&blfs-root;/view/svn/basicnet/dhcp.html'>dhcp</ulink> may be
+    url='&blfs-root;/view/&short-version;/basicnet/dhcp.html'>dhcp</ulink> may be
     useful.</para></listitem>
 
     <listitem><para>Installing <ulink
-    url='&blfs-root;/view/svn/postlfs/sudo.html'>sudo</ulink> may be useful for
+    url='&blfs-root;/view/&short-version;/postlfs/sudo.html'>sudo</ulink> may be useful for
     building packages as a non-root user and easily installing the resulting
     packages in your new system.  </para></listitem>
 
     <listitem><para>If you want to access your new system from a remote system
     within a comfortable GUI environment, install <ulink
-    url='&blfs-root;/view/svn/postlfs/openssh.html'>openssh</ulink> and its
+    url='&blfs-root;/view/&short-version;/postlfs/openssh.html'>openssh</ulink> and its
     prerequsite, <ulink
-    url='&blfs-root;/view/svn/postlfs/openssl.html'>openssl</ulink>.
+    url='&blfs-root;/view/&short-version;/postlfs/openssl.html'>openssl</ulink>.
     </para></listitem>
 
     <listitem><para>To make fetching files over the internet easier, install
-    <ulink url='&blfs-root;/view/svn/basicnet/wget.html'>wget</ulink>.
+    <ulink url='&blfs-root;/view/&short-version;/basicnet/wget.html'>wget</ulink>.
     </para></listitem>
 
     <listitem><para>If one or more of your disk drives have a GUID partition
     table (GPT), either <ulink
-    url='&blfs-root;/view/svn/postlfs/gptfdisk.html'>gptfdisk</ulink> or <ulink
-    url='&blfs-root;/view/svn/postlfs/parted.html'>parted</ulink> will be useful.
+    url='&blfs-root;/view/&short-version;/postlfs/gptfdisk.html'>gptfdisk</ulink> or <ulink
+    url='&blfs-root;/view/&short-version;/postlfs/parted.html'>parted</ulink> will be useful.
     </para></listitem>
 
     <listitem><para>Finally, a review of the following configuration files
diff --git a/general.ent b/general.ent
index 4708ccb64..bc751620d 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20140731-systemd">
-<!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "July 31, 2014">
+<!ENTITY version         "20140803-systemd">
+<!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
+<!ENTITY releasedate     "August 03, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.6">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->