r5414 - in branches/cross-lfs/BOOK: . final-system/common final-system/x86_64 introduction/common reboot reboot/common reboot/ppc reboot/raq2 reboot/sparc reboot/sparc64 reboot/x86 reboot/x86_64 temp-tools/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue May 24 15:18:51 PDT 2005


Author: jim
Date: 2005-05-24 16:18:48 -0600 (Tue, 24 May 2005)
New Revision: 5414

Added:
   branches/cross-lfs/BOOK/reboot/common/bootscripts.xml
   branches/cross-lfs/BOOK/reboot/sparc/silo-build.xml
   branches/cross-lfs/BOOK/reboot/sparc64/silo-build.xml
Modified:
   branches/cross-lfs/BOOK/Makefile
   branches/cross-lfs/BOOK/final-system/common/iproute2.xml
   branches/cross-lfs/BOOK/final-system/x86_64/grub.xml
   branches/cross-lfs/BOOK/introduction/common/changelog.xml
   branches/cross-lfs/BOOK/reboot/common/inetutils.xml
   branches/cross-lfs/BOOK/reboot/common/module-init-tools.xml
   branches/cross-lfs/BOOK/reboot/common/util-linux.xml
   branches/cross-lfs/BOOK/reboot/ppc-chapter.xml
   branches/cross-lfs/BOOK/reboot/ppc/kernel.xml
   branches/cross-lfs/BOOK/reboot/raq2-chapter.xml
   branches/cross-lfs/BOOK/reboot/raq2/colo-build.xml
   branches/cross-lfs/BOOK/reboot/raq2/colo.xml
   branches/cross-lfs/BOOK/reboot/raq2/kernel.xml
   branches/cross-lfs/BOOK/reboot/sparc-chapter.xml
   branches/cross-lfs/BOOK/reboot/sparc/kernel.xml
   branches/cross-lfs/BOOK/reboot/sparc/silo.xml
   branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml
   branches/cross-lfs/BOOK/reboot/sparc64/kernel.xml
   branches/cross-lfs/BOOK/reboot/sparc64/silo.xml
   branches/cross-lfs/BOOK/reboot/x86-chapter.xml
   branches/cross-lfs/BOOK/reboot/x86/grub-build.xml
   branches/cross-lfs/BOOK/reboot/x86/grub.xml
   branches/cross-lfs/BOOK/reboot/x86/kernel.xml
   branches/cross-lfs/BOOK/reboot/x86_64-chapter.xml
   branches/cross-lfs/BOOK/reboot/x86_64/grub-build.xml
   branches/cross-lfs/BOOK/reboot/x86_64/grub.xml
   branches/cross-lfs/BOOK/reboot/x86_64/kernel.xml
   branches/cross-lfs/BOOK/temp-tools/multilib/tcl-64bit.xml
   branches/cross-lfs/BOOK/temp-tools/multilib/tcl.xml
Log:
Updates to reboot section

Modified: branches/cross-lfs/BOOK/Makefile
===================================================================
--- branches/cross-lfs/BOOK/Makefile	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/Makefile	2005-05-24 22:18:48 UTC (rev 5414)
@@ -50,10 +50,12 @@
 # Validation
 define VALIDATE
 	echo "Validating $$arch..." ; \
-        xmllint --xinclude --noout --nonet --postvalid $(PWD)/$$arch-index.xml
+        xsltproc --xinclude --nonet --output $(PWD)/index-$$arch.xml \
+           ${PWD}/stylesheets/lfs-profile.xsl $(PWD)/$$arch-index.xml ; \
+        xmllint --noout --nonet --postvalid $(PWD)/index-$$arch.xml
 endef
 
-lfs: toplevel render common
+lfs: cleanup toplevel render common cleanup
 
 toplevel:
 	@xsltproc --nonet --output $(BASEDIR)/index.html $(PWD)/stylesheets/top-index.xsl $(PWD)/index.xml
@@ -91,9 +93,17 @@
 	$(TEXT_RENDER) ; \
 	done
 
-validate:
+validate: cleanup validation cleanup
+
+validation:
 	@for arch in $(ARCH) ; do \
 	$(VALIDATE) ; \
 	done
 
-.PHONY: lfs toplevel common render nochunk nochunk_render pdf text validate 
+cleanup:
+	@for arch in $(ARCH) ; do \
+	echo "Removing index-$$arch.xml" ; \
+	rm -f $(PWD)/index-$$arch.xml ; \
+	done
+
+.PHONY: lfs toplevel common render nochunk nochunk nochunk_render pdf text validate validation cleanup

Modified: branches/cross-lfs/BOOK/final-system/common/iproute2.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/iproute2.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/final-system/common/iproute2.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -33,8 +33,8 @@
     </segmentedlist>
   </sect2>
   <sect2 role="installation">
-    <title>Installation of Iproute2</title>
-    <para>The <command>arpd</command> binary included in this package is
+  <title>Installation of IPRoute2</title>
+  <para>The <command>arpd</command> binary included in this package is
           dependent on Berkeley DB.  Because <command>arpd</command> is not a very
           common requirement on a base Linux system, remove the dependency on
           Berkeley DB by applying the <command>sed</command> command below.  If 

Modified: branches/cross-lfs/BOOK/final-system/x86_64/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/grub.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/final-system/x86_64/grub.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -5,7 +5,6 @@
   %general-entities;
   %patches-entities;
 ]>
-
 <sect1 id="ch-system-grub" role="wrap">
 <title>Grub-&grub-version;</title>
 <?dbhtml filename="grub.html"?>

Modified: branches/cross-lfs/BOOK/introduction/common/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/changelog.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/introduction/common/changelog.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -94,6 +94,14 @@
 -->
 
 <itemizedlist>
