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

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Nov 19 10:00:21 PST 2005


Author: manuel
Date: 2005-11-19 11:00:15 -0700 (Sat, 19 Nov 2005)
New Revision: 723

Removed:
   trunk/BOOK/boot/mips64/colo.xml
   trunk/BOOK/boot/sparc64-64/silo.xml
   trunk/BOOK/boot/sparc64/silo.xml
   trunk/BOOK/boot/x86_64/grub.xml
Modified:
   trunk/BOOK/boot/alpha/kernel.xml
   trunk/BOOK/boot/mips/colo.xml
   trunk/BOOK/boot/mips/kernel.xml
   trunk/BOOK/boot/mips64-64-chapter.xml
   trunk/BOOK/boot/mips64-chapter.xml
   trunk/BOOK/boot/mips64/kernel.xml
   trunk/BOOK/boot/ppc/kernel.xml
   trunk/BOOK/boot/sparc/kernel.xml
   trunk/BOOK/boot/sparc/silo.xml
   trunk/BOOK/boot/sparc64-64-chapter.xml
   trunk/BOOK/boot/sparc64-chapter.xml
   trunk/BOOK/boot/sparc64/kernel.xml
   trunk/BOOK/boot/x86/grub.xml
   trunk/BOOK/boot/x86/kernel.xml
   trunk/BOOK/boot/x86_64-64-chapter.xml
   trunk/BOOK/boot/x86_64-chapter.xml
   trunk/BOOK/boot/x86_64/kernel.xml
Log:
Unifiying linux and linux-libc-headers package version entities. Boot chapter.

Modified: trunk/BOOK/boot/alpha/kernel.xml
===================================================================
--- trunk/BOOK/boot/alpha/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/alpha/kernel.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-alpha-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-boot-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -105,13 +105,15 @@
     href="../../bootable/alpha/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-alpha-version;</userinput></screen>
+<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"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-alpha-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/boot/mips/colo.xml
===================================================================
--- trunk/BOOK/boot/mips/colo.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/mips/colo.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -32,8 +32,8 @@
 #
 # load linux
 #
-lcd 'Booting &linux-mips-version;...'
-load vmlinux-&linux-mips-version;.gz
+lcd 'Booting &linux-version;...'
+load vmlinux-&linux-version;.gz
 execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
 EOF</userinput></screen>
 

Modified: trunk/BOOK/boot/mips/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/mips/kernel.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-mips-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-boot-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -121,14 +121,16 @@
     href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-mips-version;
-gzip -9 ${LFS}/boot/vmlinux-&linux-mips-version;</userinput></screen>
+<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"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-mips-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
   </sect2>
 

Deleted: trunk/BOOK/boot/mips64/colo.xml
===================================================================
--- trunk/BOOK/boot/mips64/colo.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/mips64/colo.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-colo">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-colo">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-<screen><userinput>cat > ${LFS}/boot/default.colo << "EOF"
-#:CoLo:#
-#
-# load linux
-#
-lcd 'Booting &linux-mips64-version;...'
-load vmlinux-&linux-mips64-version;.gz
-execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
-EOF</userinput></screen>
-
-</sect1>

Modified: trunk/BOOK/boot/mips64/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips64/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/mips64/kernel.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-mips64-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-boot-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -27,23 +27,23 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -51,15 +51,15 @@
     xpointer="xpointer(//*[@os='t1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/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/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/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/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -103,36 +103,38 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/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/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-mips64-version;
-gzip -9 ${LFS}/boot/vmlinux-&linux-mips64-version;</userinput></screen>
+<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/mips64/kernel.xml"
+    href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-mips64-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/boot/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/boot/mips64-64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/mips64-64-chapter.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -23,7 +23,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/colo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>

Modified: trunk/BOOK/boot/mips64-chapter.xml
===================================================================
--- trunk/BOOK/boot/mips64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/mips64-chapter.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -23,7 +23,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>

Modified: trunk/BOOK/boot/ppc/kernel.xml
===================================================================
--- trunk/BOOK/boot/ppc/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/ppc/kernel.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-ppc-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-boot-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -105,13 +105,15 @@
     href="../../bootable/ppc/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-ppc-version;</userinput></screen>
