r967 - in trunk/BOOK: . boot/alpha boot/mips boot/mips64 boot/ppc boot/sparc boot/sparc64 boot/x86 boot/x86_64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Dec 27 14:23:22 PST 2005


Author: jim
Date: 2005-12-27 15:23:21 -0700 (Tue, 27 Dec 2005)
New Revision: 967

Modified:
   trunk/BOOK/
   trunk/BOOK/boot/alpha/kernel.xml
   trunk/BOOK/boot/mips/kernel.xml
   trunk/BOOK/boot/mips64/kernel.xml
   trunk/BOOK/boot/ppc/kernel.xml
   trunk/BOOK/boot/sparc/kernel.xml
   trunk/BOOK/boot/sparc64/kernel.xml
   trunk/BOOK/boot/x86/kernel.xml
   trunk/BOOK/boot/x86_64/kernel.xml
Log:
 r1205 at server:  jim | 2005-12-27 14:22:28 -0800
 Fixed Kernel Pages in Boot Section. Thank you Chris Staub



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1204
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1205
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/alpha/kernel.xml
===================================================================
--- trunk/BOOK/boot/alpha/kernel.xml	2005-12-27 22:23:14 UTC (rev 966)
+++ trunk/BOOK/boot/alpha/kernel.xml	2005-12-27 22:23:21 UTC (rev 967)
@@ -27,19 +27,19 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -47,11 +47,11 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,11 +69,11 @@
 <screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -83,32 +83,40 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
 <screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/mips/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips/kernel.xml	2005-12-27 22:23:14 UTC (rev 966)
+++ trunk/BOOK/boot/mips/kernel.xml	2005-12-27 22:23:21 UTC (rev 967)
@@ -43,19 +43,19 @@
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -63,11 +63,11 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -85,11 +85,11 @@
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -99,33 +99,41 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET)- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
 <screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-version;
 gzip -9 ${LFS}/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/mips64/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips64/kernel.xml	2005-12-27 22:23:14 UTC (rev 966)
+++ trunk/BOOK/boot/mips64/kernel.xml	2005-12-27 22:23:21 UTC (rev 967)
@@ -43,23 +43,23 @@
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/kernel.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
+    xpointer="xpointer(//*[@os='m1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -67,11 +67,11 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -89,11 +89,11 @@
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -103,33 +103,41 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
 <screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-version;
 gzip -9 ${LFS}/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/ppc/kernel.xml
===================================================================
--- trunk/BOOK/boot/ppc/kernel.xml	2005-12-27 22:23:14 UTC (rev 966)
+++ trunk/BOOK/boot/ppc/kernel.xml	2005-12-27 22:23:21 UTC (rev 967)
@@ -27,19 +27,19 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -47,11 +47,11 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,11 +69,11 @@
 <screen><userinput>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -83,32 +83,40 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
 <screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/kernel.xml"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/sparc/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc/kernel.xml	2005-12-27 22:23:14 UTC (rev 966)
+++ trunk/BOOK/boot/sparc/kernel.xml	2005-12-27 22:23:21 UTC (rev 967)
@@ -27,19 +27,19 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -47,11 +47,11 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,11 +69,11 @@
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -83,32 +83,40 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
 <screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/sparc64/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc64/kernel.xml	2005-12-27 22:23:14 UTC (rev 966)
+++ trunk/BOOK/boot/sparc64/kernel.xml	2005-12-27 22:23:21 UTC (rev 967)
@@ -27,21 +27,21 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/kernel.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
+    xpointer="xpointer(//*[@os='m1'])"/>
 
 <screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,11 +49,11 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -71,11 +71,11 @@
 <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -85,32 +85,40 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make INSTALL_MOD_PATH=${LFS} ARCH=sparc64 \
    CROSS_COMPILE=${LFS_TARGET}- modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
 <screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc/kernel.xml"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/x86/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86/kernel.xml	2005-12-27 22:23:14 UTC (rev 966)
+++ trunk/BOOK/boot/x86/kernel.xml	2005-12-27 22:23:21 UTC (rev 967)
@@ -116,9 +116,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+<screen os="w1"><userinput>cp System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen os="x1"><userinput>cp System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp .config ${LFS}/boot/config-&linux-version;</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/x86_64/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86_64/kernel.xml	2005-12-27 22:23:14 UTC (rev 966)
+++ trunk/BOOK/boot/x86_64/kernel.xml	2005-12-27 22:23:21 UTC (rev 967)
@@ -27,23 +27,23 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <para os="t1">To ensure that your system boots and you can properly run both
+    <para os="m1">To ensure that your system boots and you can properly run both
     32 bits and 64 bits binaries, please make sure that you enable support for
     ELF and emulations for 32bit ELF into the kernel.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -51,11 +51,11 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -73,11 +73,11 @@
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -87,32 +87,40 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
 <screen><userinput>cp arch/x86_64/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86_64/kernel.xml"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the cross-lfs mailing list