+<listitem><para>May 24, 2005 [jim]</para>
+<itemizedlist>
+<listitem><para>Finishing the reboot section.</para></listitem>
+</itemizedlist>
+</listitem>
+</itemizedlist>
+
+<itemizedlist>
 <listitem><para>May 23, 2005 [jim]</para>
 <itemizedlist>
 <listitem><para>Updated gettext to 0.14.5.</para></listitem>

Added: branches/cross-lfs/BOOK/reboot/common/bootscripts.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/common/bootscripts.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/common/bootscripts.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -0,0 +1,42 @@
+<?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">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-entities;
+]>
+
+<sect1 id="ch-scripts-reboot" role="wrap">
+<title>LFS-Bootscripts-&lfs-bootscripts-version;</title>
+<?dbhtml filename="bootscripts.html"?>
+
+<indexterm zone="ch-scripts-reboot"><primary sortas="a-Bootscripts">Bootscripts</primary></indexterm>
+
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../bootscripts/common/bootscripts.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>0.3 MB</seg></seglistitem>
+</segmentedlist>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../bootscripts/common/bootscripts.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+
+</sect2>
+
+<sect2 role="installation">
+<title>Installation of LFS-Bootscripts</title>
+
+<para>Install the package:</para>
+
+<screen><userinput>make ETCDIR=${LFS}/etc minimal</userinput></screen>
+
+</sect2>
+
+<sect2 role="content"><title/>
+<para>Details on this package are located in <xref
+linkend="contents-bootscripts" role="."/></para>
+</sect2>
+
+</sect1>

Modified: branches/cross-lfs/BOOK/reboot/common/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/common/inetutils.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/common/inetutils.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -39,9 +39,8 @@
 <para>Prepare Inetutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
-    --sysconfdir=/etc --disable-logger --disable-syslogd \
-    --disable-whois --disable-servers</userinput></screen>
+    --host=${LFS_TARGET} --sysconfdir=/etc --disable-logger \
+    --disable-syslogd --disable-whois --disable-servers</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 

Modified: branches/cross-lfs/BOOK/reboot/common/module-init-tools.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/common/module-init-tools.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/common/module-init-tools.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -32,7 +32,7 @@
 <para>Prepare Module-Init-Tools for compilation:</para>
 
 <screen><userinput>./configure --prefix=/ \
-   --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET}</userinput></screen>
+   --host=${LFS_TARGET}</userinput></screen>
 
 <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/reboot/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/common/util-linux.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/common/util-linux.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -36,6 +36,11 @@
 
 <screen><userinput>sed -i 's@/usr/include@/tools/include at g' configure</userinput></screen>
 
+<para>Util-linux installs uses -o root, the following sed removes that
+since we don't have users setup yet:</para>
+
+<screen><userinput>sed -i 's|-o root||' MCONFIG</userinput></screen>
+
 <para>Util-linux has a compilation error against newer versions of the
 linux-libc-headers.  The following patch properly fixes that issue</para>
 
@@ -52,9 +57,7 @@
 <para>Install the package as root:</para>
 
 <screen><userinput>exit
-cd ${LFS}/sources/util-linux-&util-linux-version;
-make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install
-su - lfs</userinput></screen>
+make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no USE_TTY_GROUP=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install</userinput></screen>
 
 </sect2>
 

Modified: branches/cross-lfs/BOOK/reboot/ppc/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/ppc/kernel.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/ppc/kernel.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -37,20 +37,11 @@
 
 <screen><userinput>sed -i 's@/sbin/hotplug@/bin/true@' kernel/kmod.c</userinput></screen>
 
-<para>If, in <xref linkend="ch-scripts-console" role=","/> it was decided to
-compile the keymap into the kernel, issue the command below:</para>
-
-<screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
-    drivers/char/defkeymap.c</userinput></screen>
-
-<para>For example, if using a Dutch keyboard, use
-<filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
-
 <para>Configure the kernel via a menu-driven interface:</para>
 
-<screen><userinput>make menuconfig</userinput></screen>
+<screen><userinput>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
-<para>Alternatively, <command>make oldconfig</command>
+<para>Alternatively, <command>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}- oldconfig</command>
 may be more appropriate in some
 situations. <phrase>This will build a basic system with no modules and 
 ext2 support only.</phrase> See the <filename>README</filename> file for more
@@ -89,7 +80,7 @@
 
 <para>Compile the kernel image and modules:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
 <para>If using kernel modules, an
 <filename>/etc/modprobe.conf</filename> file may be needed.
@@ -106,7 +97,7 @@
 a user-written script inserts the corresponding module into the
 kernel, and not all modules are detectable by Hotplug. Note that
 statements like the one below in the
-<filename>/etc/modprobe.conf</filename> file do not work with
+<filename>${LFS}/etc/modprobe.conf</filename> file do not work with
 Udev:</para>
 
 <para><screen>alias char-major-XXX some-module</screen></para>
@@ -117,7 +108,8 @@
 
 <para>Install the modules, if the kernel configuration uses them:</para>
 
-<screen><userinput>make modules_install</userinput></screen>
+<screen><userinput>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}- \
+   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
 <para>If there are many modules and very little space, consider
 stripping and compressing the modules. For most users, such
@@ -126,27 +118,27 @@
 
 <para>After kernel compilation is complete, additional steps are
 required to complete the installation. Some files need to be copied to
-the <filename class="directory">/boot</filename> directory.</para>
+the <filename class="directory">${LFS}/boot</filename> directory.</para>
 
 <para><!--The path to the kernel image may vary depending on the platform
 being used. -->Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-ppc-version;</userinput></screen>
+<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-ppc-version;</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel.
 It maps the function entry points of every function in the kernel API,
 as well as the addresses of the kernel data structures for the running
 kernel. Issue the following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-ppc-version;</userinput></screen>
