From 35cba41039a3f14f1da2ffa19f3079e68a225fcf Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Thu, 24 Sep 2009 19:37:49 +0000
Subject: [PATCH] Update list of headers installed by Linux. Fixes #2495.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 91a855ef4..d2687ef62 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
     <listitem>
       <para>2009-09-24</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Update list of installed headers for Linux.  Thanks to
+          Chris Staub for the patch.  Fixes
+          <ulink url="&lfs-ticket-root;2495">#2495</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Update list of installed programs for various
           packages.  Thanks to Chris Staub for the patch.  Fixes
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index 1a0f291a7..d77cc7c4d 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -71,8 +71,8 @@ cp -rv dest/include/* /usr/include</userinput></screen>
       <seglistitem>
         <seg>/usr/include/asm/*.h, /usr/include/asm-generic/*.h,
         /usr/include/drm/*.h, /usr/include/linux/*.h, /usr/include/mtd/*.h,
-        /usr/include/rdma/*.h, /usr/include/sound/*.h,
-        /usr/include/video/*.h</seg>
+        /usr/include/rdma/*.h, /usr/include/scsi/*.h, /usr/include/sound/*.h,
+        /usr/include/video/*.h, /usr/include/xen/*.h</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -84,82 +84,102 @@ cp -rv dest/include/* /usr/include</userinput></screen>
       <varlistentry id="asm">
         <term><filename class="headerfile">/usr/include/asm/*.h</filename></term>
         <listitem>
-         <para>The Linux API ASM Headers</para>
-         <indexterm zone="ch-system-linux-headers asm">
-          <primary sortas="e-/usr/include/asm/*.h">/usr/include/asm/*.h</primary>
-         </indexterm>
+          <para>The Linux API ASM Headers</para>
+          <indexterm zone="ch-system-linux-headers asm">
+            <primary sortas="e-/usr/include/asm/*.h">/usr/include/asm/*.h</primary>
+          </indexterm>
         </listitem>
-       </varlistentry> 
+      </varlistentry> 
 
       <varlistentry id="asm-generic">
         <term><filename class="headerfile">/usr/include/asm-generic/*.h</filename></term>
         <listitem>
-         <para>The Linux API ASM Generic Headers</para>
-         <indexterm zone="ch-system-linux-headers asm-generic">
-          <primary sortas="e-/usr/include/asm-generic/*.h">/usr/include/asm-generic/*.h</primary>
-         </indexterm>
+          <para>The Linux API ASM Generic Headers</para>
+          <indexterm zone="ch-system-linux-headers asm-generic">
+            <primary sortas="e-/usr/include/asm-generic/*.h">/usr/include/asm-generic/*.h</primary>
+          </indexterm>
         </listitem>
-       </varlistentry> 
+      </varlistentry> 
 
       <varlistentry id="drm">
         <term><filename class="headerfile">/usr/include/drm/*.h</filename></term>
         <listitem>
-         <para>The Linux API DRM Headers</para>
-         <indexterm zone="ch-system-linux-headers drm">
-          <primary sortas="e-/usr/include/drm/*.h">/usr/include/drm/*.h</primary>
-         </indexterm>
+          <para>The Linux API DRM Headers</para>
+          <indexterm zone="ch-system-linux-headers drm">
+            <primary sortas="e-/usr/include/drm/*.h">/usr/include/drm/*.h</primary>
+          </indexterm>
         </listitem>
-       </varlistentry> 
+      </varlistentry> 
 
       <varlistentry id="linux">
         <term><filename class="headerfile">/usr/include/linux/*.h</filename></term>
         <listitem>
-         <para>The Linux API Linux Headers</para>
-         <indexterm zone="ch-system-linux-headers linux">
-          <primary sortas="e-/usr/include/linux/*.h">/usr/include/linux/*.h</primary>
-         </indexterm>
+          <para>The Linux API Linux Headers</para>
+          <indexterm zone="ch-system-linux-headers linux">
+            <primary sortas="e-/usr/include/linux/*.h">/usr/include/linux/*.h</primary>
+          </indexterm>
         </listitem>
-       </varlistentry> 
+      </varlistentry> 
 
       <varlistentry id="mtd">
         <term><filename class="headerfile">/usr/include/mtd/*.h</filename></term>
         <listitem>
-         <para>The Linux API MTD Headers</para>
-         <indexterm zone="ch-system-linux-headers mtd">
-          <primary sortas="e-/usr/include/mtd/*.h">/usr/include/mtd/*.h</primary>
-         </indexterm>
+          <para>The Linux API MTD Headers</para>
+          <indexterm zone="ch-system-linux-headers mtd">
+            <primary sortas="e-/usr/include/mtd/*.h">/usr/include/mtd/*.h</primary>
+          </indexterm>
         </listitem>
-       </varlistentry> 
+      </varlistentry> 
 
       <varlistentry id="rdma">
         <term><filename class="headerfile">/usr/include/rdma/*.h</filename></term>
         <listitem>
-         <para>The Linux API RDMA Headers</para>
-         <indexterm zone="ch-system-linux-headers rdma">
-          <primary sortas="e-/usr/include/rdma/*.h">/usr/include/rdma/*.h</primary>
-         </indexterm>
+          <para>The Linux API RDMA Headers</para>
+          <indexterm zone="ch-system-linux-headers rdma">
+            <primary sortas="e-/usr/include/rdma/*.h">/usr/include/rdma/*.h</primary>
+          </indexterm>
         </listitem>
-       </varlistentry> 
+      </varlistentry> 
+
+      <varlistentry id="scsi">
+        <term><filename class="headerfile">/usr/include/scsi/*.h</filename></term>
+        <listitem>
+          <para>The Linux API SCSI Headers</para>
+          <indexterm zone="ch-system-linux-headers scsi">
+            <primary sortas="e-/usr/include/scsi/*.h">/usr/include/scsi/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry> 
 
       <varlistentry id="sound">
         <term><filename class="headerfile">/usr/include/sound/*.h</filename></term>
         <listitem>
-         <para>The Linux API Sound Headers</para>
-         <indexterm zone="ch-system-linux-headers sound">
-          <primary sortas="e-/usr/include/sound/*.h">/usr/include/sound/*.h</primary>
-         </indexterm>
+          <para>The Linux API Sound Headers</para>
+          <indexterm zone="ch-system-linux-headers sound">
+            <primary sortas="e-/usr/include/sound/*.h">/usr/include/sound/*.h</primary>
+          </indexterm>
         </listitem>
-       </varlistentry> 
+      </varlistentry> 
 
       <varlistentry id="video">
         <term><filename class="headerfile">/usr/include/video/*.h</filename></term>
         <listitem>
-         <para>The Linux API Video Headers</para>
-         <indexterm zone="ch-system-linux-headers video">
-          <primary sortas="e-/usr/include/video/*.h">/usr/include/video/*.h</primary>
-         </indexterm>
+          <para>The Linux API Video Headers</para>
+          <indexterm zone="ch-system-linux-headers video">
+            <primary sortas="e-/usr/include/video/*.h">/usr/include/video/*.h</primary>
+          </indexterm>
         </listitem>
-       </varlistentry> 
+      </varlistentry> 
+
+      <varlistentry id="xen">
+        <term><filename class="headerfile">/usr/include/xen/*.h</filename></term>
+        <listitem>
+          <para>The Linux API Xen Headers</para>
+          <indexterm zone="ch-system-linux-headers xen">
+            <primary sortas="e-/usr/include/xen/*.h">/usr/include/xen/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry> 
 
     </variablelist>