r6750 - in branches/cross-lfs/BOOK: . boot/mips boot/mips64 boot/mips64-64 boot/sparc boot/sparc64 boot/sparc64-64 boot/x86 boot/x86_64 boot/x86_64-64 final-system/mips final-system/mips64 final-system/mips64-64 final-system/sparc final-system/sparc64 final-system/x86 final-system/x86_64 final-system/x86_64-64

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Wed Aug 24 12:24:41 PDT 2005


Author: manuel
Date: 2005-08-24 13:24:38 -0600 (Wed, 24 Aug 2005)
New Revision: 6750

Modified:
   branches/cross-lfs/BOOK/boot/mips/colo-build.xml
   branches/cross-lfs/BOOK/boot/mips64-64/colo-build.xml
   branches/cross-lfs/BOOK/boot/mips64/colo-build.xml
   branches/cross-lfs/BOOK/boot/sparc/netkit_base.xml
   branches/cross-lfs/BOOK/boot/sparc/silo-build.xml
   branches/cross-lfs/BOOK/boot/sparc64-64/silo-build.xml
   branches/cross-lfs/BOOK/boot/sparc64/netkit_base.xml
   branches/cross-lfs/BOOK/boot/sparc64/silo-build.xml
   branches/cross-lfs/BOOK/boot/x86/grub-build.xml
   branches/cross-lfs/BOOK/boot/x86_64-64/grub-build.xml
   branches/cross-lfs/BOOK/boot/x86_64/grub-build.xml
   branches/cross-lfs/BOOK/final-system/mips/colo.xml
   branches/cross-lfs/BOOK/final-system/mips64-64/colo.xml
   branches/cross-lfs/BOOK/final-system/mips64/colo.xml
   branches/cross-lfs/BOOK/final-system/sparc/netkit_base.xml
   branches/cross-lfs/BOOK/final-system/sparc/silo.xml
   branches/cross-lfs/BOOK/final-system/sparc64/elftoaout.xml
   branches/cross-lfs/BOOK/final-system/sparc64/netkit_base.xml
   branches/cross-lfs/BOOK/final-system/sparc64/silo.xml
   branches/cross-lfs/BOOK/final-system/x86/grub.xml
   branches/cross-lfs/BOOK/final-system/x86_64-64/grub.xml
   branches/cross-lfs/BOOK/final-system/x86_64/grub.xml
   branches/cross-lfs/BOOK/general.ent
Log:
Xinclude redo on bootloaders and sparc specific packages.

Modified: branches/cross-lfs/BOOK/boot/mips/colo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips/colo-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/mips/colo-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -43,16 +43,20 @@
   <sect2 role="installation">
     <title>Installation of Colo</title>
 
-    <para>Compile the Colo package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/colo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
 make CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/colo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp binaries/colo-chain.elf ${LFS}/boot/vmlinux
+<screen os="c"><userinput>cp binaries/colo-chain.elf ${LFS}/boot/vmlinux
 gzip -9 ${LFS}/boot/vmlinux</userinput></screen>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/boot/mips64/colo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/colo-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/mips64/colo-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -43,17 +43,22 @@
   <sect2 role="installation">
     <title>Installation of Colo</title>
 
-  <para>Compile the Colo package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo-build.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
 make CC="${CC} ${BUILD32)" CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
 
-  <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp binaries/colo-chain.elf ${LFS}/boot/vmlinux
-gzip -9 ${LFS}/boot/vmlinux</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo-build.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/mips64-64/colo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64-64/colo-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/mips64-64/colo-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -43,13 +43,16 @@
   <sect2 role="installation">
     <title>Installation of Colo</title>
 
-  <para>We install the precompiled binary since 64 bit version is
-  not available currently.</para>
+    <para>We install the precompiled binary since 64 bit version is
+    not available currently.</para>
 