+<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-ppc-version;</userinput></screen>
 
 <para>The kernel configuration file <filename>.config</filename>
-produced by the <command>make menuconfig</command> step
+produced by the <command>make menuconfig ARCH=ppc CROSS_COMPILE=${LFS_TARGET}-</command> step
 above contains all the configuration selections for the kernel
 that was just compiled. It is a good idea to keep this file for future
 reference:</para>
 
-<screen><userinput>cp .config /boot/config-&linux-ppc-version;</userinput></screen>
+<screen><userinput>cp .config ${LFS}/boot/config-&linux-ppc-version;</userinput></screen>
 
 <para>It is important to note that the files in the kernel source
 directory are not owned by <emphasis>root</emphasis>. Whenever a

Modified: branches/cross-lfs/BOOK/reboot/ppc-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/ppc-chapter.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/ppc-chapter.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -19,5 +19,6 @@
 <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="ppc/kernel.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/yaboot.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
 
 </chapter>

Modified: branches/cross-lfs/BOOK/reboot/raq2/colo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/raq2/colo-build.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/raq2/colo-build.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -13,7 +13,7 @@
 <indexterm zone="ch-reboot-colo-build"><primary sortas="a-Colo-Build">Colo</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The Colo package contains the Cobalt Boot Loader.</para>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../final-system/raq2/colo.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -21,44 +21,29 @@
 <seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
 </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../final-system/raq2/colo.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 <sect2 role="installation">
 <title>Installation of Colo</title>
 
 <para>Compile the Colo package:</para>
 
-<screen><userinput>make CROSS_COMPILE="${LFS_TARGET}-"</userinput></screen>
+<screen><userinput>cd tools/elf2rfx
+make CC=gcc
+cd ../..
+make CROSS_COMPILE="${LFS_TARGET}-"</userinput></screen>
 
 <para>Install the package:</para>
 
-<screen><userinput>install -d  ${LFS}/usr/lib/colo/examples
-install binaries/colo-chain.elf ${LFS}/usr/lib/colo
-install binaries/colo-rom-image.bin ${LFS}/usr/lib/colo
-install tools/colo-perm/colo-perm ${LFS}/sbin
-install tools/colo-perm/colo-perm.8 ${LFS}/usr/man/man8
-install tools/elf2rfx/elf2rfx ${LFS}/sbin
-install tools/flash-tool/flash-tool ${LFS}/sbin
-install tools/flash-tool/flash-tool.8 ${LFS}/usr/man/man8
-install tools/lcdtools/e2fsck-lcd/e2fsck-lcd ${LFS}/sbin
-install tools/lcdtools/e2fsck-lcd/e2fsck-lcd.8 ${LFS}/usr/man/man8
-install tools/lcdtools/liblcd/liblcd.a ${LFS}/lib
-install tools/lcdtools/paneld/paneld ${LFS}/sbin
-install tools/lcdtools/paneld/paneld.8 ${LFS}/usr/man/man8
-install tools/lcdtools/putlcd/putlcd ${LFS}/sbin
-install tools/lcdtools/putlcd/putlcd.8 ${LFS}/usr/man/man8
-install tools/md5rom/md5rom ${LFS}/sbin
-install tools/md5rom/md5rom.8 ${LFS}/usr/man/man8
-install examples/menu.colo ${LFS}/usr/lib/colo/examples
-install examples/simple.colo ${LFS}/usr/lib/colo/examples
-cp binaries/colo-chain.elf ${LFS}/boot/vmlinux
+<screen><userinput>cp binaries/colo-chain.elf ${LFS}/boot/vmlinux
 gzip -9 ${LFS}/boot/vmlinux</userinput></screen>
 
 </sect2>
 
+<sect2 role="content"><title/>
+<para>Details on this package are located in <xref
+linkend="contents-colo" role="."/></para>
+</sect2>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/reboot/raq2/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/raq2/colo.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/raq2/colo.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -30,7 +30,7 @@
 preparation for this step. Now we will configure our system to boot using 
 Colo. Here is a simpe default.colo to use.</para>
 
-<screen><userinput>cat > /boot/default.colo << "EOF"
+<screen><userinput>cat > ${LFS}/boot/default.colo << "EOF"
 #:CoLo:#
 #
 # load linux
@@ -40,14 +40,4 @@
 execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
 EOF</userinput></screen>
 
-<para>Included in /usr/lib/colo/examples are more examples of a
-default.colo file.</para>
-
-<para>The FHS stipulates that Bootloader's configuration file should be symlinked to
-/etc/{Bootloader Name}.  To satisfy this requirement for colo, issue the
-following command:</para>
-
-<screen><userinput>mkdir /etc/colo &&
-ln -s /boot/colo/default.colo /etc/colo</userinput></screen>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/reboot/raq2/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/raq2/kernel.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/raq2/kernel.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -44,20 +44,11 @@
 
 <screen><userinput>sed -i 's@/sbin/hotplug@/bin/true@' kernel/kmod.c</userinput></screen>
 
-<para>If, in <xref linkend="ch-scripts-console" role=","/> it was decided to
-compile the keymap into the kernel, issue the command below:</para>
-
-<screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
-    drivers/char/defkeymap.c</userinput></screen>
-
-<para>For example, if using a Dutch keyboard, use
-<filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
-
 <para>Configure the kernel via a menu-driven interface:</para>
 
-<screen><userinput>make menuconfig</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS-COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
-<para>Alternatively, <command>make cobalt_defconfig</command> may be more appropriate in some
+<para>Alternatively, <command>make ARCH=mips CROSS-COMPILE=${LFS_TARGET}- oldconfig</command> may be more appropriate in some
 situations. <phrase>This will build a basic system with no modules and 
 ext2 support only.</phrase> See the <filename>README</filename> file for more
 information.</para>
