Merged r8225, r8230, r8231, r8233, r8234, r8235, r8238, r8242 and r8244 from trunk to x86_64 branch.

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

chapter01/changelog.xml

@@ -36,9 +36,40 @@
     </listitem>
 -->
 
+
+    <listitem>
+      <para>2007-07-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Fix the Ncurses' library install to remove a
+          symbolic link before writing a linker script to that location.
+          Reported by Lieven De Keyzer.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Created LFS 6.3-rc-1.</para>
+        </listitem>
+        <listitem>
+          <para>[dnicholson] - Remove inconsistent uses of &amp;&amp; from
+          the book.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2007-07-23</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Man-Pages-2.63, fixes
+          <ulink url="&lfs-ticket-root;2050">#2050</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dnicholson] - Added `echo' to the Essential Symlinks section
+          as it is needed for the Glibc testsuite.</para>
+        </listitem>
+        <listitem>
+          <para>[dnicholson] - Added a known failing test to the Ch. 6 Glibc
+          page.</para>
+        </listitem>
         <listitem>
           <para>[jhuntwork] - Initial changes to build x86_64 natively.</para>
         </listitem>

chapter05/gcc-pass2.xml

@@ -71,7 +71,7 @@ Ask your system administrator to create more.</computeroutput></screen>
     directory. The running of the <command>fixincludes</command> script can
     be suppressed by issuing the following commands:</para>
 
-<screen><userinput>cp -v gcc/Makefile.in{,.orig} &amp;&amp;
+<screen><userinput>cp -v gcc/Makefile.in{,.orig}
 sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
 
     <para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/>
@@ -80,7 +80,7 @@ sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userin
     <command>sed</command> to use it in order to ensure consistent compiler
     builds:</para>
 
-<screen><userinput>cp -v gcc/Makefile.in{,.tmp} &amp;&amp;
+<screen><userinput>cp -v gcc/Makefile.in{,.tmp}
 sed 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in.tmp \
   &gt; gcc/Makefile.in</userinput></screen>
 

chapter06/bash.xml

@@ -37,7 +37,7 @@
     <para>If you downloaded the Bash documentation tarball and wish to install
     HTML documentation, issue the following commands:</para>
 
-<screen><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz &amp;&amp;
+<screen><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz
 sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     Makefile.in</userinput></screen>
 

chapter06/createfiles.xml

@@ -39,7 +39,7 @@
   replaced by real files throughout the course of this chapter after the software
   has been installed:</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} /bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
 ln -sv /tools/bin/perl /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
 ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib

chapter06/db.xml

@@ -62,7 +62,7 @@
 
     <para>Prepare Berkeley DB for compilation:</para>
 
-<screen><userinput>cd build_unix &amp;&amp;
+<screen><userinput>cd build_unix
 ../dist/configure --prefix=/usr --enable-compat185 --enable-cxx</userinput></screen>
 
     <variablelist>

chapter06/glibc.xml

@@ -142,6 +142,12 @@ grep Error glibc-check-log</userinput></screen>
     common issues:</para>
 
     <itemizedlist>
+      <!-- Check again after updating from gcc-4.1.x -->
+      <listitem>
+        <para>The <emphasis>nptl/tst-cancel1</emphasis> test will fail when
+        using the 4.1 series of GCC.</para>
+      </listitem>
+      <!-- Was true in glibc-2.3.6 -->
       <listitem>
         <para>The <emphasis>nptl/tst-clock2</emphasis> and
         <emphasis>tst-attr3</emphasis> tests sometimes

chapter06/man-db.xml

@@ -41,10 +41,10 @@
     with Man-DB, in order for them to be accessible in both traditional and
     UTF-8 locales:</para>
 
-<screen><userinput>mv man/de{_DE.88591,} &amp;&amp;
-mv man/es{_ES.88591,} &amp;&amp;
-mv man/it{_IT.88591,} &amp;&amp;
-mv man/ja{_JP.eucJP,} &amp;&amp;
+<screen><userinput>mv man/de{_DE.88591,}
+mv man/es{_ES.88591,}
+mv man/it{_IT.88591,}
+mv man/ja{_JP.eucJP,}
 sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen>
 
     <para>The second change is a <command>sed</command> substitution to delete
@@ -298,7 +298,7 @@ install -m755 convert-mans  /usr/bin</userinput></screen>
     (<ulink url="http://ccb.club.fr/man/man-fr-1.58.0.tar.bz2"/>) can be
     installed with the following command:</para>
 
-<screen role="nodump"><userinput>mkdir -p /usr/share/man/fr &amp;&amp;
+<screen role="nodump"><userinput>mkdir -p /usr/share/man/fr
 cp -rv man? /usr/share/man/fr</userinput></screen>
 
     <para>If upstream distributes manual pages in UTF-8 (i.e., <quote>for

chapter06/module-init-tools.xml

@@ -44,8 +44,8 @@
     <command>make distclean</command> command is required to clean up the source
     tree, as the source gets recompiled as part of the testing process):</para>
 
-<screen><userinput>./configure &amp;&amp;
-make check &amp;&amp;
+<screen><userinput>./configure
+make check
 make distclean</userinput></screen>
 
     <para>Prepare Module-Init-Tools for compilation:</para>

chapter06/ncurses.xml

@@ -121,16 +121,17 @@
     rm -vf /usr/lib/lib${lib}.so ; \
     echo "INPUT(-l${lib}w)" >/usr/lib/lib${lib}.so ; \
     ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \
