[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 24efabe0ddb96885b3b15e64a7ed474166bd2f6a
git
git at cross-lfs.org
Sat Jan 22 13:57:23 PST 2011
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 24efabe0ddb96885b3b15e64a7ed474166bd2f6a (commit)
via 7df00c28f11639de001ed2341ccd254d211b37c5 (commit)
via 9c3999cc52175da364616c297c380b5605488554 (commit)
from 8414eddf2d3dcb12a53be78b07526f0b3e54a7ee (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 24efabe0ddb96885b3b15e64a7ed474166bd2f6a
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Jan 22 16:51:00 2011 -0500
Build Grub in the Boot Section of x86, x86_64, and x86_64-64.
diff --git a/BOOK/appendices/dependencies/x86_64-64.xml b/BOOK/appendices/dependencies/x86_64-64.xml
index 8dd15a3..02adb3b 100644
--- a/BOOK/appendices/dependencies/x86_64-64.xml
+++ b/BOOK/appendices/dependencies/x86_64-64.xml
@@ -13,58 +13,4 @@
<para>This page contains dependency information for packages specific to x86 Pure64.</para>
-<!-- Begin Bin86 dependency info -->
- <bridgehead renderas="sect2" id="bin86-dep">Bin86</bridgehead>
-
- <segmentedlist>
- <segtitle>&dependencies;</segtitle>
-
- <seglistitem>
- <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Patch</seg>
- </seglistitem>
- </segmentedlist>
-
- <segmentedlist>
- <segtitle>&testsuites;</segtitle>
-
- <seglistitem>
- <seg>None</seg>
- </seglistitem>
- </segmentedlist>
-
- <segmentedlist>
- <segtitle>&before;</segtitle>
-
- <seglistitem>
- <seg>Lilo</seg>
- </seglistitem>
- </segmentedlist>
-
-<!-- Begin Lilo dependency info -->
- <bridgehead renderas="sect2" id="lilo-dep">Lilo</bridgehead>
-
- <segmentedlist>
- <segtitle>&dependencies;</segtitle>
-
- <seglistitem>
- <seg>Bash, Bin86, Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
- </seglistitem>
- </segmentedlist>
-
- <segmentedlist>
- <segtitle>&testsuites;</segtitle>
-
- <seglistitem>
- <seg>None</seg>
- </seglistitem>
- </segmentedlist>
-
- <segmentedlist>
- <segtitle>&before;</segtitle>
-
- <seglistitem>
- <seg>None</seg>
- </seglistitem>
- </segmentedlist>
-
</appendix>
diff --git a/BOOK/boot/x86-chapter.xml b/BOOK/boot/x86-chapter.xml
index 1569883..62a6928 100644
--- a/BOOK/boot/x86-chapter.xml
+++ b/BOOK/boot/x86-chapter.xml
@@ -21,13 +21,12 @@
<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="common/whatnext.xml"/>
</chapter>
diff --git a/BOOK/boot/x86/grub-build.xml b/BOOK/boot/x86/grub-build.xml
index e0fa2f1..587d862 100644
--- a/BOOK/boot/x86/grub-build.xml
+++ b/BOOK/boot/x86/grub-build.xml
@@ -28,46 +28,11 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='p3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='p4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='p5'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='p6'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='p7'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='p8'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='a'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="aa"><userinput>./configure --prefix=/usr \
- --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+<screen os="ab"><userinput>./configure --prefix=/usr \
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --sysconfdir=/etc</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/x86/grub.xml"
@@ -81,18 +46,7 @@
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="ab"><userinput>make DESTDIR=${CLFS} install
-mkdir -v ${CLFS}/boot/grub
-cp -v ${CLFS}/usr/lib/grub/*/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
-
- <para os="ac">The directory in
- <filename class="directory">${CLFS}/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">${CLFS}/boot/grub</filename> directory. Most users will
- copy the <filename>e2fs_stage1_5</filename> and/or
- <filename>reiserfs_stage1_5</filename> files.</para>
+<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
</sect2>
diff --git a/BOOK/boot/x86/grub.xml b/BOOK/boot/x86/grub.xml
deleted file mode 100644
index e6e949c..0000000
--- a/BOOK/boot/x86/grub.xml
+++ /dev/null
@@ -1,106 +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-boot-grub">
- <?dbhtml filename="grub.html"?>
-
- <title>Making the Temporary System Bootable</title>
-
- <indexterm zone="ch-boot-grub">
- <primary sortas="a-GRUB">GRUB</primary>
- <secondary>boot, configuring</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>dd if=${CLFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=${CLFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='g'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='j'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='k'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='l'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='m'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='n'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='o'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='p'])"/>
-
-<screen><userinput>cat > ${CLFS}/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>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86/grub.xml"
- xpointer="xpointer(//*[@os='q'])"/>
-
-<screen os="r"><userinput>cat >> ${CLFS}/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>
-
-</sect1>
diff --git a/BOOK/boot/x86_64-64-chapter.xml b/BOOK/boot/x86_64-64-chapter.xml
index b37e2fb..504709f 100644
--- a/BOOK/boot/x86_64-64-chapter.xml
+++ b/BOOK/boot/x86_64-64-chapter.xml
@@ -21,15 +21,13 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/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-64/bin86.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo-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="x86_64-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_64-64/lilo.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
</chapter>
diff --git a/BOOK/boot/x86_64-chapter.xml b/BOOK/boot/x86_64-chapter.xml
index 71b60cb..dbcc123 100644
--- a/BOOK/boot/x86_64-chapter.xml
+++ b/BOOK/boot/x86_64-chapter.xml
@@ -21,14 +21,13 @@
<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/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="common/whatnext.xml"/>
</chapter>
diff --git a/BOOK/boot/x86_64/grub-build.xml b/BOOK/boot/x86_64/grub-build.xml
deleted file mode 100644
index 9af10ab..0000000
--- a/BOOK/boot/x86_64/grub-build.xml
+++ /dev/null
@@ -1,103 +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-boot-grub-build" role="wrap">
- <?dbhtml filename="grub-build.html"?>
-
- <title>GRUB-&grub-version;</title>
-
- <indexterm zone="ch-boot-grub-build">
- <primary sortas="a-GRUB">GRUB</primary>
- <secondary>boot</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/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-build.xml"
- xpointer="xpointer(//*[@os='n1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='p3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='p4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='p5'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='p6'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='p7'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='p8'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=/usr \
- --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='ab'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub-build.xml"
- xpointer="xpointer(//*[@os='ac'])"/>
-
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-grub" role="."/></para>
-
- </sect2>
-
-</sect1>
commit 7df00c28f11639de001ed2341ccd254d211b37c5
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Jan 22 15:12:36 2011 -0500
Update Date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 854257e..fb4e6f0 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "01"> <!-- Use two digits -->
<!ENTITY month_name "January">
-<!ENTITY day "21"> <!-- Use two digits -->
+<!ENTITY day "22"> <!-- Use two digits -->
<!ENTITY year "2011"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 9c3999cc52175da364616c297c380b5605488554
Author: Joe Ciccone <jciccone at gmail.com>
Date: Fri Jan 21 17:16:35 2011 -0500
Update Date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 5f0b723..854257e 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "01"> <!-- Use two digits -->
<!ENTITY month_name "January">
-<!ENTITY day "10"> <!-- Use two digits -->
+<!ENTITY day "21"> <!-- Use two digits -->
<!ENTITY year "2011"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/appendices/dependencies/x86_64-64.xml | 54 --------------
BOOK/boot/x86-chapter.xml | 3 +-
BOOK/boot/x86/grub-build.xml | 54 +-------------
BOOK/boot/x86/grub.xml | 106 ----------------------------
BOOK/boot/x86_64-64-chapter.xml | 4 +-
BOOK/boot/x86_64-chapter.xml | 3 +-
BOOK/boot/x86_64/grub-build.xml | 103 ---------------------------
BOOK/general.ent | 2 +-
8 files changed, 8 insertions(+), 321 deletions(-)
delete mode 100644 BOOK/boot/x86/grub.xml
delete mode 100644 BOOK/boot/x86_64/grub-build.xml
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list