@@ -88,7 +79,7 @@
 
 <para>Compile the kernel image and modules:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS-COMPILE=${LFS_TARGET}-</userinput></screen>
 
 <para>If using kernel modules, an
 <filename>/etc/modprobe.conf</filename> file may be needed.
@@ -105,7 +96,7 @@
 a user-written script inserts the corresponding module into the
 kernel, and not all modules are detectable by Hotplug. Note that
 statements like the one below in the
-<filename>/etc/modprobe.conf</filename> file do not work with
+<filename>${LFS}/etc/modprobe.conf</filename> file do not work with
 Udev:</para>
 
 <para><screen>alias char-major-XXX some-module</screen></para>
@@ -116,7 +107,8 @@
 
 <para>Install the modules, if the kernel configuration uses them:</para>
 
-<screen><userinput>make modules_install</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS-COMPILE=${LFS_TARGET} \
+   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
 <para>If there are many modules and very little space, consider
 stripping and compressing the modules. For most users, such
@@ -125,20 +117,20 @@
 
 <para>After kernel compilation is complete, additional steps are
 required to complete the installation. Some files need to be copied to
-the <filename class="directory">/boot</filename> directory.</para>
+the <filename class="directory">${LFS}/boot</filename> directory.</para>
 
 <para><!--The path to the kernel image may vary depending on the platform
 being used. -->Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp vmlinux /boot/vmlinux-&linux-raq2-version;
-gzip -9 /boot/vmlinux-&linux-raq2-version;</userinput></screen>
+<screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-raq2-version;
+gzip -9 ${LFS}/boot/vmlinux-&linux-raq2-version;</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel.
 It maps the function entry points of every function in the kernel API,
 as well as the addresses of the kernel data structures for the running
 kernel. Issue the following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-raq2-version;</userinput></screen>
+<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-raq2-version;</userinput></screen>
 
 <para>The kernel configuration file <filename>.config</filename>
 produced by the <command>make menuconfig</command> step
@@ -146,7 +138,7 @@
 that was just compiled. It is a good idea to keep this file for future
 reference:</para>
 
-<screen><userinput>cp .config /boot/config-&linux-raq2-version;</userinput></screen>
+<screen><userinput>cp .config ${LFS}/boot/config-&linux-raq2-version;</userinput></screen>
 
 <para>It is important to note that the files in the kernel source
 directory are not owned by <emphasis>root</emphasis>. Whenever a

Modified: branches/cross-lfs/BOOK/reboot/raq2-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/raq2-chapter.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/raq2-chapter.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -20,5 +20,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="raq2/kernel.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="raq2/colo-build.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="raq2/colo.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
 
 </chapter>

Modified: branches/cross-lfs/BOOK/reboot/sparc/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc/kernel.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/sparc/kernel.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -40,20 +40,11 @@
 
 <screen><userinput>sed -i 's@/sbin/hotplug@/bin/true@' kernel/kmod.c</userinput></screen>
 
-<para>If, in <xref linkend="ch-scripts-console" role=","/> it was decided to
-compile the keymap into the kernel, issue the command below:</para>
-
-<screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
-    drivers/char/defkeymap.c</userinput></screen>
-
-<para>For example, if using a Dutch keyboard, use
-<filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
-
 <para>Configure the kernel via a menu-driven interface:</para>
 
-<screen><userinput>make menuconfig</userinput></screen>
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
-<para>Alternatively, <command>make oldconfig</command>
+<para>Alternatively, <command>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- oldconfig</command>
 may be more appropriate in some
 situations. <phrase>This will build a basic system with no modules and 
 ext2 support only.</phrase> See the <filename>README</filename> file for more
@@ -92,10 +83,10 @@
 
 <para>Compile the kernel image and modules:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
 <para>If using kernel modules, an
-<filename>/etc/modprobe.conf</filename> file may be needed.
+<filename>${LFS}/etc/modprobe.conf</filename> file may be needed.
 Information pertaining to modules and kernel configuration is
 located in the kernel documentation in the <filename
 class="directory">linux-&linux-sparc-version;/Documentation</filename>
@@ -109,7 +100,7 @@
 a user-written script inserts the corresponding module into the
 kernel, and not all modules are detectable by Hotplug. Note that
 statements like the one below in the
-<filename>/etc/modprobe.conf</filename> file do not work with
+<filename>${LFS}/etc/modprobe.conf</filename> file do not work with
 Udev:</para>
 
 <para><screen>alias char-major-XXX some-module</screen></para>
@@ -120,7 +111,8 @@
 
 <para>Install the modules, if the kernel configuration uses them:</para>
 
-<screen><userinput>make modules_install</userinput></screen>
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- \
+   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
 <para>If there are many modules and very little space, consider
 stripping and compressing the modules. For most users, such
@@ -129,19 +121,19 @@
 
 <para>After kernel compilation is complete, additional steps are
 required to complete the installation. Some files need to be copied to
-the <filename class="directory">/boot</filename> directory.</para>
+the <filename class="directory">${LFS}/boot</filename> directory.</para>
 
 <para><!--The path to the kernel image may vary depending on the platform
 being used. -->Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-sparc-version;</userinput></screen>
+<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-sparc-version;</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel.
 It maps the function entry points of every function in the kernel API,
 as well as the addresses of the kernel data structures for the running
 kernel. Issue the following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-sparc-version;</userinput></screen>
+<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-sparc-version;</userinput></screen>
 
 <para>The kernel configuration file <filename>.config</filename>
 produced by the <command>make menuconfig</command> step
@@ -149,7 +141,7 @@
 that was just compiled. It is a good idea to keep this file for future
 reference:</para>
 