-done &&
+done
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen>
 
     <para>Finally, make sure that old applications that look for
     <filename class="libraryfile">-lcurses</filename> at build time are still
     buildable:</para>
 
-<screen><userinput>echo "INPUT(-lncursesw)" &gt;/usr/lib/libcursesw.so &amp;&amp;
-ln -sfv libncurses.so /usr/lib/libcurses.so &amp;&amp;
-ln -sfv libncursesw.a /usr/lib/libcursesw.a &amp;&amp;
+<screen><userinput>rm -vf /usr/lib/libcursesw.so
+echo "INPUT(-lncursesw)" &gt;/usr/lib/libcursesw.so
+ln -sfv libncurses.so /usr/lib/libcurses.so
+ln -sfv libncursesw.a /usr/lib/libcursesw.a
 ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen>
 
     <note>
@@ -140,10 +141,10 @@ ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen>
       of some binary-only application, build them with the following
       commands:</para>
 
-<screen role="nodump"><userinput>make distclean &amp;&amp;
+<screen role="nodump"><userinput>make distclean
 ./configure --prefix=/usr --with-shared --without-normal \
-  --without-debug --without-cxx-binding &amp;&amp;
-make sources libs &amp;&amp;
+  --without-debug --without-cxx-binding
+make sources libs
 cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
     </note>
 

chapter07/network.xml

@@ -109,8 +109,8 @@
     <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;
+<screen><userinput>cd /etc/sysconfig/network-devices
+mkdir -v ifconfig.eth0
 cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF"
 <literal>ONBOOT=yes
 SERVICE=ipv4-static

chapter08/grub.xml

@@ -134,7 +134,7 @@ EOF</userinput></screen>
   be symlinked to <filename class="symlink">/etc/grub/menu.lst</filename>. To
   satisfy this requirement, issue the following command:</para>
 
-<screen><userinput>mkdir -v /etc/grub &amp;&amp;
+<screen><userinput>mkdir -v /etc/grub
 ln -sv /boot/grub/menu.lst /etc/grub</userinput></screen>
 
 </sect1>

chapter08/kernel.xml

@@ -129,7 +129,7 @@
 
     <para>Install the documentation for the Linux kernel:</para>
 
-<screen><userinput>install -d /usr/share/doc/linux-&linux-version; &amp;&amp;
+<screen><userinput>install -d /usr/share/doc/linux-&linux-version;
 cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen>
 
     <para>It is important to note that the files in the kernel source

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-x86_64-20070723">
-<!ENTITY releasedate "July 23, 2007">
+<!ENTITY version "SVN-x86_64-20070724">
+<!ENTITY releasedate "July 24, 2007">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 

packages.ent

@@ -341,12 +341,12 @@
 <!ENTITY man-db-ch6-du "9 MB">
 <!ENTITY man-db-ch6-sbu "0.2 SBU">
 
-<!ENTITY man-pages-version "2.62">
-<!ENTITY man-pages-size "1,787 KB">
+<!ENTITY man-pages-version "2.63">
+<!ENTITY man-pages-size "1,795 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/manpages/Archive/man-pages-&man-pages-version;.tar.bz2">
-<!ENTITY man-pages-md5 "6fe86c312d8091c6b42ffda923938f84">
+<!ENTITY man-pages-md5 "aeddbf93dbb0aeac1c8ad950e80aad54">
 <!ENTITY man-pages-home " ">
-<!ENTITY man-pages-ch6-du "36.9 MB">
+<!ENTITY man-pages-ch6-du "37.4 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY mktemp-version "1.5">

stylesheets/dump-commands.xsl

@@ -6,6 +6,10 @@
 
 <!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
 
+  <xsl:variable name="newline">
+    <xsl:text>&#xA;</xsl:text>
+  </xsl:variable>
+
   <xsl:template match="/">
     <xsl:apply-templates select="//sect1"/>
   </xsl:template>
@@ -47,31 +51,31 @@
     <xsl:if test="child::* = userinput">
       <xsl:choose>
         <xsl:when test="@role = 'root'">
-          <xsl:text>&#xA;</xsl:text>
           <xsl:text># Run this as root</xsl:text>
+          <xsl:value-of select="$newline"/>
           <xsl:apply-templates select="userinput"/>
           <xsl:text># End root commands</xsl:text>
-          <xsl:text>&#xA;</xsl:text>
+          <xsl:value-of select="$newline"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:apply-templates select="userinput"/>
         </xsl:otherwise>
       </xsl:choose>
+      <xsl:value-of select="$newline"/>
     </xsl:if>
   </xsl:template>
 
   <xsl:template match="userinput">
-    <xsl:text>&#xA;</xsl:text>
     <xsl:if test=".//replaceable">
       <xsl:text># This block must be edited to suit your needs.</xsl:text>
+      <xsl:value-of select="$newline"/>
     </xsl:if>
-    <xsl:text>&#xA;</xsl:text>
     <xsl:apply-templates/>
-    <xsl:text>&#xA;</xsl:text>
+    <xsl:value-of select="$newline"/>
     <xsl:if test=".//replaceable">
       <xsl:text># End of editable block.</xsl:text>
+      <xsl:value-of select="$newline"/>
     </xsl:if>
-    <xsl:text>&#xA;</xsl:text>
   </xsl:template>
 
   <xsl:template match="replaceable">