Committing current BE-LFS to head.

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

8 files changed, 11 insertions, 11 deletions

diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 8ce43a01e..c1d011a13 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -25,7 +25,7 @@ GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
 way it is expected at times. Fix this behavior with the following
 patch:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch</userinput></screen>
 
 <para>Now prepare Bash for compilation:</para>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index eb168cb61..73e4cab92 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -38,7 +38,7 @@ compilers. Instructions for building these can be found at
 <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
 the Specs patch) also used in the previous chapter:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch</userinput></screen>
 
 <para>Now apply a sed substitution that will suppress the installation of
 <filename>libiberty.a</filename>. We want to use the version of
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 6ef16b16f..eb61c553c 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -25,7 +25,7 @@ Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
 <para>Inetutils has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel-2.6-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel-headers-1.patch</userinput></screen>
 
 <para>We are not going to install all the programs that come with Inetutils.
 However, the Inetutils build system will insist on installing all the man
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 37ec8c8e9..a1cf37193 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -28,7 +28,7 @@ Glibc, Grep, Make, Sed.</para>
 of Groff. In particular, man pages will now display using the full terminal
 width instead of being limited to 80 characters:</para>
 
-<screen><userinput>patch -Np1 -i ../man-&man-version;-80cols.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../man-&man-version;-80cols-1.patch</userinput></screen>
 
 <para>The second is a sed substitution to add the <emphasis>-R</emphasis>
 switch to the <emphasis>PAGER</emphasis> variable so that escape sequences are
diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml
index d63b2f4b4..98864daa5 100644
--- a/chapter06/net-tools.xml
+++ b/chapter06/net-tools.xml
@@ -32,15 +32,15 @@ to actually enable these protocols in the kernel -- what you do here is merely
 telling the package to include support for those protocols in its programs,
 but it's up to the kernel to make the protocols available.</para>
 
-<para>First fix a small syntax problem in the sources of the
-<command>mii-tool</command> program:</para>
+<para>This package also has issues with being compiled by GCC 3.4, which we
+fix by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-miitool-gcc33-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-gcc34-2.patch</userinput></screen>
 
 <para>Net-tools has issues with the Linux 2.6 kernel series - fix these issues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-kernel-2.6-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-kernel-headers-1.patch</userinput></screen>
 
 <para>Now prepare Net-tools for compilation (if you intend to accept the
 defaults, you can skip all the questions by running <userinput>yes "" |
diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml
index 48efb8805..e4c8c46a6 100644
--- a/chapter06/readjusting.xml
+++ b/chapter06/readjusting.xml
@@ -52,7 +52,7 @@ this:</para>
 
 <!-- Ampersands are needed to allow cut and paste -->
 
-<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs &amp;&amp;
+<screen><userinput>SPECFILE=/tools/lib/gcc/*/*/specs &amp;&amp;
 sed -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g' \
     $SPECFILE &gt; newspecfile &amp;&amp;
 mv -f newspecfile $SPECFILE &amp;&amp;
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index c9eac3bdf..3820bb7f3 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -24,7 +24,7 @@ as those given by the kernel when unusual things happen.</para>
 <para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_header.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel-headers-1.patch</userinput></screen>
 
 <para>Compile Sysklogd:</para>
 
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index b0d5ca805..8695e36ab 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -42,7 +42,7 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel-dj-2.6-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>