-<screen><userinput>cp .config /boot/config-&linux-sparc-version;</userinput></screen>
+<screen><userinput>cp .config ${LFS}/boot/config-&linux-sparc-version;</userinput></screen>
 
 <para>It is important to note that the files in the kernel source
 directory are not owned by <emphasis>root</emphasis>. Whenever a

Added: branches/cross-lfs/BOOK/reboot/sparc/silo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc/silo-build.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/sparc/silo-build.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -0,0 +1,44 @@
+<?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">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-entities;
+]>
+
+<sect1 id="ch-reboot-silo-build" role="wrap">
+<title>Silo-&silo-version;</title>
+<?dbhtml filename="silo-build.html"?>
+
+<indexterm zone="ch-reboot-silo-build"><primary sortas="a-Silo">Silo</primary></indexterm>
+
+<sect2 role="package"><title/>
+<para>The Silo package contains the Sparc Improved boot Loader.</para>
+
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>&dependencies;</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Ncurses, Sed, Elftoaout</seg></seglistitem>
+</segmentedlist>
+</sect2>
+
+<sect2 role="installation">
+<title>Installation of Silo</title>
+
+<para>Compile the Silo package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+</sect1>

Modified: branches/cross-lfs/BOOK/reboot/sparc/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc/silo.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/sparc/silo.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -13,32 +13,8 @@
 <indexterm zone="ch-reboot-silo"><primary sortas="a-Silo">Silo</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The Silo package contains the Sparc Improved boot LOader.</para>
+<para>This is for the configuration of silo, similar to what is in bootscripts.</para>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, Sed, Elftoaout</seg></seglistitem>
-</segmentedlist>
 </sect2>
 
-<sect2 role="installation">
-<title>Installation of Silo</title>
-
-<para>Compile the Silo package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/reboot/sparc-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc-chapter.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/sparc-chapter.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -18,5 +18,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
 <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="sparc/kernel.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/bootscripts.xml"/>
 
 </chapter>

Modified: branches/cross-lfs/BOOK/reboot/sparc64/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc64/kernel.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/sparc64/kernel.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -27,7 +27,7 @@
 
 <para>Prepare for compilation by running the following command:</para>
 
-<screen><userinput>make mrproper</userinput></screen>
+<screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
 <para>This ensures that the kernel tree is absolutely clean. The
 kernel team recommends that this command be issued prior to each
@@ -40,20 +40,11 @@
 
 <screen><userinput>sed -i 's@/sbin/hotplug@/bin/true@' kernel/kmod.c</userinput></screen>
 
-<para>If, in <xref linkend="ch-scripts-console" role=","/> it was decided to
-compile the keymap into the kernel, issue the command below:</para>
-
-<screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
-    drivers/char/defkeymap.c</userinput></screen>
-
-<para>For example, if using a Dutch keyboard, use
-<filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
-
 <para>Configure the kernel via a menu-driven interface:</para>
 
 <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
-<para>Alternatively, <command>make oldconfig</command>
+<para>Alternatively, <command>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}- oldconfig</command>
 may be more appropriate in some
 situations. <phrase>This will build a basic system with no modules and 
 ext2 support only.</phrase> See the <filename>README</filename> file for more
@@ -95,7 +86,7 @@
 <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
 <para>If using kernel modules, an
-<filename>/etc/modprobe.conf</filename> file may be needed.
+<filename>${LFS}/etc/modprobe.conf</filename> file may be needed.
 Information pertaining to modules and kernel configuration is
 located in the kernel documentation in the <filename
 class="directory">linux-&linux-sparc64-version;/Documentation</filename>
@@ -109,7 +100,7 @@
 a user-written script inserts the corresponding module into the
 kernel, and not all modules are detectable by Hotplug. Note that
 statements like the one below in the
-<filename>/etc/modprobe.conf</filename> file do not work with
+<filename>${LFS}/etc/modprobe.conf</filename> file do not work with
 Udev:</para>
 
 <para><screen>alias char-major-XXX some-module</screen></para>
@@ -130,19 +121,19 @@
 
 <para>After kernel compilation is complete, additional steps are
 required to complete the installation. Some files need to be copied to
-the <filename class="directory">/boot</filename> directory.</para>
+the <filename class="directory">${LFS}/boot</filename> directory.</para>
 
 <para><!--The path to the kernel image may vary depending on the platform
 being used. -->Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-sparc64-version;</userinput></screen>
+<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-sparc64-version;</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel.
 It maps the function entry points of every function in the kernel API,
 as well as the addresses of the kernel data structures for the running
 kernel. Issue the following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-sparc64-version;</userinput></screen>
+<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-sparc64-version;</userinput></screen>
 
 <para>The kernel configuration file <filename>.config</filename>
 produced by the <command>make menuconfig</command> step
@@ -150,7 +141,7 @@
 that was just compiled. It is a good idea to keep this file for future
 reference:</para>
 
-<screen><userinput>cp .config /boot/config-&linux-sparc64-version;</userinput></screen>
+<screen><userinput>cp .config ${LFS}/boot/config-&linux-sparc64-version;</userinput></screen>
 
 <para>It is important to note that the files in the kernel source
 directory are not owned by <emphasis>root</emphasis>. Whenever a

Added: branches/cross-lfs/BOOK/reboot/sparc64/silo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc64/silo-build.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/sparc64/silo-build.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -0,0 +1,44 @@
+<?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">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-entities;
+]>
+
+<sect1 id="ch-reboot-silo-build" role="wrap">
+<title>Silo-&silo-version;</title>
+<?dbhtml filename="silo-build.html"?>
+
+<indexterm zone="ch-reboot-silo-build"><primary sortas="a-Silo">Silo</primary></indexterm>
+
+<sect2 role="package"><title/>
+<para>The Silo package contains the Sparc Improved boot Loader.</para>
+
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>&dependencies;</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Ncurses, Sed, Elftoaout</seg></seglistitem>
+</segmentedlist>
+</sect2>
+
+<sect2 role="installation">
+<title>Installation of Silo</title>
+
+<para>Compile the Silo package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+</sect1>

