From c58b9c35af27b304c594d459aab2f74da1eeb6f8 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Sun, 17 Mar 2002 01:45:02 +0000
Subject: [PATCH] undo last change

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1722 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml   | 10 ----------
 chapter05/kernel-exp.xml  | 25 +++++++++++++++++++++----
 chapter05/kernel-inst.xml |  5 +++--
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 47cbc05b4..9a97ecace 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -33,16 +33,6 @@
 
 </para></listitem>
 
-<listitem><para>March 16th, 2002 [gerard]: Chapter 05 - Kernel: Shortened
-the commands by removing <userinput>make mrproper</userinput>,
-<userinput>make config</userinput>, and <userinput>make dep</userinput>.
-Instead we just create the missing <filename>version.h</filename> and
-<filename class="symlink">asm</filename> symlink and copy the headers to
-<filename class="directory">$LFS/usr/include</filename>. We don't need the
-kernel tree itself setup until chapter 8 where we would re-run the removed
-commands anyways, so it's just a waste of time to do it in chapter
-5.</para></listitem>
-
 <listitem><para>March 16th, 2002 [gerard]: Chapter 06+Appendix A: Removed
 the chroot dependencies. It's not a package so it's a bit out of
 place.</para></listitem>
diff --git a/chapter05/kernel-exp.xml b/chapter05/kernel-exp.xml
index b7e29a79f..497b454c0 100644
--- a/chapter05/kernel-exp.xml
+++ b/chapter05/kernel-exp.xml
@@ -1,10 +1,27 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>make include/linux/version.h</userinput> and
-<userinput>make symlinks</userinput>: This creates the
-<filename>include/linux/version.h</filename> file and the <filename
-class="symlink">include/asm</filename> symlink.</para>
+<para><userinput>make mrproper:</userinput> This will ensure that the kernel
+tree is absolutely clean.  We do this because the kernel team recommend
+that this is done prior to <emphasis>each</emphasis> kernel compilation,
+and that we shouldn't rely on the source tree being automatically clean
+after untarring.</para>
+
+<para><userinput>yes "" | make config:</userinput> This runs make config and
+answers with the default answer to every question the config script asks 
+the user (it does this by simply doing the equivalent of hitting the
+Enter key, thus accepting the default Y and N answers to the questions). 
+We're not configuring the real kernel here, we just need to have some sort 
+of configure file created so that we can run make dep next that will 
+create a few header files in <filename>include/linux</filename>, like
+version.h, among others, that we will need to compile Glibc and other
+packages later in chroot.</para>
+
+<para><userinput>make dep:</userinput> make dep checks dependencies and sets
+up the dependencies file. We don't really care about the dependency
+checks, but what we do care about is that make dep creates those
+aforementioned files in <filename>include/linux</filename> we will be
+needing later on.</para>
 
 <para><userinput>mkdir $LFS/usr/include/asm</userinput>
 and <userinput>cp include/asm/* $LFS/usr/include/asm</userinput>:
diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml
index db6e0d042..9cd6d99d1 100644
--- a/chapter05/kernel-inst.xml
+++ b/chapter05/kernel-inst.xml
@@ -10,8 +10,9 @@ compile the packages that need the kernel.</para>
 <para>The kernel configuration file is created by running the following 
 command:</para>
 
-<para><screen><userinput>make include/linux/version.h &amp;&amp;
-make symlinks &amp;&amp;
+<para><screen><userinput>make mrproper &amp;&amp;
+yes "" | make config &amp;&amp;
+make dep &amp;&amp;
 mkdir $LFS/usr/include/asm &amp;&amp;
 cp include/asm/* $LFS/usr/include/asm &amp;&amp;
 cp -R include/linux $LFS/usr/include</userinput></screen></para>