r1440 - / trunk/BOOK trunk/BOOK/cross-tools/alpha trunk/BOOK/cross-tools/mips trunk/BOOK/cross-tools/ppc trunk/BOOK/cross-tools/ppc64 trunk/BOOK/cross-tools/sparc trunk/BOOK/cross-tools/sparc64 trunk/BOOK/cross-tools/sparc64-64 trunk/BOOK/cross-tools/x86 trunk/BOOK/cross-tools/x86_64 trunk/BOOK/cross-tools/x86_64-64 trunk/BOOK/final-system/alpha trunk/BOOK/final-system/mips trunk/BOOK/final-system/ppc trunk/BOOK/final-system/ppc64 trunk/BOOK/final-system/sparc trunk/BOOK/final-system/sparc64 trunk/BOOK/final-system/sparc64-64 trunk/BOOK/final-system/x86 trunk/BOOK/final-system/x86_64 trunk/BOOK/final-system/x86_64-64 trunk/BOOK/introduction/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Apr 20 09:10:01 PDT 2006


Author: jim
Date: 2006-04-20 10:09:57 -0600 (Thu, 20 Apr 2006)
New Revision: 1440

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/cross-tools/alpha/linux-headers.xml
   trunk/BOOK/cross-tools/mips/linux-headers.xml
   trunk/BOOK/cross-tools/ppc/linux-headers.xml
   trunk/BOOK/cross-tools/ppc64/linux-headers.xml
   trunk/BOOK/cross-tools/sparc/linux-headers.xml
   trunk/BOOK/cross-tools/sparc64-64/linux-headers.xml
   trunk/BOOK/cross-tools/sparc64/linux-headers.xml
   trunk/BOOK/cross-tools/x86/linux-headers.xml
   trunk/BOOK/cross-tools/x86_64-64/linux-headers.xml
   trunk/BOOK/cross-tools/x86_64/linux-headers.xml
   trunk/BOOK/final-system/alpha/linux-headers.xml
   trunk/BOOK/final-system/mips/linux-headers.xml
   trunk/BOOK/final-system/ppc/linux-headers.xml
   trunk/BOOK/final-system/ppc64/linux-headers.xml
   trunk/BOOK/final-system/sparc/linux-headers.xml
   trunk/BOOK/final-system/sparc64-64/linux-headers.xml
   trunk/BOOK/final-system/sparc64/linux-headers.xml
   trunk/BOOK/final-system/x86/linux-headers.xml
   trunk/BOOK/final-system/x86_64-64/linux-headers.xml
   trunk/BOOK/final-system/x86_64/linux-headers.xml
   trunk/BOOK/introduction/common/acknowledgements.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
 r3052 at server (orig r1446):  jim | 2006-04-20 08:57:18 -0700
  r3049 at server:  jim | 2006-04-20 08:55:10 -0700
  Fixed linux-headers. Added missing copy of asm-generic.
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1445
   + b6734a72-470d-0410-b049-f317dca95413:/:1446


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3048
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3049
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/cross-tools/alpha/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/alpha/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/alpha/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -23,11 +23,12 @@
     <title>Installation of Linux-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-alpha /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/mips/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/mips/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/mips/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -23,11 +23,12 @@
     <title>Installation of Linux-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-mips /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/ppc/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/ppc/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -23,11 +23,12 @@
     <title>Installation of Linux-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-ppc /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/ppc64/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/ppc64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -23,11 +23,12 @@
     <title>Installation of Linux-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc64/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
-cp -Rv include/asm-powerpc /tools/include/
+cp -Rv include/asm-powerpc /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/sparc/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/sparc/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -23,11 +23,12 @@
     <title>Installation of Linux-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-sparc /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/sparc64/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/sparc64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -23,13 +23,14 @@
     <title>Installation of Linux-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc64/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-sparc64 /tools/include/
 cp -Rv include/asm-sparc /tools/include/
 cp -Rv include/asm-sparc-biarch /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/sparc64-64/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64-64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/sparc64-64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -23,11 +23,12 @@
     <title>Installation of Linux-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-sparc64 /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/x86/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/x86/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -22,12 +22,11 @@
   <sect2 role="installation">
     <title>Installation of Linux-Headers</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+<para os="a">Install the header files that are needed for the base build:</para>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-i386 /tools/include/asm