Modified: branches/cross-lfs/BOOK/reboot/sparc64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc64/silo.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/sparc64/silo.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -13,32 +13,8 @@
 <indexterm zone="ch-reboot-silo"><primary sortas="a-Silo">Silo</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The Silo package contains the Sparc Improved boot LOader.</para>
+<para>This is for the configuration of silo, similar to what is in bootscripts.</para>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, Sed, Elftoaout</seg></seglistitem>
-</segmentedlist>
 </sect2>
 
-<sect2 role="installation">
-<title>Installation of Silo</title>
-
-<para>Compile the Silo package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -19,5 +19,6 @@
 <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="sparc64/kernel.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="common/bootscripts.xml"/>
 
 </chapter>

Modified: branches/cross-lfs/BOOK/reboot/x86/grub-build.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/x86/grub-build.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/x86/grub-build.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -13,7 +13,7 @@
 <indexterm zone="ch-system-grub-build"><primary sortas="a-Grub-Build">Grub</primary></indexterm>
 
 <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="../../final-system/x86/grub.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -21,11 +21,7 @@
 <seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
 </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
-</segmentedlist>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../final-system/x86/grub.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 </sect2>
 
 <sect2 role="installation">
@@ -40,7 +36,8 @@
 
 <para>Prepare Grub for compilation:</para>
 
-<screen><userinput>./configure --prefix=${LFS}/usr</userinput></screen>
+<screen><userinput>./configure --prefix=${LFS}/usr \
+   --host=${LFS_TARGET}</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -65,5 +62,10 @@
 
 </sect2>
 
+<sect2 role="content"><title/>
+<para>Details on this package are located in <xref
+linkend="contents-grub" role="."/></para>
+</sect2>
+
 </sect1>
 

Modified: branches/cross-lfs/BOOK/reboot/x86/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/x86/grub.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/x86/grub.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -31,8 +31,8 @@
 recommend creating a Grub boot floppy diskette as a backup. Insert a
 blank floppy diskette and run the following commands:</para>
 
-<screen><userinput>dd if=/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
+<screen><userinput>dd if=${LFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
+dd if=${LFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
 
 <para>Remove the diskette and store it somewhere safe. Now, run the
 <command>grub</command> shell:</para>
@@ -85,7 +85,7 @@
 
 <para>Create a <quote>menu list</quote> file defining Grub's boot menu:</para>
 
-<screen><userinput>cat > /boot/grub/menu.lst << "EOF"
+<screen><userinput>cat > ${LFS}/boot/grub/menu.lst << "EOF"
 <literal># Begin /boot/grub/menu.lst
 
 # By default boot the first menu entry.
@@ -103,7 +103,6 @@
 kernel /boot/lfskernel-&linux-x86-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
-
 <para>Add an entry for the host distribution if desired. It might look
 like this:</para>
 
@@ -114,25 +113,5 @@
 initrd /boot/initrd-2.6.5</literal>
 EOF</userinput></screen>
 
-<para>If dual-booting Windows, the following entry will allow
-booting it:</para>
-
-<screen><userinput>cat >> /boot/grub/menu.lst << "EOF"
-<literal>title Windows
-rootnoverify (hd0,0)
-chainloader +1</literal>
-EOF</userinput></screen>
-
-<para>If <command>info grub</command> does not provide all necessary material, additional
-information regarding Grub is located on its website at:
-<ulink url="http://www.gnu.org/software/grub/"/>.</para>
-
-<para>The FHS stipulates that Bootloader's configuration file should be symlinked to
-/etc/{Bootloader Name}.  To satisfy this requirement for grub, issue the
-following command:</para>
-
-<screen><userinput>mkdir /etc/grub &&
-ln -s /boot/grub/menu.lst /etc/grub</userinput></screen>
-
 </sect1>
 

Modified: branches/cross-lfs/BOOK/reboot/x86/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/x86/kernel.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/x86/kernel.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -50,20 +50,11 @@
 
 <screen><userinput>sed -i 's@/sbin/hotplug@/bin/true@' kernel/kmod.c</userinput></screen>
 
-<para>If, in <xref linkend="ch-scripts-console" role=","/> it was decided to
-compile the keymap into the kernel, issue the command below:</para>
-
-<screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
-    drivers/char/defkeymap.c</userinput></screen>
-
-<para>For example, if using a Dutch keyboard, use
-<filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
-
 <para>Configure the kernel via a menu-driven interface:</para>
 
-<screen><userinput>make menuconfig</userinput></screen>
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
 
-<para>Alternatively, <command>make oldconfig</command>
+<para>Alternatively, <command>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}- oldconfig</command>
 may be more appropriate in some
 situations. <phrase>This will build a basic system with no modules and 
 ext2 support only.</phrase> See the <filename>README</filename> file for more
@@ -102,10 +93,10 @@
 
 <para>Compile the kernel image and modules:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
 <para>If using kernel modules, an
-<filename>/etc/modprobe.conf</filename> file may be needed.
+<filename>${LFS}/etc/modprobe.conf</filename> file may be needed.
 Information pertaining to modules and kernel configuration is
 located in the kernel documentation in the <filename
 class="directory">linux-&linux-x86-version;/Documentation</filename>
@@ -119,7 +110,7 @@
 a user-written script inserts the corresponding module into the
 kernel, and not all modules are detectable by Hotplug. Note that
 statements like the one below in the
-<filename>/etc/modprobe.conf</filename> file do not work with
+<filename>${LFS}/etc/modprobe.conf</filename> file do not work with
 Udev:</para>
 
 <para><screen>alias char-major-XXX some-module</screen></para>
@@ -130,7 +121,8 @@
 
 <para>Install the modules, if the kernel configuration uses them:</para>
 
-<screen><userinput>make modules_install</userinput></screen>
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}- \
+   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
 <para>If there are many modules and very little space, consider
 stripping and compressing the modules. For most users, such
