Current BE-LFS (but w/ GCC 3.3.3) merged -> 6.0 branch

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

4 files changed, 15 insertions, 33 deletions

diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index 01fec81e3..7fcdfa749 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -9,15 +9,8 @@
 <?dbhtml filename="chapter08.html"?>
 
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction.xml"/>
-
-
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fstab.xml"/>
-
-
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kernel.xml"/>
-
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grub.xml"/>
 
-
-
 </chapter>
diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml
index 83b32fbd1..6c8738cc8 100644
--- a/chapter08/fstab.xml
+++ b/chapter08/fstab.xml
@@ -22,6 +22,7 @@ this:</para>
 /dev/xxx      /            fff      defaults        1     1
 /dev/yyy      swap         swap     pri=1           0     0
 proc          /proc        proc     defaults        0     0
+sysfs         /sys         sysfs    defaults        0     0
 devpts        /dev/pts     devpts   gid=4,mode=620  0     0
 shm           /dev/shm     tmpfs    defaults        0     0
 
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index aca02cada..add9baaba 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -92,9 +92,9 @@ timeout 30
 color green/black light-green/black
 
 # The first entry is for LFS.
-title LFS &milestone;
+title LFS &milestone; (Linux &linux-version;)
 root (hd0,3)
-kernel --no-mem-option /boot/lfskernel root=/dev/hda4
+kernel --no-mem-option /boot/lfskernel-&linux-version; root=/dev/hda4
 <userinput>EOF</userinput></screen>
 
 <note><para>By default, Grub will automatically pass a <quote>mem=xxx</quote>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 5ad76a1a4..84f772804 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -56,45 +56,33 @@ scratch.</para>
 <quote>Virtual memory file system support</quote> is enabled. It resides within
 the <quote>File systems</quote> menu and is normally enabled by default.</para>
 
-<para>Verify dependencies and create dependency information files:</para>
+<note><para>NPTL requires the kernel to be compiled with GCC 3.x, in this case
+&gcc-version;. Compiling with 2.95.x is known to cause failures in the glibc
+testsuite, so do <emphasis>not</emphasis> compile the kernel with gcc 2.95.x
+unless you know what you're getting yourself into.</para></note>
 
-<screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc dep</userinput></screen>
+<para>Compile the kernel image and modules:</para>
 
-<para>Compile the kernel image:</para>
-
-<screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc bzImage</userinput></screen>
-
-<para>Compile the drivers which have been configured as modules:</para>
-
-<screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc modules</userinput></screen>
+<screen><userinput>make</userinput></screen>
 
 <para>If you intend to use kernel modules, you will need an
-<filename>/etc/modules.conf</filename> file. Information pertaining
+<filename>/etc/modprobe.conf</filename> file. Information pertaining
 to modules and to kernel configuration in general may be found in the
 kernel documentation, which is found in the
-<filename>linux-2.4.25/Documentation</filename> directory. The
+<filename>linux-&linux-version;/Documentation</filename> directory. The
 modules.conf man page and the kernel HOWTO at
 <ulink url="http://www.tldp.org/HOWTO/Kernel-HOWTO.html"/> may also be of
 interest to you.</para>
 
 <para>Install the modules:</para>
 
-<screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc modules_install</userinput></screen>
+<screen><userinput>make modules_install</userinput></screen>
 
 <para>If you have a lot of modules and very little space, you may want to
 consider stripping and compressing the modules. For most people such compression
 isn't worth the trouble, but if you're really pressed for space, then have a look at
 <ulink url="http://www.linux-mips.org/archives/linux-mips/2002-04/msg00031.html"/>.</para>
 
-<para>As nothing is complete without documentation, build the manual pages
-that come with the kernel:</para>
-
-<screen><userinput>make mandocs</userinput></screen>
-
-<para>And install these pages:</para>
-
-<screen><userinput>cp -a Documentation/man /usr/share/man/man9</userinput></screen>
-
 <para>Kernel compilation has finished but more steps are required to complete
 the installation. Some files need to be copied to the <filename>/boot</filename>
 directory.</para>
@@ -102,21 +90,21 @@ directory.</para>
 <para>The path to the kernel image may vary depending on the platform you're
 using. Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel. It maps
 the function entry points of every function in the kernel API (Application Programming Interface), as well as the
 addresses of the kernel data structures for the running kernel. Issue the
 following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot</userinput></screen>
+<screen><userinput>cp System.map /boot/System.map-&linux-version;</userinput></screen>
 
 <para><filename>.config</filename> is the kernel configuration file that was
 produced by the <command>make menuconfig</command> step above. It contains all
 the config selections for the kernel that was just compiled. It's a good idea
 to keep this file for future reference:</para>
 
-<screen><userinput>cp .config /boot/config-lfskernel</userinput></screen>
+<screen><userinput>cp .config /boot/config-&linux-version;</userinput></screen>
 
 <para>It is important to note that the files in the kernel source directory are
 not owned by <emphasis>root</emphasis>. Whenever you unpack a package as user