From 64f65c7a6a14207289ce63dc32e7be0f5135a740 Mon Sep 17 00:00:00 2001
From: Dan Nichilson <dnicholson@linuxfromscratch.org>
Date: Fri, 23 Mar 2007 22:08:26 +0000
Subject: [PATCH] Suppress /usr/include/scsi headers from the kernel

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7974 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml     | 5 +++++
 chapter06/linux-headers.xml | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b98aedb99..5d5e16c6a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2007-03-23</para>
       <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Don't install the kernel headers in
+          <filename class="directory">/usr/include/scsi</filename> as the ones
+          provided by Glibc are preferred.</para>
+        </listitem>
         <listitem>
           <para>[dnicholson] - Force <command>ldd</command> to use
           <command>/bin/bash</command> since it contains Bash-specific
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index 20858d268..b83df0897 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -40,6 +40,13 @@
     by way of sanitizing various C header files that are shipped in the Linux
     kernel source tarball.</para>
 
+    <para>Apply a <command>sed</command> subsitution to suppress the
+    installation of header files in <filename
+    class='directory'>/usr/include/scsi</filename>. The versions provided by
+    Glibc will be used instead:</para>
+
+<screen><userinput>sed -i '/scsi/d' include/Kbuild</userinput></screen>
+
     <para>Install the header files:</para>
 
 <screen><userinput>make mrproper