Author: jhuntwork
Date: 2007-07-24 19:58:03 -0600 (Tue, 24 Jul 2007)
New Revision: 8247
Modified:
branches/x86_64/BOOK/chapter01/changelog.xml
branches/x86_64/BOOK/chapter05/gcc-pass2.xml
branches/x86_64/BOOK/chapter06/bash.xml
branches/x86_64/BOOK/chapter06/createfiles.xml
branches/x86_64/BOOK/chapter06/db.xml
branches/x86_64/BOOK/chapter06/glibc.xml
branches/x86_64/BOOK/chapter06/man-db.xml
branches/x86_64/BOOK/chapter06/module-init-tools.xml
branches/x86_64/BOOK/chapter06/ncurses.xml
branches/x86_64/BOOK/chapter07/network.xml
branches/x86_64/BOOK/chapter08/grub.xml
branches/x86_64/BOOK/chapter08/kernel.xml
branches/x86_64/BOOK/general.ent
branches/x86_64/BOOK/packages.ent
branches/x86_64/BOOK/stylesheets/dump-commands.xsl
Log:
Merged r8225, r8230, r8231, r8233, r8234, r8235, r8238, r8242 and r8244 from
trunk to x86_64 branch.
Modified: branches/x86_64/BOOK/chapter01/changelog.xml
===================================================================
--- branches/x86_64/BOOK/chapter01/changelog.xml 2007-07-25 00:19:42 UTC
(rev 8246)
+++ branches/x86_64/BOOK/chapter01/changelog.xml 2007-07-25 01:58:03 UTC
(rev 8247)
@@ -36,10 +36,41 @@
</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 && 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>
</itemizedlist>
Modified: branches/x86_64/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- branches/x86_64/BOOK/chapter05/gcc-pass2.xml 2007-07-25 00:19:42 UTC
(rev 8246)
+++ branches/x86_64/BOOK/chapter05/gcc-pass2.xml 2007-07-25 01:58:03 UTC
(rev 8247)
@@ -71,7 +71,7 @@
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} &&
+<screen><userinput>cp -v gcc/Makefile.in{,.orig}
sed '[EMAIL PROTECTED]/[EMAIL PROTECTED] true@' gcc/Makefile.in.orig >
gcc/Makefile.in</userinput></screen>
<para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/>
@@ -80,7 +80,7 @@
<command>sed</command> to use it in order to ensure consistent compiler
builds:</para>
-<screen><userinput>cp -v gcc/Makefile.in{,.tmp} &&
+<screen><userinput>cp -v gcc/Makefile.in{,.tmp}
sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
> gcc/Makefile.in</userinput></screen>
Modified: branches/x86_64/BOOK/chapter06/bash.xml
===================================================================
--- branches/x86_64/BOOK/chapter06/bash.xml 2007-07-25 00:19:42 UTC (rev
8246)
+++ branches/x86_64/BOOK/chapter06/bash.xml 2007-07-25 01:58:03 UTC (rev
8247)
@@ -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 &&
+<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>
Modified: branches/x86_64/BOOK/chapter06/createfiles.xml
===================================================================
--- branches/x86_64/BOOK/chapter06/createfiles.xml 2007-07-25 00:19:42 UTC
(rev 8246)
+++ branches/x86_64/BOOK/chapter06/createfiles.xml 2007-07-25 01:58:03 UTC
(rev 8247)
@@ -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
Modified: branches/x86_64/BOOK/chapter06/db.xml
===================================================================
--- branches/x86_64/BOOK/chapter06/db.xml 2007-07-25 00:19:42 UTC (rev
8246)
+++ branches/x86_64/BOOK/chapter06/db.xml 2007-07-25 01:58:03 UTC (rev
8247)
@@ -62,7 +62,7 @@
<para>Prepare Berkeley DB for compilation:</para>
-<screen><userinput>cd build_unix &&
+<screen><userinput>cd build_unix
../dist/configure --prefix=/usr --enable-compat185
--enable-cxx</userinput></screen>
<variablelist>
Modified: branches/x86_64/BOOK/chapter06/glibc.xml
===================================================================
--- branches/x86_64/BOOK/chapter06/glibc.xml 2007-07-25 00:19:42 UTC (rev
8246)
+++ branches/x86_64/BOOK/chapter06/glibc.xml 2007-07-25 01:58:03 UTC (rev
8247)
@@ -142,7 +142,13 @@
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
fail. The reason is not completely understood, but indications
Modified: branches/x86_64/BOOK/chapter06/man-db.xml
===================================================================
--- branches/x86_64/BOOK/chapter06/man-db.xml 2007-07-25 00:19:42 UTC (rev
8246)
+++ branches/x86_64/BOOK/chapter06/man-db.xml 2007-07-25 01:58:03 UTC (rev
8247)
@@ -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,} &&
-mv man/es{_ES.88591,} &&
-mv man/it{_IT.88591,} &&
-mv man/ja{_JP.eucJP,} &&
+<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 @@
(<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 &&
+<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
Modified: branches/x86_64/BOOK/chapter06/module-init-tools.xml
===================================================================
--- branches/x86_64/BOOK/chapter06/module-init-tools.xml 2007-07-25
00:19:42 UTC (rev 8246)
+++ branches/x86_64/BOOK/chapter06/module-init-tools.xml 2007-07-25
01:58:03 UTC (rev 8247)
@@ -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 &&
-make check &&
+<screen><userinput>./configure
+make check
make distclean</userinput></screen>
<para>Prepare Module-Init-Tools for compilation:</para>
Modified: branches/x86_64/BOOK/chapter06/ncurses.xml
===================================================================
--- branches/x86_64/BOOK/chapter06/ncurses.xml 2007-07-25 00:19:42 UTC (rev
8246)
+++ branches/x86_64/BOOK/chapter06/ncurses.xml 2007-07-25 01:58:03 UTC (rev
8247)
@@ -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)" >/usr/lib/libcursesw.so
&&
-ln -sfv libncurses.so /usr/lib/libcurses.so &&
-ln -sfv libncursesw.a /usr/lib/libcursesw.a &&
+<screen><userinput>rm -vf /usr/lib/libcursesw.so
+echo "INPUT(-lncursesw)" >/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 @@
of some binary-only application, build them with the following
commands:</para>
-<screen role="nodump"><userinput>make distclean &&
+<screen role="nodump"><userinput>make distclean
./configure --prefix=/usr --with-shared --without-normal \
- --without-debug --without-cxx-binding &&
-make sources libs &&
+ --without-debug --without-cxx-binding
+make sources libs
cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
</note>
Modified: branches/x86_64/BOOK/chapter07/network.xml
===================================================================
--- branches/x86_64/BOOK/chapter07/network.xml 2007-07-25 00:19:42 UTC (rev
8246)
+++ branches/x86_64/BOOK/chapter07/network.xml 2007-07-25 01:58:03 UTC (rev
8247)
@@ -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 &&
-mkdir -v ifconfig.eth0 &&
+<screen><userinput>cd /etc/sysconfig/network-devices
+mkdir -v ifconfig.eth0
cat > ifconfig.eth0/ipv4 << "EOF"
<literal>ONBOOT=yes
SERVICE=ipv4-static
Modified: branches/x86_64/BOOK/chapter08/grub.xml
===================================================================
--- branches/x86_64/BOOK/chapter08/grub.xml 2007-07-25 00:19:42 UTC (rev
8246)
+++ branches/x86_64/BOOK/chapter08/grub.xml 2007-07-25 01:58:03 UTC (rev
8247)
@@ -134,7 +134,7 @@
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 &&
+<screen><userinput>mkdir -v /etc/grub
ln -sv /boot/grub/menu.lst /etc/grub</userinput></screen>
</sect1>
Modified: branches/x86_64/BOOK/chapter08/kernel.xml
===================================================================
--- branches/x86_64/BOOK/chapter08/kernel.xml 2007-07-25 00:19:42 UTC (rev
8246)
+++ branches/x86_64/BOOK/chapter08/kernel.xml 2007-07-25 01:58:03 UTC (rev
8247)
@@ -129,7 +129,7 @@
<para>Install the documentation for the Linux kernel:</para>
-<screen><userinput>install -d /usr/share/doc/linux-&linux-version; &&
+<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
Modified: branches/x86_64/BOOK/general.ent
===================================================================
--- branches/x86_64/BOOK/general.ent 2007-07-25 00:19:42 UTC (rev 8246)
+++ branches/x86_64/BOOK/general.ent 2007-07-25 01:58:03 UTC (rev 8247)
@@ -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}]" -->
Modified: branches/x86_64/BOOK/packages.ent
===================================================================
--- branches/x86_64/BOOK/packages.ent 2007-07-25 00:19:42 UTC (rev 8246)
+++ branches/x86_64/BOOK/packages.ent 2007-07-25 01:58:03 UTC (rev 8247)
@@ -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">
Modified: branches/x86_64/BOOK/stylesheets/dump-commands.xsl
===================================================================
--- branches/x86_64/BOOK/stylesheets/dump-commands.xsl 2007-07-25 00:19:42 UTC
(rev 8246)
+++ branches/x86_64/BOOK/stylesheets/dump-commands.xsl 2007-07-25 01:58:03 UTC
(rev 8247)
@@ -6,6 +6,10 @@
<!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
+ <xsl:variable name="newline">
+ <xsl:text>
</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>
</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>
</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>
</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>
</xsl:text>
<xsl:apply-templates/>
- <xsl:text>
</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>
</xsl:text>
</xsl:template>
<xsl:template match="replaceable">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