@@ -139,19 +131,19 @@
 
 <para>After kernel compilation is complete, additional steps are
 required to complete the installation. Some files need to be copied to
-the <filename class="directory">/boot</filename> directory.</para>
+the <filename class="directory">${LFS}/boot</filename> directory.</para>
 
 <para><!--The path to the kernel image may vary depending on the platform
 being used. -->Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-x86-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-x86-version;</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel.
 It maps the function entry points of every function in the kernel API,
 as well as the addresses of the kernel data structures for the running
 kernel. Issue the following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-x86-version;</userinput></screen>
+<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-x86-version;</userinput></screen>
 
 <para>The kernel configuration file <filename>.config</filename>
 produced by the <command>make menuconfig</command> step
@@ -159,7 +151,7 @@
 that was just compiled. It is a good idea to keep this file for future
 reference:</para>
 
-<screen><userinput>cp .config /boot/config-&linux-x86-version;</userinput></screen>
+<screen><userinput>cp .config ${LFS}/boot/config-&linux-x86-version;</userinput></screen>
 
 <para>It is important to note that the files in the kernel source
 directory are not owned by <emphasis>root</emphasis>. Whenever a

Modified: branches/cross-lfs/BOOK/reboot/x86-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/x86-chapter.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/x86-chapter.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -20,5 +20,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/kernel.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub-build.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/bootscripts.xml"/>
 
 </chapter>

Modified: branches/cross-lfs/BOOK/reboot/x86_64/grub-build.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/x86_64/grub-build.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/x86_64/grub-build.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -13,7 +13,7 @@
 <indexterm zone="ch-system-grub-build"><primary sortas="a-Grub-Build">Grub</primary></indexterm>
 
 <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="../../final-system/x86/grub.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -21,11 +21,8 @@
 <seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
 </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
-</segmentedlist>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../final-system/x86/grub.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+
 </sect2>
 
 <sect2 role="installation">
@@ -40,7 +37,8 @@
 
 <para>Prepare Grub for compilation:</para>
 
-<screen><userinput>./configure --prefix=${LFS}/usr</userinput></screen>
+<screen><userinput>./configure --prefix=${LFS}/usr \
+   --host=${LFS_TARGET}</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -65,5 +63,10 @@
 
 </sect2>
 
+<sect2 role="content"><title/>
+<para>Details on this package are located in <xref
+linkend="contents-grub" role="."/></para>
+</sect2>
+
 </sect1>
 

Modified: branches/cross-lfs/BOOK/reboot/x86_64/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/x86_64/grub.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/x86_64/grub.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -31,8 +31,8 @@
 recommend creating a Grub boot floppy diskette as a backup. Insert a
 blank floppy diskette and run the following commands:</para>
 