-  <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp binaries/colo-chain.elf ${LFS}/boot/vmlinux
-gzip -9 ${LFS}/boot/vmlinux</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo-build.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/sparc/netkit_base.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc/netkit_base.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/sparc/netkit_base.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -45,28 +45,36 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(id('install-netkit_base')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure --prefix=/tools </userinput></screen>
 
-   <para>Now we make the build compatible with our build. We change the user
-   to 0. Remove the -s from the install command. Remove the CC and CFLAGS variable
-   from the makefile. This will allow us to cross-compile with no issues at all.</para>
+   <para os="aa">Now we make the build compatible with our build. We change
+   the user to 0. Remove the <option>-s</option> from the installation commands.
+   Remove the <envar>CC</envar> and <envar>CFLAGS</envar> variable from the
+   <filename>Makefile</filename>. This will allow us to cross-compile with no
+   issues at all.</para>
 
-<screen><userinput>sed -i '/CC=/d' MCONFIG
+<screen os="ab"><userinput>sed -i '/CC=/d' MCONFIG
 sed -i '/CFLAGS=/d' MCONFIG
 sed -i 's/install -s/install/g' inetd/Makefile
 sed -i 's/install -s/install/g' ping/Makefile
 sed -i 's/-o root//g' inetd/Makefile
 sed -i 's/-o root//g' ping/Makefile</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
 <screen><userinput>make CC="${CC}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/sparc/silo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc/silo-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/sparc/silo-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -43,24 +43,31 @@
   <sect2 role="installation">
     <title>Installation of Silo</title>
 
-    <para>The following patch fixes compile issues::</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&silo-fixes-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the Silo package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make install DESTDIR=${LFS}</userinput></screen>
+<screen os="e"><userinput>make install DESTDIR=${LFS}</userinput></screen>
 
-   <para>Due to an a compile issue with the current toolchains, we are going
-   to use the precompiled boot files. This is a temporary fix to the book, but
-   will give us a functional system. As soon as a fix is released, this section
-   will be removed. Here is how you install the precompiled files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+<screen os="g"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/sparc64/netkit_base.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64/netkit_base.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/sparc64/netkit_base.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -44,29 +44,32 @@
     <title>Installation of Netkit base</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/netkit_base.xml"
-    xpointer="xpointer(id('install-netkit_base')/para[1])"/>
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure --prefix=/tools </userinput></screen>
 
-   <para>Now we make the build compatible with our build. We change the user
-   to 0. Remove the -s from the install command. Remove the CC and CFLAGS variable
-   from the makefile. This will allow us to cross-compile with no issues at all.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen><userinput>sed -i '/CC=/d' MCONFIG
-sed -i '/CFLAGS=/d' MCONFIG
-sed -i 's/install -s/install/g' inetd/Makefile
-sed -i 's/install -s/install/g' ping/Makefile
-sed -i 's/-o root//g' inetd/Makefile
-sed -i 's/-o root//g' ping/Makefile</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
 <screen><userinput>make CC="${CC} ${BUILD64}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/sparc64/silo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64/silo-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/sparc64/silo-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -43,24 +43,35 @@
   <sect2 role="installation">
     <title>Installation of Silo</title>
 
-    <para>The following patch fixes compile issues::</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&silo-fixes-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the Silo package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CROSS_COMPILE="sparc64-unknown-linux-gnu-"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-   <para>Due to an a compile issue with the current toolchains, we are going
-   to use the precompiled boot files. This is a temporary fix to the book, but
-   will give us a functional system. As soon as a fix is released, this section
-   will be removed. Here is how you install the precompiled files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/sparc64-64/silo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64-64/silo-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/sparc64-64/silo-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -43,24 +43,35 @@
   <sect2 role="installation">
     <title>Installation of Silo</title>
 
-    <para>The following patch fixes compile issues::</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&silo-fixes-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the Silo package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CROSS_COMPILE="sparc64-unknown-linux-gnu-"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-   <para>Due to an a compile issue with the current toolchains, we are going
-   to use the precompiled boot files. This is a temporary fix to the book, but
-   will give us a functional system. As soon as a fix is released, this section
-   will be removed. Here is how you install the precompiled files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo-build.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/x86/grub-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/x86/grub-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/x86/grub-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -45,27 +45,36 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(id('install-grub')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare GRUB for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>./configure --prefix=${LFS}/usr \
    --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install
+<screen os="h"><userinput>make install
 mkdir ${LFS}/boot/grub
 cp ${LFS}/usr/lib/grub/i386-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
 
-    <para>Replace <filename class="directory">i386-pc</filename> with whatever
-    directory is appropriate for the hardware in use.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>The <filename class="directory">i386-pc</filename> directory
+    <para os="j">The <filename class="directory">i386-pc</filename> directory
     contains a number of <filename>*stage1_5</filename> files, different
     ones for different file systems. Review the files available and copy
     the appropriate ones to the <filename

Modified: branches/cross-lfs/BOOK/boot/x86_64/grub-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/x86_64/grub-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/x86_64/grub-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -44,33 +44,38 @@
     <title>Installation of GRUB</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(id('install-grub')/para[1])"/>
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare GRUB for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=${LFS}/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install
-mkdir ${LFS}/boot/grub
-cp ${LFS}/usr/lib/grub/i386-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Replace <filename class="directory">i386-pc</filename> with whatever
-    directory is appropriate for the hardware in use.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>The <filename class="directory">i386-pc</filename> directory
-    contains a number of <filename>*stage1_5</filename> files, different
-    ones for different file systems. Review the files available and copy
-    the appropriate ones to the <filename
-    class="directory">${LFS}/boot/grub</filename> directory. Most users will
-    copy the <filename>e2fs_stage1_5</filename> and/or
-    <filename>reiserfs_stage1_5</filename> files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/x86_64-64/grub-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/x86_64-64/grub-build.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/boot/x86_64-64/grub-build.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -44,33 +44,38 @@
     <title>Installation of GRUB</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(id('install-grub')/para[1])"/>
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare GRUB for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="${CC} -m32 -static" ./configure --prefix=${LFS}/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install
-mkdir ${LFS}/boot/grub
-cp ${LFS}/usr/lib/grub/i386-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Replace <filename class="directory">i386-pc</filename> with whatever
-    directory is appropriate for the hardware in use.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>The <filename class="directory">i386-pc</filename> directory
-    contains a number of <filename>*stage1_5</filename> files, different
-    ones for different file systems. Review the files available and copy
-    the appropriate ones to the <filename
-    class="directory">${LFS}/boot/grub</filename> directory. Most users will
-    copy the <filename>e2fs_stage1_5</filename> and/or
-    <filename>reiserfs_stage1_5</filename> files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/mips/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/colo.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/mips/colo.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -45,13 +45,13 @@
   <sect2 id="install-colo" role="installation">
     <title>Installation of Colo</title>
 
-    <para>Compile the Colo package:</para>
+    <para os="a">Compile the Colo package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="b">Install the package:</para>
 
-<screen><userinput>install -d  /usr/lib/colo/examples
+<screen os="c"><userinput>install -d  /usr/lib/colo/examples
 install binaries/colo-chain.elf /usr/lib/colo
 install binaries/colo-rom-image.bin /usr/lib/colo
 install tools/colo-perm/colo-perm /sbin

Modified: branches/cross-lfs/BOOK/final-system/mips64/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/colo.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/mips64/colo.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -42,34 +42,20 @@
   <sect2 role="installation">
     <title>Installation of Colo</title>
 
-    <para>Compile the Colo package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make CC="gcc ${BUILD32}" binary
 make CC="gcc ${BUILD64}" tooldirs</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d  /usr/lib/colo/examples
-install binaries/colo-chain.elf /usr/lib/colo
-install binaries/colo-rom-image.bin /usr/lib/colo
-install tools/colo-perm/colo-perm /sbin
-install tools/colo-perm/colo-perm.8 /usr/man/man8
-install tools/elf2rfx/elf2rfx /sbin
-install tools/flash-tool/flash-tool /sbin
-install tools/flash-tool/flash-tool.8 /usr/man/man8
-install tools/lcdtools/e2fsck-lcd/e2fsck-lcd /sbin
-install tools/lcdtools/e2fsck-lcd/e2fsck-lcd.8 /usr/man/man8
-install tools/lcdtools/liblcd/liblcd.a /lib
-install tools/lcdtools/paneld/paneld /sbin
-install tools/lcdtools/paneld/paneld.8 /usr/man/man8
-install tools/lcdtools/putlcd/putlcd /sbin
-install tools/lcdtools/putlcd/putlcd.8 /usr/man/man8
-install tools/md5rom/md5rom /sbin
-install tools/md5rom/md5rom.8 /usr/man/man8
-install examples/menu.colo /usr/lib/colo/examples
-install examples/simple.colo /usr/lib/colo/examples
-cp binaries/colo-chain.elf /boot/vmlinux
-gzip -9 /boot/vmlinux</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64-64/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64-64/colo.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/mips64-64/colo.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -45,33 +45,19 @@
     <para>Since 64 bit version doesn't work currently we are going to
     compile the utilities as 64 bit and use the precompiled bootloader.</para>
 
-    <para>Compile the Colo package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make CC="gcc ${BUILD64}" tooldirs</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d  /usr/lib/colo/examples
-install binaries/colo-chain.elf /usr/lib/colo
-install binaries/colo-rom-image.bin /usr/lib/colo
-install tools/colo-perm/colo-perm /sbin
-install tools/colo-perm/colo-perm.8 /usr/man/man8
-install tools/elf2rfx/elf2rfx /sbin
-install tools/flash-tool/flash-tool /sbin
-install tools/flash-tool/flash-tool.8 /usr/man/man8
-install tools/lcdtools/e2fsck-lcd/e2fsck-lcd /sbin
-install tools/lcdtools/e2fsck-lcd/e2fsck-lcd.8 /usr/man/man8
-install tools/lcdtools/liblcd/liblcd.a /lib
-install tools/lcdtools/paneld/paneld /sbin
-install tools/lcdtools/paneld/paneld.8 /usr/man/man8
-install tools/lcdtools/putlcd/putlcd /sbin
-install tools/lcdtools/putlcd/putlcd.8 /usr/man/man8
-install tools/md5rom/md5rom /sbin
-install tools/md5rom/md5rom.8 /usr/man/man8
-install examples/menu.colo /usr/lib/colo/examples
-install examples/simple.colo /usr/lib/colo/examples
-cp binaries/colo-chain.elf /boot/vmlinux
-gzip -9 /boot/vmlinux</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc/netkit_base.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/netkit_base.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/sparc/netkit_base.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -44,27 +44,28 @@
   <sect2 id="install-netkit_base" role="installation">
     <title>Installation of Netkit Base</title>
 
-   <para>Prepare Netkit base for compilation:</para>
+   <para os="a">Prepare Netkit base for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>
 
-   <para>We remove the CC and CFLAGS variables so, we don't have any compile issues.</para>
+   <para os="b">Remove the <envar>CC</envar> and C<envar>FLAGS</envar> variables
+   to avoid any compile issues.</para>
 
-<screen><userinput>sed -i '/CC=/d' MCONFIG
+<screen os="c"><userinput>sed -i '/CC=/d' MCONFIG
 sed -i '/CFLAGS=/d' MCONFIG</userinput></screen>
 
-    <para>Netkit Base needs patching to be compatable with the current toolchains.
-    This patch will correct that situation:</para>
+    <para os="d">Netkit Base needs patching to be compatable with the
+    current toolchains. This patch will correct that situation:</para>
 
-<screen><userinput>patch -Np1 -i ../&netkit_base-fixes-patch;</userinput></screen>
+<screen os="e"><userinput>patch -Np1 -i ../&netkit_base-fixes-patch;</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="f">Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/silo.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/sparc/silo.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -45,24 +45,24 @@
   <sect2 id="install-silo" role="installation">
     <title>Installation of Silo</title>
 
-    <para>The following patch fixes compile issues::</para>
+    <para os="a">The following patch fixes compile issues::</para>
 
-<screen><userinput>patch -Np1 -i ../&silo-fixes-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&silo-fixes-patch;</userinput></screen>
 
-    <para>Compile the Silo package:</para>
+    <para os="c">Compile the Silo package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="d">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="e"><userinput>make install</userinput></screen>
 
-   <para>Due to an a compile issue with the current toolchains, we are going
+   <para os="f">Due to a compile issue with the current toolchains, we are going
    to use the precompiled boot files. This is a temporary fix to the book, but
    will give us a functional system. As soon as a fix is released, this section
    will be removed. Here is how you install the precompiled files:</para>
 
-<screen><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+<screen os="g"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc64/elftoaout.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/elftoaout.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/sparc64/elftoaout.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -16,10 +16,12 @@
     <primary sortas="a-ELFtoaout">ELFtoaout</primary>
   </indexterm>
 
-  <sect2 id="package-elftoaout" role="package">
+  <sect2 role="package">
     <title/>
 
-    <para>The ELFtoaout package contains the Sparc ELF to a.out converter.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/elftoaout.xml"
+    xpointer="xpointer(id('package-elftoaout')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -31,17 +33,13 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/elftoaout.xml"
+    xpointer="xpointer(id('package-elftoaout')/segmentedlist[2])"/>
 
-      <seglistitem>
-      <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
-  <sect2 id="install-elftoaout" role="installation">
+  <sect2 role="installation">
     <title>Installation of ELFtoaout</title>
 
     <para>Compile the ELFtoaout package:</para>
@@ -54,34 +52,8 @@
 
   </sect2>
 
-  <sect2 id="contents-elftoaout" role="content">
-    <title>Contents of ELFtoaout</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/elftoaout.xml"
+  xpointer="xpointer(id('contents-elftoaout'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>Unchecked</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="elftoaout">
-        <term><command>elftoaout</command></term>
-        <listitem>
-          <para>Need Description</para>
-          <indexterm zone="ch-system-elftoaout elftoaout">
-            <primary sortas="a-elftoaout">elftoaout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/sparc64/netkit_base.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/netkit_base.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/sparc64/netkit_base.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -16,10 +16,12 @@
     <primary sortas="a-Netkit Base">Netkit Base</primary>
   </indexterm>
 
-  <sect2 id="package-netkit_base" role="package">
+  <sect2 role="package">
     <title/>
 
-    <para>The NetKit Base package contains programs for basic networking.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(id('package-netkit_base')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -31,83 +33,55 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(id('package-netkit_base')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
-  <sect2 id="install-netkit_base" role="installation">
+  <sect2 role="installation">
     <title>Installation of Netkit Base</title>
 
-   <para>Prepare Netkit base for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure</userinput></screen>
 
-   <para>We remove the CC and CFLAGS variables so, we don't have any compile issues.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>sed -i '/CC=/d' MCONFIG
-sed -i '/CFLAGS=/d' MCONFIG</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Netkit Base needs patching to be compatable with the current toolchains.
-    This patch will correct that situation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>patch -Np1 -i ../&netkit_base-fixes-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
 <screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/netkit_base.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 
-  <sect2 id="contents-netkit_base" role="content">
-    <title>Contents of Netkit base</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/netkit_base.xml"
+  xpointer="xpointer(id('contents-netkit_base'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>inetd and ping</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ping">
-        <term><command>ping</command></term>
-        <listitem>
-          <para>Sends echo-request packets and reports how long the replies
-          take</para>
-          <indexterm zone="ch-system-netkit_base ping">
-            <primary sortas="b-ping">ping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="inetd">
-        <term><command>inetd</command></term>
-        <listitem>
-          <para>Allows running one daemon to invoke several others,
-           reducing load on the system.</para>
-          <indexterm zone="ch-system-netkit_base inetd">
-            <primary sortas="b-inetd">inetd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/sparc64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/silo.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/sparc64/silo.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -16,10 +16,12 @@
     <primary sortas="a-Silo">Silo</primary>
   </indexterm>
 
-  <sect2 id="package-silo" role="package">
+  <sect2 role="package">
     <title/>
 
-    <para>The Silo package contains the Sparc Improved boot LOader.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(id('package-silo')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -31,69 +33,49 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(id('package-silo')/segmentedlist[2])"/>
 
-      <seglistitem>
-      <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
-      Make, Ncurses, Sed, ELFtoaout</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
   <sect2 id="install-silo" role="installation">
     <title>Installation of Silo</title>
 
-    <para>The following patch fixes compile issues::</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&silo-fixes-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the Silo package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-   <para>Due to an a compile issue with the current toolchains, we are going
-   to use the precompiled boot files. This is a temporary fix to the book, but
-   will give us a functional system. As soon as a fix is released, this section
-   will be removed. Here is how you install the precompiled files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 
-  <sect2 id="contents-silo" role="content">
-    <title>Contents of Silo</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(id('contents-silo'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>Unchecked</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="silo">
-        <term><command>silo</command></term>
-        <listitem>
-          <para>Need Description</para>
-          <indexterm zone="ch-system-silo silo">
-            <primary sortas="a-silo">silo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/x86/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86/grub.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/x86/grub.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -44,40 +44,40 @@
   <sect2 id="install-grub" role="installation">
     <title>Installation of GRUB</title>
 
-    <para>This package is known to have issues when its default optimization
+    <para os="a">This package is known to have issues when its default optimization
     flags (including the <option>-march</option> and <option>-mcpu</option>
     options) are changed. If any environment variables that override default
     optimizations have been defined, such as <envar>CFLAGS</envar> and
     <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
 
-    <para>Prepare GRUB for compilation:</para>
+    <para os="b">Prepare GRUB for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>sed -i '/ufs2/d' stage2/size_test &&
     make check</userinput>.</para>
 
-    <para>The UFS test is known to fail due to a compiler issue. The failure
+    <para os="f">The UFS test is known to fail due to a compiler issue. The failure
     prevents the rest of the tests from being run, so the <command>sed</command>
     command is used to avoid the failure. The UFS test failure can be ignored
     unless you plan to boot from a UFS partition. The partitions are normally
     only used by Sun workstations.</para>
 
-    <para>Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen><userinput>make install
+<screen os="h"><userinput>make install
 mkdir /boot/grub
 cp /usr/lib/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen>
 
-    <para>Replace <filename class="directory">i386-pc</filename> with whatever
+    <para os="i">Replace <filename class="directory">i386-pc</filename> with whatever
     directory is appropriate for the hardware in use.</para>
 
-    <para>The <filename class="directory">i386-pc</filename> directory
+    <para os="j">The <filename class="directory">i386-pc</filename> directory
     contains a number of <filename>*stage1_5</filename> files, different
     ones for different file systems. Review the files available and copy
     the appropriate ones to the <filename

Modified: branches/cross-lfs/BOOK/final-system/x86_64/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/grub.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/x86_64/grub.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -15,10 +15,12 @@
     <primary sortas="a-GRUB">GRUB</primary>
   </indexterm>
 
-  <sect2 id="package-grub" role="package">
+  <sect2 role="package">
     <title/>
 
-    <para>The GRUB package contains the GRand Unified Bootloader.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(id('package-grub')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -30,131 +32,61 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(id('package-grub')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
-        Make, Ncurses, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
-  <sect2 id="install-grub" role="installation">
+  <sect2 role="installation">
     <title>Installation of GRUB</title>
 
-    <para>This package is known to have issues when its default optimization
-    flags (including the <option>-march</option> and <option>-mcpu</option>
-    options) are changed. If any environment variables that override default
-    optimizations have been defined, such as <envar>CFLAGS</envar> and
-    <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare GRUB for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Note that the test results will always show the error
-    <quote>ufs2_stage1_5 is too big.</quote> This is due to a compiler
-    issue, but can be ignored unless you plan to boot from an UFS
-    partition. The partitions are normally only used by Sun
-    workstations.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install
-mkdir /boot/grub
-cp /usr/lib/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Replace <filename class="directory">i386-pc</filename> with whatever
-    directory is appropriate for the hardware in use.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>The <filename class="directory">i386-pc</filename> directory
-    contains a number of <filename>*stage1_5</filename> files, different
-    ones for different file systems. Review the files available and copy
-    the appropriate ones to the <filename
-    class="directory">/boot/grub</filename> directory. Most users will
-    copy the <filename>e2fs_stage1_5</filename> and/or
-    <filename>reiserfs_stage1_5</filename> files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 
-  <sect2 id="contents-grub" role="content">
-    <title>Contents of GRUB</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/grub.xml"
+  xpointer="xpointer(id('contents-grub'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>grub, grub-install, grub-md5-crypt, grub-terminfo, and mbchk</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="grub">
-        <term><command>grub</command></term>
-        <listitem>
-          <para>The Grand Unified Bootloader's command shell</para>
-          <indexterm zone="ch-system-grub grub">
-            <primary sortas="b-grub">grub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-install">
-        <term><command>grub-install</command></term>
-        <listitem>
-          <para>Installs GRUB on the given device</para>
-          <indexterm zone="ch-system-grub grub-install">
-            <primary sortas="b-grub-install">grub-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-md5-crypt">
-        <term><command>grub-md5-crypt</command></term>
-        <listitem>
-          <para>Encrypts a password in MD5 format</para>
-          <indexterm zone="ch-system-grub grub-md5-crypt">
-            <primary sortas="b-grub-md5-crypt">grub-md5-crypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-terminfo">
-        <term><command>grub-terminfo</command></term>
-        <listitem>
-          <para>Generates a terminfo command from a terminfo name; it can be
-          employed if an unknown terminal is being used</para>
-          <indexterm zone="ch-system-grub grub-terminfo">
-            <primary sortas="b-grub-terminfo">grub-terminfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbchk">
-        <term><command>mbchk</command></term>
-        <listitem>
-          <para>Checks the format of a multi-boot kernel</para>
-          <indexterm zone="ch-system-grub mbchk">
-            <primary sortas="b-mbchk">mbchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/x86_64-64/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64-64/grub.xml	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/final-system/x86_64-64/grub.xml	2005-08-24 19:24:38 UTC (rev 6750)
@@ -15,10 +15,12 @@
     <primary sortas="a-GRUB">GRUB</primary>
   </indexterm>
 
-  <sect2 id="package-grub" role="package">
+  <sect2 role="package">
     <title/>
 
-    <para>The GRUB package contains the GRand Unified Bootloader.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(id('package-grub')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -30,131 +32,61 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(id('package-grub')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
-        Make, Ncurses, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
-  <sect2 id="install-grub" role="installation">
+  <sect2 role="installation">
     <title>Installation of GRUB</title>
 
-    <para>This package is known to have issues when its default optimization
-    flags (including the <option>-march</option> and <option>-mcpu</option>
-    options) are changed. If any environment variables that override default
-    optimizations have been defined, such as <envar>CFLAGS</envar> and
-    <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare GRUB for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc -m32 -static" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Note that the test results will always show the error
-    <quote>ufs2_stage1_5 is too big.</quote> This is due to a compiler
-    issue, but can be ignored unless you plan to boot from an UFS
-    partition. The partitions are normally only used by Sun
-    workstations.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install
-mkdir /boot/grub
-cp /usr/lib/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Replace <filename class="directory">i386-pc</filename> with whatever
-    directory is appropriate for the hardware in use.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>The <filename class="directory">i386-pc</filename> directory
-    contains a number of <filename>*stage1_5</filename> files, different
-    ones for different file systems. Review the files available and copy
-    the appropriate ones to the <filename
-    class="directory">/boot/grub</filename> directory. Most users will
-    copy the <filename>e2fs_stage1_5</filename> and/or
-    <filename>reiserfs_stage1_5</filename> files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 
-  <sect2 id="contents-grub" role="content">
-    <title>Contents of GRUB</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/grub.xml"
+  xpointer="xpointer(id('contents-grub'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>grub, grub-install, grub-md5-crypt, grub-terminfo, and mbchk</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="grub">
-        <term><command>grub</command></term>
-        <listitem>
-          <para>The Grand Unified Bootloader's command shell</para>
-          <indexterm zone="ch-system-grub grub">
-            <primary sortas="b-grub">grub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-install">
-        <term><command>grub-install</command></term>
-        <listitem>
-          <para>Installs GRUB on the given device</para>
-          <indexterm zone="ch-system-grub grub-install">
-            <primary sortas="b-grub-install">grub-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-md5-crypt">
-        <term><command>grub-md5-crypt</command></term>
-        <listitem>
-          <para>Encrypts a password in MD5 format</para>
-          <indexterm zone="ch-system-grub grub-md5-crypt">
-            <primary sortas="b-grub-md5-crypt">grub-md5-crypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-terminfo">
-        <term><command>grub-terminfo</command></term>
-        <listitem>
-          <para>Generates a terminfo command from a terminfo name; it can be
-          employed if an unknown terminal is being used</para>
-          <indexterm zone="ch-system-grub grub-terminfo">
-            <primary sortas="b-grub-terminfo">grub-terminfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbchk">
-        <term><command>mbchk</command></term>
-        <listitem>
-          <para>Checks the format of a multi-boot kernel</para>
-          <indexterm zone="ch-system-grub mbchk">
-            <primary sortas="b-mbchk">mbchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-23 20:49:27 UTC (rev 6749)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-24 19:24:38 UTC (rev 6750)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050823">
+<!ENTITY version "7.0-cross-lfs-20050824">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64">
 <!ENTITY version-ppc "&version;-PowerPC">
@@ -8,7 +8,7 @@
 <!ENTITY version-mips "&version;-MIPS">
 <!ENTITY version-mips64 "&version;-MIPS64">
 
-<!ENTITY releasedate "August 23, 2005">
+<!ENTITY releasedate "August 24, 2005">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 




More information about the lfs-book mailing list