From c4dfd49bf66fb47291e2fc54cfefcf3efb46bdc7 Mon Sep 17 00:00:00 2001
From: Simon Perreault <nomis80@videotron.ca>
Date: Fri, 11 May 2001 03:00:48 +0000
Subject: [PATCH] Copy the kernel include dirs instead of linking to them.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@610 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/kernel-exp.xml  | 15 ++++++---------
 chapter05/kernel-inst.xml | 20 --------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/chapter05/kernel-exp.xml b/chapter05/kernel-exp.xml
index 2155c481b..e2cfb91cb 100644
--- a/chapter05/kernel-exp.xml
+++ b/chapter05/kernel-exp.xml
@@ -27,15 +27,12 @@ needing later on.
 </para>
 
 <para>
-<userinput>ln -s ../src/linux/include/linux</userinput> and
-<userinput>ln -s ../src/linux/include/asm:</userinput> These
-commands create the linux and asm symlinks in the $LFS/usr/include
-directory that point to the proper directories in the Linux source tree.
-Packages that need kernel headers include them with lines like #include
-&lt;linux/errno.h&gt;. These paths are relative to the /usr/include
-directory so the /usr/include/linux link points to the directory
-containing the Linux kernel header files. The same goes for the asm
-symlink.
+<userinput>cp -r ../src/linux/include/linux .</userinput> and
+<userinput>cp -r ../src/linux/include/asm .</userinput>: These
+commands copy the kernel headers in the <filename>$LFS/usr/include</filename>
+directory. For details on why we don't link to these directories (anymore) 
+instead of copying them, please refer to the <filename>README</filename>
+file in the kernel source.
 </para>
 
 </sect2>
diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml
index d641edf92..3b51c15c4 100644
--- a/chapter05/kernel-inst.xml
+++ b/chapter05/kernel-inst.xml
@@ -18,26 +18,6 @@ The kernel configuration file is created by running the following command:
 	<userinput>yes "" | make config &amp;&amp;</userinput>
 	<userinput>make dep &amp;&amp;</userinput>
 	<userinput>cd $LFS/usr/include &amp;&amp;</userinput>
-	<userinput>ln -s ../src/linux/include/linux &amp;&amp;</userinput>
-	<userinput>ln -s ../src/linux/include/asm</userinput>
-</literallayout></blockquote>
-
-</sect2>
-
-<sect2>
-<title>FHS compliance notes</title>
-
-<para>
-According to the FHS, the /usr/include/linux and /usr/include/asm should be
-actual directories, not symbolic links to the ones belonging to the current
-kernel. The major advantage is that programs will compile with the headers glibc
-was compiled with, and this may prevent some compiling hell. Until now, in all
-of LFS' history, no compiling problem has been reported by using symlinks. So if
-you're tight on space, we recommend using symlinks. But if you want to be FHS
-compliant, replace the two last lines from the commands above with those:
-</para>
-
-<blockquote><literallayout>
 	<userinput>cp -r ../src/linux/include/linux . &amp;&amp;</userinput>
 	<userinput>cp -r ../src/linux/include/asm .</userinput>
 </literallayout></blockquote>