+cp -Rv include/asm-generic /tools/include/asm-generic
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/x86_64/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/x86_64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -23,13 +23,14 @@
     <title>Installation of Linux-Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-i386 /tools/include/
 cp -Rv include/asm-x86_64 /tools/include/
 cp -Rv include/asm-x86_64-biarch /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/cross-tools/x86_64-64/linux-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64-64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/cross-tools/x86_64-64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -22,12 +22,13 @@
   <sect2 role="installation">
     <title>Installation of Linux-Headers</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/linux-headers.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -dv /tools/include
 cp -Rv include/asm-x86_64 /tools/include/asm
+cp -Rv include/asm-generic /tools/include
 cp -Rv include/linux /tools/include</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/final-system/alpha/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/alpha/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/alpha/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,14 +29,6 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
-cp -av include/asm-alpha/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -ar include/sound/* /usr/include/sound</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -45,6 +37,8 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+<screen><userinput>cp -av include/asm-alpha/* /usr/include/asm</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -53,6 +47,14 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/mips/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/mips/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/mips/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,14 +29,6 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="mf"><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
-cp -av include/asm-mips/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -ar include/sound/* /usr/include/sound</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -45,6 +37,8 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+<screen><userinput>cp -av include/asm-mips/* /usr/include/asm</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -53,6 +47,14 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/ppc/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/ppc/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/ppc/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,14 +29,6 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
-cp -av include/asm-ppc/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -ar include/sound/* /usr/include/sound</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -45,6 +37,8 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+<screen><userinput>cp -av include/asm-ppc/* /usr/include/asm</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -53,6 +47,14 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/ppc64/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/ppc64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/ppc64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,14 +29,6 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
-cp -av include/asm-powerpc/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -ar include/sound/* /usr/include/sound</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -45,6 +37,8 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+<screen><userinput>cp -av include/asm-powerpc/* /usr/include/asm</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -53,6 +47,14 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/sparc/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/sparc/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,14 +29,6 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
-cp -av include/asm-sparc/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -ar include/sound/* /usr/include/sound</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -45,6 +37,8 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+<screen><userinput>cp -av include/asm-sparc/* /usr/include/asm</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -53,6 +47,14 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/sparc64/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/sparc64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,29 +29,31 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -dv /usr/include/{asm,asm-sparc64,asm-sparc,linux,mtd,net,scsi,sound}
-cp -av include/asm-sparc64/* /usr/include/asm-sparc64
-cp -av include/asm-sparc/* /usr/include/asm-sparc
-cp -av include/asm-sparc-biarch/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -av include/sound/* /usr/include/sound</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
+<screen><userinput>install -dv /usr/include/{asm-sparc64,asm-sparc}
+cp -av include/asm-sparc64/* /usr/include/asm-sparc64
+cp -av include/asm-sparc/* /usr/include/asm-sparc</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>find /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi} -type d -exec chmod -v 755 {} \;
-find /usr/include/{asm,asm-sparc,asm-sparc64,linux,mtd,scsi} -type f -exec chmod -v 644 {} \;</userinput></screen>
+<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-generic,asm-sparc,asm-sparc64,linux,mtd,scsi}</userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen><userinput>find /usr/include/{asm,asm-generic,asm-sparc,asm-sparc64,linux,mtd,scsi} -type d -exec chmod -v 755 {} \;
+find /usr/include/{asm,asm-generic,asm-sparc,asm-sparc64,linux,mtd,scsi} -type f -exec chmod -v 644 {} \;</userinput></screen>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/sparc64-64/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/sparc64-64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,14 +29,6 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,net,scsi,sound}
-cp -av include/asm-sparc64/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -av include/sound/* /usr/include/sound</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -45,6 +37,8 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+<screen><userinput>cp -av include/asm-sparc64/* /usr/include/asm</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -53,6 +47,14 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/x86/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/x86/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/x86/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -43,25 +43,29 @@
     decided to come up with our own santized headers and placed them in
     the book.</para>
 
-    <para os="b">Install the header files:</para>
+    <para os="b">Install the header files that are common to all architectures:</para>
 
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-i386/* /usr/include/asm
+<screen os="c"><userinput>install -dv /usr/include/{asm,asm-generic,linux,net,mtd,scsi,sound}
+cp -av include/asm-generic/* /usr/include/asm-generic
 cp -av include/linux/* /usr/include/linux
 cp -av include/mtd/* /usr/include/mtd
 cp -av include/net/* /usr/include/net
 cp -av include/scsi/* /usr/include/scsi
 cp -av include/sound/* /usr/include/sound</userinput></screen>
 
-    <para os="c">Ensure that all the headers are owned by
+    <para os="d">Install the header files that are specific to this architecture:</para>
+
+<screen><userinput>cp -av include/asm-i386/* /usr/include/asm</userinput></screen>
+
+    <para os="e">Ensure that all the headers are owned by
     <systemitem class="username">root</systemitem>:</para>
 
-<screen os="d"><userinput>chown -Rv root:root /usr/include/{asm,linux,mtd,net,scsi,sound}</userinput></screen>
+<screen os="f"><userinput>chown -Rv root:root /usr/include/{asm,linux,mtd,net,scsi,sound}</userinput></screen>
 
-    <para os="e">Make sure the users can read the headers:</para>
+    <para os="g">Make sure the users can read the headers:</para>
 
-<screen os="f"><userinput>find /usr/include/{asm,linux,mtd,net,scsi,sound} -type d -exec chmod -v 755 {} \;
-find /usr/include/{asm,linux,mtd,net,scsi,sound} -type f -exec chmod -v 644 {} \;</userinput></screen>
+<screen os="h"><userinput>find /usr/include/{asm,asm-generic-linux,mtd,net,scsi,sound} -type d -exec chmod -v 755 {} \;
+find /usr/include/{asm,asm-generic,linux,mtd,net,scsi,sound} -type f -exec chmod -v 644 {} \;</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/x86_64/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/x86_64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/x86_64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,28 +29,31 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -dv /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound}
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen><userinput>install -dv /usr/include/{asm-i386,asm-x86_64}
 cp -av include/asm-i386/* /usr/include/asm-i386
 cp -av include/asm-x86_64/* /usr/include/asm-x86_64
-cp -av include/asm-x86_64-biarch/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -av include/sound/* /usr/include/sound</userinput></screen>
+cp -av include/asm-x86_64-biarch/* /usr/include/asm</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound}</userinput></screen>
+<screen><userinput>chown -Rv root:root /usr/include/{asm,asm-generic,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound} -type d -exec chmod -v 755 {} \;
-find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound} -type f -exec chmod -v 644 {} \;</userinput></screen>
+<screen><userinput>find /usr/include/{asm,asm-generic,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound} -type d -exec chmod -v 755 {} \;
+find /usr/include/{asm,asm-generic,asm-i386,asm-x86_64,linux,mtd,net,scsi,sound} -type f -exec chmod -v 644 {} \;</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/x86_64-64/linux-headers.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/linux-headers.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/final-system/x86_64-64/linux-headers.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -29,14 +29,6 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
-cp -av include/asm-x86_64/* /usr/include/asm
-cp -av include/linux/* /usr/include/linux
-cp -av include/mtd/* /usr/include/mtd
-cp -av include/net/* /usr/include/net
-cp -av include/scsi/* /usr/include/scsi
-cp -av include/sound/* /usr/include/sound</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -45,6 +37,8 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+<screen><userinput>cp -av include/asm-x86_64/* /usr/include/asm</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -53,6 +47,14 @@
     href="../x86/linux-headers.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/linux-headers.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/introduction/common/acknowledgements.xml
===================================================================
--- trunk/BOOK/introduction/common/acknowledgements.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/introduction/common/acknowledgements.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -62,6 +62,15 @@
     <listitem>
       <para>Chris Staub - Text updates and Typos</para>
     </listitem>
+    <listitem>
+      <para>William Zhou - Text updates and Typos</para>
+    </listitem>
+    <listitem>
+      <para>Theo Schneider - Testing of the Linux Headers Package</para>
+    </listitem>
+    <listitem>
+      <para>Jürg Billeter - Testing and Developing of the Linux Headers Package</para>
+    </listitem>
   </itemizedlist>
 
   <para>Thank you all for your support.</para>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-04-20 16:09:50 UTC (rev 1439)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-04-20 16:09:57 UTC (rev 1440)
@@ -37,6 +37,15 @@
 -->
 
     <listitem>
+      <para>April 20, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added missing asm-generic copy to Linux-Headers.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 19, 2006</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list