[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 4e60ea5edec657066d47302cbedd0a46bde15825
git
git at cross-lfs.org
Sun Aug 8 11:20:31 PDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 4e60ea5edec657066d47302cbedd0a46bde15825 (commit)
via 6cc876efc645761efd7f4b0b8c2d8ff508a2ff02 (commit)
from 1eaa44a285f322cd9de71d70992f3cfc1e60fb66 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4e60ea5edec657066d47302cbedd0a46bde15825
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 8 14:21:31 2010 -0400
Updated GRUB to 1.98
diff --git a/BOOK/boot/x86-chapter.xml b/BOOK/boot/x86-chapter.xml
index b5dd1e7..1569883 100644
--- a/BOOK/boot/x86-chapter.xml
+++ b/BOOK/boot/x86-chapter.xml
@@ -21,13 +21,13 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.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="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-build.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
</chapter>
diff --git a/BOOK/boot/x86/kernel.xml b/BOOK/boot/x86/kernel.xml
index 5cff627..f55585a 100644
--- a/BOOK/boot/x86/kernel.xml
+++ b/BOOK/boot/x86/kernel.xml
@@ -89,7 +89,7 @@
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../bootable/x86/kernel.xml"
diff --git a/BOOK/boot/x86_64-64/lilo.xml b/BOOK/boot/x86_64-64/lilo.xml
index 52ad5f2..bd7c808 100644
--- a/BOOK/boot/x86_64-64/lilo.xml
+++ b/BOOK/boot/x86_64-64/lilo.xml
@@ -15,9 +15,11 @@
<secondary>configuring</secondary>
</indexterm>
+<!--
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='n1'])"/>
+-->
<para os="a">You are nearly ready to boot to the new temporary system.
One of the last things to do is to ensure that the system can be booted.
@@ -29,9 +31,11 @@
to refer to the <command>lilo</command> and <command>keytab-lilo.pl
</command> commands you installed on the host system.</para>
+<!--
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/grub.xml"
xpointer="xpointer(//*[@os='b'])"/>
+-->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../bootable/x86_64-64/lilo.xml"
diff --git a/BOOK/boot/x86_64-chapter.xml b/BOOK/boot/x86_64-chapter.xml
index fccda94..71b60cb 100644
--- a/BOOK/boot/x86_64-chapter.xml
+++ b/BOOK/boot/x86_64-chapter.xml
@@ -21,14 +21,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.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="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-build.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
</chapter>
diff --git a/BOOK/boot/x86_64/kernel.xml b/BOOK/boot/x86_64/kernel.xml
index 179f02a..8379b81 100644
--- a/BOOK/boot/x86_64/kernel.xml
+++ b/BOOK/boot/x86_64/kernel.xml
@@ -85,7 +85,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/bootable/x86/grub.xml b/BOOK/bootable/x86/grub.xml
index 592fa8d..5b9456b 100644
--- a/BOOK/bootable/x86/grub.xml
+++ b/BOOK/bootable/x86/grub.xml
@@ -17,7 +17,7 @@
<para os="a">Your shiny new CLFS system is almost complete. One of the last
things to do is to ensure that the system can be properly booted. The
- instructions below apply only to computers of IA-32 architecture,
+ instructions below apply only to computers of x86 and x86_64 architecture,
meaning mainstream PCs. Information on <quote>boot loading</quote> for
other architectures should be available in the usual resource-specific
locations for those architectures.</para>
@@ -28,113 +28,26 @@
Make sure that an emergency boot disk is ready to <quote>rescue</quote>
the computer if the computer becomes unusable (un-bootable).</para>
- <para os="c">Earlier, we compiled and installed the GRUB boot loader software
- in preparation for this step. The procedure involves writing some special
- GRUB files to specific locations on the hard drive. We highly recommend
- creating a GRUB boot floppy diskette as a backup. Insert a blank floppy
- diskette and run the following commands:</para>
+ <para os="c">The first thing we need to do is generate a configuration for
+ GRUB. In previous versions of grub we could create the configuration manually
+ here, but with GRUB2 we can generate <filename>grub.cfg</filename>
+ automatically. You can do this with the following command:</para>
-<screen os="d"><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 os="d"><userinput>grub-mkconfig -o /boot/grub/grub.cfg</userinput></screen>
- <para os="e">Remove the diskette and store it somewhere safe. Now, run the
- <command>grub</command> shell:</para>
-
-<screen os="f"><userinput>grub</userinput></screen>
-
- <para os="g">GRUB uses its own naming structure for drives and partitions in
- the form of <emphasis>(hdn,m)</emphasis>, where <emphasis>n</emphasis>
- is the hard drive number and <emphasis>m</emphasis> is the partition
- number, both starting from zero. For example, partition <filename
- class="partition">hda1</filename> is <emphasis>(hd0,0)</emphasis> to
- GRUB and <filename class="partition">hdb3</filename> is
- <emphasis>(hd1,2)</emphasis>. In contrast to Linux, GRUB does not
- consider CD-ROM drives to be hard drives. For example, if using a CD
- on <filename class="partition">hdb</filename> and a second hard drive
- on <filename class="partition">hdc</filename>, that second hard drive
- would still be <emphasis>(hd1)</emphasis>.</para>
-
- <para os="h">Using the above information, determine the appropriate designator
- for the root partition (or boot partition, if a separate one is used).
- For the following example, it is assumed that the root (or separate boot)
- partition is <filename class="partition">hda4</filename>.</para>
-
- <para os="i">Tell GRUB where to search for its <filename>stage{1,2}</filename>
- files. The Tab key can be used everywhere to make GRUB show the
- alternatives:</para>
-
-<screen os="j"><userinput>root (hd0,3)</userinput></screen>
-
- <warning os="k">
+ <warning os="w1">
<para>The following command will overwrite the current boot loader.
Do not run the command if this is not desired, for example, if using
a third party boot manager to manage the Master Boot Record (MBR).
In this scenario, it would make more sense to install GRUB into the
<quote>boot sector</quote> of the CLFS partition. In this case, this
- next command would become <userinput>setup (hd0,3)</userinput>.</para>
+ next command would become <userinput>grub-install /dev/sda2</userinput>
+ .</para>
</warning>
- <para os="l">Tell GRUB to install itself into the MBR of
- <filename class="partition">hda</filename>:</para>
-
-<screen os="m"><userinput>setup (hd0)</userinput></screen>
-
- <para os="n">If all went well, GRUB will have reported finding its files in
- <filename class="directory">/boot/grub</filename>. That's all there is
- to it. Quit the <command>grub</command> shell:</para>
-
-<screen os="o"><userinput>quit</userinput></screen>
-
- <para os="p">Create a <quote>menu list</quote> file defining GRUB's boot
- menu:</para>
-
-<screen><userinput>cat > /boot/grub/menu.lst << "EOF"
-<literal># Begin /boot/grub/menu.lst
-
-# By default boot the first menu entry.
-default 0
-
-# Allow 30 seconds before booting the default.
-timeout 30
-
-# Use prettier colors.
-color green/black light-green/black
-
-# The first entry is for CLFS.
-title CLFS &version;
-root (hd0,3)
-kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
-EOF</userinput></screen>
-
-
- <para os="q">Add an entry for the host distribution if desired. It might look
- like this:</para>
-
-<screen os="r"><userinput>cat >> /boot/grub/menu.lst << "EOF"
-<literal>title Red Hat
-root (hd0,2)
-kernel /boot/kernel-2.6.5 root=/dev/hda3
-initrd /boot/initrd-2.6.5</literal>
-EOF</userinput></screen>
-
- <para os="s">If dual-booting Windows, the following entry will allow
- booting it:</para>
-
-<screen os="t"><userinput>cat >> /boot/grub/menu.lst << "EOF"
-<literal>title Windows
-rootnoverify (hd0,0)
-chainloader +1</literal>
-EOF</userinput></screen>
-
- <para os="u">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 os="v">The FHS stipulates that the bootloader's configuration file should
- be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
- To satisfy this requirement for GRUB, issue the following command:</para>
+ <para os="e">Instruct GRUB to install itself int othe MBR of
+ <filename class="partition">sda</filename>:</para>
-<screen os="w"><userinput>mkdir -v /etc/grub &&
-ln -sv /boot/grub/menu.lst /etc/grub</userinput></screen>
+<screen os="f"><userinput>grub-install /dev/sda</userinput></screen>
</sect1>
diff --git a/BOOK/final-system/x86/grub.xml b/BOOK/final-system/x86/grub.xml
index e90c949..fc8461d 100644
--- a/BOOK/final-system/x86/grub.xml
+++ b/BOOK/final-system/x86/grub.xml
@@ -30,60 +30,184 @@
<ulink url="http://trac.cross-lfs.org/wiki/bootloaders"/></para>
</note>
- <para os="p1">GRUB has an issue that can cause it to segfault when you
- try to configure a drive to utilize GRUB on x86_64 and building machines. The following
- patch fixes this problem:</para>
+ <note os="n2">
+ <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>
+ </note>
-<screen os="p2"><userinput>patch -Np1 -i ../&grub-use_mmap-patch;</userinput></screen>
+ <para os="a">Prepare GRUB for compilation:</para>
- <para os="p3">GRUB has an issue where it sometimes doesn't detect
- the disk geometry correctly when used with Linux 2.6, resulting
- in the error message <literal>Error 24: Attempt to access block outside
- partition</literal>. The following patch contains a fix for this issue
- as well as various fixes for raid controllers and support for the
- new Intel Mac:</para>
+<screen os="b"><userinput>./configure --prefix=/usr \
+ --sysconfdir=/etc</userinput></screen>
-<screen os="p4"><userinput>patch -Np1 -i ../&grub-fixes-patch;</userinput></screen>
+ <para os="c">Compile the package:</para>
- <para os="p5">By default, GRUB doesn't support ext2 filesystems with 256-byte inodes. Fix this by applying the following patch:</para>
+<screen os="d"><userinput>make</userinput></screen>
-<screen os="p6"><userinput>patch -Np1 -i ../&grub-256byte_inode-patch;</userinput></screen>
+ <para os="e">To test GRUB you must have QEMU installed and then, issue:
+ <userinput>make check</userinput>.</para>
- <para os="p7">By default, GRUB doesn't support ext4 filesystems. Fix this by applying the following patch:</para>
+ <para os="f">Install the package:</para>
-<screen os="p8"><userinput>patch -Np1 -i ../&grub-ext4-patch;</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
- <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>
+ </sect2>
- <para os="b">Prepare GRUB for compilation:</para>
+ <sect2 id="conf-grub" role="configuration">
+ <title>Configuring GRUB</title>
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+ <indexterm zone="conf-grub">
+ <primary sortas="a-GRUB">GRUB</primary>
+ <secondary>configuring</secondary></indexterm>
- <para os="c">Compile the package:</para>
+ <indexterm zone="conf-grub">
+ <primary sortas="e-/etc/default/grub">/etc/default/grub</primary>
+ </indexterm>
-<screen os="d"><userinput>make</userinput></screen>
+ <para>Now that grub is installed, we need to configure the defaults that
+ will be used to generate the configuration after we install the kernel.
+ Create this file with the following:</para>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+<screen><userinput>install -m755 -dv /etc/default
+cat > /etc/default/grub << "EOF"
+<literal># Begin /etc/default/grub
- <para os="f">Install the package:</para>
+GRUB_DEFAULT=0
+#GRUB_SAVEDEFAULT=true
+GRUB_HIDDEN_TIMEOUT=
+GRUB_HIDDEN_TIMEOUT_QUIET=false
+GRUB_TIMEOUT=10
+GRUB_DISTRIBUTOR=Cross-LFS
-<screen os="g"><userinput>make install
-mkdir -pv /boot/grub
-cp -v /usr/lib/grub/*/stage{1,2} /boot/grub</userinput></screen>
-
- <para os="h">The directory in
- <filename class="directory">/usr/lib/grub</filename> (its name depends
- on your arch) 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>
+GRUB_CMDLINE_LINUX=""
+GRUB_CMDLINE_LINUX_DEFAULT=""
+
+#GRUB_TERMINAL=console
+#GRUB_GFXMODE=640x480
+
+#GRUB_DISABLE_LINUX_UUID=true
+#GRUB_DISABLE_LINUX_RECOVERY=true
+
+#GRUB_INIT_TUNE="480 440 1"
+
+#GRUB_DISABLE_OS_PROBER=true
+
+# End /etc/default/grub</literal>
+EOF</userinput></screen>
+
+ <variablelist>
+ <title>The meaning of the above options and possible alternate
+ values:</title>
+
+ <varlistentry>
+ <term><parameter>GRUB_DEFAULT=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_SAVEDEFAULT=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_HIDDEN_TIMEOUT=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_HIDDEN_TIMEOUT_QUIET=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_TIMEOUT=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_DISTRIBUTOR=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_CMDLINE_LINUX=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_CMDLINE_LINUX_DEFAULT=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_TERMINAL=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_GFXMODE=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_DEFAULT=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_DISABLE_LINUX_UUID=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_DISABLE_LINUX_RECOVERY=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_INIT_TUNE=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>GRUB_DISABLE_OS_PROBER=</parameter></term>
+ <listitem>
+ <para>Write Me</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
</sect2>
diff --git a/BOOK/final-system/x86_64-64/lilo.xml b/BOOK/final-system/x86_64-64/lilo.xml
index 1497495..eb243fd 100644
--- a/BOOK/final-system/x86_64-64/lilo.xml
+++ b/BOOK/final-system/x86_64-64/lilo.xml
@@ -27,11 +27,11 @@
<sect2 role="installation">
<title>Installation of Lilo</title>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='n1'])"/>
-
+-->
<para os="c">Compile the package:</para>
<screen os="d"><userinput>make all</userinput></screen>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index 9e0f4c4..d7564be 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -91,7 +91,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/aboutdebug.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/stripping.xml"/>
diff --git a/BOOK/final-system/x86_64/grub.xml b/BOOK/final-system/x86_64/grub.xml
deleted file mode 100644
index 36ab4a2..0000000
--- a/BOOK/final-system/x86_64/grub.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-<sect1 id="ch-system-grub" role="wrap">
- <?dbhtml filename="grub.html"?>
-
- <title>GRUB-&grub-version;</title>
-
- <indexterm zone="ch-system-grub">
- <primary sortas="a-GRUB">GRUB</primary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of GRUB</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='n1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='p3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='p4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='p5'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='p6'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='p7'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='p8'])"/>
-
- <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>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='g'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='h'])"/>
-
- </sect2>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(id('contents-grub'))"/>
-
-</sect1>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 7abda2e..3007d06 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,9 @@
<para>August 08, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Updated GRUB to 1.98.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated the Kernel to 2.6.35.</para>
</listitem>
<listitem>
diff --git a/BOOK/materials/x86/patches.xml b/BOOK/materials/x86/patches.xml
index 08b881b..50fd3de 100644
--- a/BOOK/materials/x86/patches.xml
+++ b/BOOK/materials/x86/patches.xml
@@ -21,41 +21,6 @@
</listitem>
</varlistentry>
- <varlistentry os="grub-256byte_inode-patch">
- <term>Grub 256-Byte Inode Patch - <token>&grub-256byte_inode-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&grub-256byte_inode-patch;"/></para>
- <para>MD5 sum: <literal>&grub-256byte_inode-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="grub-ext4-patch">
- <term>Grub EXT4 Update - <token>&grub-ext4-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&grub-ext4-patch;"/></para>
- <para>MD5 sum: <literal>&grub-ext4-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="grub-fixes-patch">
- <term>Grub Various Fixes - <token>&grub-fixes-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&grub-fixes-patch;"/></para>
- <para>MD5 sum: <literal>&grub-fixes-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="grub-use_mmap-patch">
- <term>Grub Use MMAP Patch - <token>&grub-use_mmap-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&grub-use_mmap-patch;"/></para>
- <para>MD5 sum: <literal>&grub-use_mmap-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/materials/x86_64/patches.xml b/BOOK/materials/x86_64/patches.xml
index 38d9023..0ed9170 100644
--- a/BOOK/materials/x86_64/patches.xml
+++ b/BOOK/materials/x86_64/patches.xml
@@ -16,22 +16,6 @@
href="../x86/patches.xml"
xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/patches.xml"
- xpointer="xpointer(//*[@os='grub-256byte_inode-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/patches.xml"
- xpointer="xpointer(//*[@os='grub-ext4-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/patches.xml"
- xpointer="xpointer(//*[@os='grub-fixes-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/patches.xml"
- xpointer="xpointer(//*[@os='grub-use_mmap-patch'])"/>
-
<varlistentry os="iproute2-libdir-patch">
<term>IPRoute2 Lib64 Patch - <token>&iproute2-libdir-patch-size;</token>:</term>
<listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 757ba0d..ea052d8 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -197,10 +197,10 @@
<!ENTITY groff-md5 "48fa768dd6fdeb7968041dd5ae8e2b02">
<!ENTITY groff-home "&gnu-software;groff">
-<!ENTITY grub-version "0.97">
-<!ENTITY grub-size "949 KB">
+<!ENTITY grub-version "1.98">
+<!ENTITY grub-size "2,392 KB">
<!ENTITY grub-url "&alpha-gnu;grub/grub-&grub-version;.tar.gz">
-<!ENTITY grub-md5 "cd3f3eb54446be6003156158d51f4884">
+<!ENTITY grub-md5 "c0bcf60e524739bb64e3a2d4e3732a59">
<!ENTITY grub-home "&gnu-software;grub">
<!ENTITY gzip-version "1.4">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index dc847e2..c7a98b5 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -172,22 +172,6 @@
<!ENTITY bin86-x86_64-patch-md5 "92bdce7b0655cd2e9f83c83fc56d128e">
<!ENTITY bin86-x86_64-patch-size "1 KB">
-<!ENTITY grub-256byte_inode-patch "grub-&grub-version;-256byte_inode-1.patch">
-<!ENTITY grub-256byte_inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
-<!ENTITY grub-256byte_inode-patch-size "4 KB">
-
-<!ENTITY grub-ext4-patch "grub-&grub-version;-ext4-1.patch">
-<!ENTITY grub-ext4-patch-md5 "4e15738421a4e769cafd324befb8be5d">
-<!ENTITY grub-ext4-patch-size "9 KB">
-
-<!ENTITY grub-fixes-patch "grub-&grub-version;-fixes-2.patch">
-<!ENTITY grub-fixes-patch-md5 "3f7b50a6274063c1e8a8e57131045f5a">
-<!ENTITY grub-fixes-patch-size "132 KB">
-
-<!ENTITY grub-use_mmap-patch "grub-&grub-version;-use_mmap-2.patch">
-<!ENTITY grub-use_mmap-patch-md5 "700257168164d6df67b5c73ba02cca75">
-<!ENTITY grub-use_mmap-patch-size "20 KB">
-
<!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-2.patch">
<!ENTITY lilo-cross-x86_64-patch-md5 "a7440e18ef7fa6c5d1c6181dc0cc4d10">
<!ENTITY lilo-cross-x86_64-patch-size "2 KB">
commit 6cc876efc645761efd7f4b0b8c2d8ff508a2ff02
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 8 11:41:52 2010 -0400
Updated the Kernel to 2.6.35.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 408cf2b..7abda2e 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,9 @@
<para>August 08, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Updated the Kernel to 2.6.35.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated DHCPCD to 5.2.7.</para>
</listitem>
<listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index f3476e3..757ba0d 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -260,10 +260,10 @@
<!ENTITY linux-dl-version "2.6">
-<!ENTITY linux-version "2.6.34.1">
-<!ENTITY linux-size "66,076 KB">
+<!ENTITY linux-version "2.6.35">
+<!ENTITY linux-size "67,684 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "d31d241dc2058698a45fe41359cafb45">
+<!ENTITY linux-md5 "091abeb4684ce03d1d936851618687b6">
<!ENTITY linux-home "http://www.kernel.org">
<!ENTITY m4-version "1.4.14">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/x86-chapter.xml | 4 +-
BOOK/boot/x86/kernel.xml | 2 +-
BOOK/boot/x86_64-64/lilo.xml | 4 +
BOOK/boot/x86_64-chapter.xml | 4 +-
BOOK/boot/x86_64/kernel.xml | 2 +-
BOOK/bootable/x86/grub.xml | 111 ++----------------
BOOK/final-system/x86/grub.xml | 202 +++++++++++++++++++++++++------
BOOK/final-system/x86_64-64/lilo.xml | 4 +-
BOOK/final-system/x86_64-chapter.xml | 2 +-
BOOK/final-system/x86_64/grub.xml | 95 ---------------
BOOK/introduction/common/changelog.xml | 6 +
BOOK/materials/x86/patches.xml | 35 ------
BOOK/materials/x86_64/patches.xml | 16 ---
BOOK/packages.ent | 12 +-
BOOK/patches.ent | 16 ---
15 files changed, 200 insertions(+), 315 deletions(-)
delete mode 100644 BOOK/final-system/x86_64/grub.xml
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list