-<screen><userinput>dd if=/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
+<screen><userinput>dd if=${LFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
+dd if=${LFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
 
 <para>Remove the diskette and store it somewhere safe. Now, run the
 <command>grub</command> shell:</para>
@@ -85,7 +85,7 @@
 
 <para>Create a <quote>menu list</quote> file defining Grub's boot menu:</para>
 
-<screen><userinput>cat > /boot/grub/menu.lst << "EOF"
+<screen><userinput>cat > ${LFS}/boot/grub/menu.lst << "EOF"
 <literal># Begin /boot/grub/menu.lst
 
 # By default boot the first menu entry.
@@ -100,10 +100,9 @@
 # The first entry is for LFS.
 title LFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-x86_64-version; root=/dev/hda4</literal>
+kernel /boot/lfskernel-&linux-x86-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
-
 <para>Add an entry for the host distribution if desired. It might look
 like this:</para>
 
@@ -114,25 +113,5 @@
 initrd /boot/initrd-2.6.5</literal>
 EOF</userinput></screen>
 
-<para>If dual-booting Windows, the following entry will allow
-booting it:</para>
-
-<screen><userinput>cat >> /boot/grub/menu.lst << "EOF"
-<literal>title Windows
-rootnoverify (hd0,0)
-chainloader +1</literal>
-EOF</userinput></screen>
-
-<para>If <command>info grub</command> does not provide all necessary material, additional
-information regarding Grub is located on its website at:
-<ulink url="http://www.gnu.org/software/grub/"/>.</para>
-
-<para>The FHS stipulates that Bootloader's configuration file should be symlinked to
-/etc/{Bootloader Name}.  To satisfy this requirement for grub, issue the
-following command:</para>
-
-<screen><userinput>mkdir /etc/grub &&
-ln -s /boot/grub/menu.lst /etc/grub</userinput></screen>
-
 </sect1>
 

Modified: branches/cross-lfs/BOOK/reboot/x86_64/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/x86_64/kernel.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/x86_64/kernel.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -50,20 +50,11 @@
 
 <screen><userinput>sed -i 's@/sbin/hotplug@/bin/true@' kernel/kmod.c</userinput></screen>
 
-<para>If, in <xref linkend="ch-scripts-console" role=","/> it was decided to
-compile the keymap into the kernel, issue the command below:</para>
-
-<screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
-    drivers/char/defkeymap.c</userinput></screen>
-
-<para>For example, if using a Dutch keyboard, use
-<filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
-
 <para>Configure the kernel via a menu-driven interface:</para>
 
-<screen><userinput>make menuconfig</userinput></screen>
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${TARGET}- menuconfig</userinput></screen>
 
-<para>Alternatively, <command>make oldconfig</command>
+<para>Alternatively, <command>make ARCH=x86_64 CROSS_COMPILE=${TARGET}- oldconfig</command>
 may be more appropriate in some
 situations. <phrase>This will build a basic system with no modules and 
 ext2 support only.</phrase> See the <filename>README</filename> file for more
@@ -73,7 +64,7 @@
 <quote>Support for hot-pluggable devices</quote> option under the
 <quote>General Setup</quote> menu. This enables hotplug events that
 are used by <command>udev</command> to populate the <filename
-class="directory">/dev</filename> directory with device
+class="directory">${LFS}/dev</filename> directory with device
 nodes.</para></note>
 
 <para>If desired, skip kernel configuration by copying the kernel
@@ -102,10 +93,10 @@
 
 <para>Compile the kernel image and modules:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${TARGET}-</userinput></screen>
 
 <para>If using kernel modules, an
-<filename>/etc/modprobe.conf</filename> file may be needed.
+<filename>${LFS}/etc/modprobe.conf</filename> file may be needed.
 Information pertaining to modules and kernel configuration is
 located in the kernel documentation in the <filename
 class="directory">linux-&linux-x86_64-version;/Documentation</filename>
@@ -119,7 +110,7 @@
 a user-written script inserts the corresponding module into the
 kernel, and not all modules are detectable by Hotplug. Note that
 statements like the one below in the
-<filename>/etc/modprobe.conf</filename> file do not work with
+<filename>${LFS}/etc/modprobe.conf</filename> file do not work with
 Udev:</para>
 
 <para><screen>alias char-major-XXX some-module</screen></para>
@@ -130,7 +121,8 @@
 
 <para>Install the modules, if the kernel configuration uses them:</para>
 
-<screen><userinput>make modules_install</userinput></screen>
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${TARGET}- \
+   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
 <para>If there are many modules and very little space, consider
 stripping and compressing the modules. For most users, such
@@ -139,19 +131,19 @@
 
 <para>After kernel compilation is complete, additional steps are
 required to complete the installation. Some files need to be copied to
-the <filename class="directory">/boot</filename> directory.</para>
+the <filename class="directory">${LFS}/boot</filename> directory.</para>
 
 <para><!--The path to the kernel image may vary depending on the platform
 being used. -->Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-x86_64-version;</userinput></screen>
+<screen><userinput>cp arch/i386${LFS}/boot/bzImage ${LFS}/boot/lfskernel-&linux-x86_64-version;</userinput></screen>
 
 <para><filename>System.map</filename> is a symbol file for the kernel.
 It maps the function entry points of every function in the kernel API,
 as well as the addresses of the kernel data structures for the running
 kernel. Issue the following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-x86_64-version;</userinput></screen>
+<screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-x86_64-version;</userinput></screen>
 
 <para>The kernel configuration file <filename>.config</filename>
 produced by the <command>make menuconfig</command> step
@@ -159,7 +151,7 @@
 that was just compiled. It is a good idea to keep this file for future
 reference:</para>
 
-<screen><userinput>cp .config /boot/config-&linux-x86_64-version;</userinput></screen>
+<screen><userinput>cp .config ${LFS}/boot/config-&linux-x86_64-version;</userinput></screen>
 
 <para>It is important to note that the files in the kernel source
 directory are not owned by <emphasis>root</emphasis>. Whenever a

Modified: branches/cross-lfs/BOOK/reboot/x86_64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/x86_64-chapter.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/reboot/x86_64-chapter.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -20,5 +20,6 @@
 <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="common/bootscripts.xml"/>
 
 </chapter>

Modified: branches/cross-lfs/BOOK/temp-tools/multilib/tcl-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -13,7 +13,7 @@
 <indexterm zone="ch-temp-tools-tcl-64"><primary sortas="a-Tcl-64">Tcl 64-Bit</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The Tcl package contains the Tool Command Language.</para>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../temp-tools/common/tcl.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -21,11 +21,7 @@
 <seglistitem><seg>0.9 SBU</seg><seg>23 MB</seg></seglistitem>
 </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
-</segmentedlist>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../temp-tools/common/tcl.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
 </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-tools/multilib/tcl.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/multilib/tcl.xml	2005-05-24 18:06:04 UTC (rev 5413)
+++ branches/cross-lfs/BOOK/temp-tools/multilib/tcl.xml	2005-05-24 22:18:48 UTC (rev 5414)
@@ -13,7 +13,7 @@
 <indexterm zone="ch-temp-tools-tcl"><primary sortas="a-Tcl">Tcl</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The Tcl package contains the Tool Command Language.</para>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../temp-tools/common/tcl.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -21,11 +21,7 @@
 <seglistitem><seg>0.9 SBU</seg><seg>23 MB</seg></seglistitem>
 </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
-</segmentedlist>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../temp-tools/common/tcl.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
 </sect2>
 
@@ -65,7 +61,6 @@
 
 <screen><userinput>make install</userinput></screen>
 
-
 </sect2>
 
 <sect2 id="contents-tcl" role="content"><title>Contents of Tcl</title>
@@ -88,6 +83,14 @@
 </listitem>
 </varlistentry>
 
+<varlistentry id="tclsh">
+<term><command>tclsh</command></term>
+<listitem>
+<para>A link to tclsh8.4</para>
+<indexterm zone="ch-temp-tools-tcl tclsh"><primary sortas="b-tclsh">tclsh</primary></indexterm>
+</listitem>
+</varlistentry>
+
 <varlistentry id="libtcl8.4.so">
 <term><filename class="libraryfile">libtcl8.4.so</filename></term>
 <listitem>




More information about the lfs-book mailing list