+<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"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-ppc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/boot/sparc/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/sparc/kernel.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-sparc-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-boot-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -105,13 +105,15 @@
     href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-sparc-version;</userinput></screen>
+<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"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-sparc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/boot/sparc/silo.xml
===================================================================
--- trunk/BOOK/boot/sparc/silo.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/sparc/silo.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -24,7 +24,7 @@
 root = /dev/sda1      # Root partition
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/lfskernel-&linux-sparc-version;
+image = /boot/lfskernel-&linux-version;
   label = linux
 # End /etc/silo.conf</literal>
 EOF</userinput></screen>

Modified: trunk/BOOK/boot/sparc64/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc64/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/sparc64/kernel.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-sparc64-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-boot-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -27,11 +27,11 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -41,7 +41,7 @@
 <screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/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/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/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/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
 <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
@@ -85,35 +85,37 @@
     xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/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/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-sparc64-version;</userinput></screen>
+<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
+    href="../../bootable/sparc/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-sparc64-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
   </sect2>
 

Deleted: trunk/BOOK/boot/sparc64/silo.xml
===================================================================
--- trunk/BOOK/boot/sparc64/silo.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/sparc64/silo.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-silo">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="aa"><userinput>cat > ${LFS}/etc/silo.conf << "EOF"
-<literal># Begin /etc/silo.conf
-partition = 1         # Boot partition (= root partition)
-root = /dev/sda1      # Root partition
-timeout = 150         # Wait 15 seconds before booting the default section
-
-image = /boot/lfskernel-&linux-sparc64-version;
-  label = linux
-# End /etc/silo.conf</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-</sect1>

Deleted: trunk/BOOK/boot/sparc64-64/silo.xml
===================================================================
--- trunk/BOOK/boot/sparc64-64/silo.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/sparc64-64/silo.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-silo">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc64/silo.xml"
-  xpointer="xpointer(//*[@os='aa'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-</sect1>

Modified: trunk/BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- trunk/BOOK/boot/sparc64-64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/sparc64-64-chapter.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -29,7 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/silo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
 </chapter>

Modified: trunk/BOOK/boot/sparc64-chapter.xml
===================================================================
--- trunk/BOOK/boot/sparc64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/sparc64-chapter.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -30,7 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
 </chapter>

Modified: trunk/BOOK/boot/x86/grub.xml
===================================================================
--- trunk/BOOK/boot/x86/grub.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/x86/grub.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -89,7 +89,7 @@
 # The first entry is for LFS.
 title LFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-x86-version; root=/dev/hda4</literal>
+kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/x86/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/x86/kernel.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-x86-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-boot-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -112,13 +112,13 @@
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-x86-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-x86-version;</userinput></screen>
+<screen os="x1"><userinput>cp System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
 
   </sect2>
 

Deleted: trunk/BOOK/boot/x86_64/grub.xml
===================================================================
--- trunk/BOOK/boot/x86_64/grub.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/x86_64/grub.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub">
-  <?dbhtml filename="grub.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='n'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='p'])"/>
-
-<screen><userinput>cat > ${LFS}/boot/grub/menu.lst << "EOF"
-<literal># Begin /boot/grub/menu.lst
-
-# By default boot the first menu entry.
-default 0
-
-# Allow 30 seconds before booting the default.
-timeout 30
-
-# Use prettier colors.
-color green/black light-green/black
-
-# The first entry is for LFS.
-title LFS &version;
-root (hd0,3)
-kernel /boot/lfskernel-&linux-x86_64-version; root=/dev/hda4</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='q'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='r'])"/>
-
-</sect1>

Modified: trunk/BOOK/boot/x86_64/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86_64/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/x86_64/kernel.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-x86-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-boot-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -109,13 +109,15 @@
     href="../../bootable/x86_64/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp arch/x86_64/boot/bzImage ${LFS}/boot/lfskernel-&linux-x86_64-version;</userinput></screen>
+<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"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-x86_64-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/x86_64-64-chapter.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -23,7 +23,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/grub-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>

Modified: trunk/BOOK/boot/x86_64-chapter.xml
===================================================================
--- trunk/BOOK/boot/x86_64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
+++ trunk/BOOK/boot/x86_64-chapter.xml	2005-11-19 18:00:15 UTC (rev 723)
@@ -23,7 +23,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>




More information about the cross-lfs mailing list