[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. fe61c5a65a8adbdd6b4b1c67af3a7d69f6cb53d3
git
git at cross-lfs.org
Fri Sep 7 14:21:42 PDT 2012
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 fe61c5a65a8adbdd6b4b1c67af3a7d69f6cb53d3 (commit)
from d08e6602bcca284aa3ce7bc85656a8a81494cc2b (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 fe61c5a65a8adbdd6b4b1c67af3a7d69f6cb53d3
Author: William Harrington <kb0iic at gmail.com>
Date: Fri Sep 7 16:21:33 2012 -0500
Update grub information and instructions in Ch7 boot section of x86 books.
diff --git a/BOOK/boot/x86/grub-build.xml b/BOOK/boot/64/grub-build.xml
similarity index 84%
copy from BOOK/boot/x86/grub-build.xml
copy to BOOK/boot/64/grub-build.xml
index 8fbbcff..9b82dbe 100644
--- a/BOOK/boot/x86/grub-build.xml
+++ b/BOOK/boot/64/grub-build.xml
@@ -26,19 +26,13 @@
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='n1'])"/>
-<note>
- <para>Grub2 requires Flex 3.5.35 or greater which has not been installed
- yet. If your host does not have Flex then install it now via the
- distro's package manager.</para>
-</note>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="ab"><userinput>./configure --prefix=/usr \
+<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --sysconfdir=/etc --disable-werror</userinput></screen>
+ --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/x86/grub.xml"
diff --git a/BOOK/boot/x86/grub-build.xml b/BOOK/boot/multilib/grub-build.xml
similarity index 84%
copy from BOOK/boot/x86/grub-build.xml
copy to BOOK/boot/multilib/grub-build.xml
index 8fbbcff..9b82dbe 100644
--- a/BOOK/boot/x86/grub-build.xml
+++ b/BOOK/boot/multilib/grub-build.xml
@@ -26,19 +26,13 @@
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='n1'])"/>
-<note>
- <para>Grub2 requires Flex 3.5.35 or greater which has not been installed
- yet. If your host does not have Flex then install it now via the
- distro's package manager.</para>
-</note>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="ab"><userinput>./configure --prefix=/usr \
+<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --sysconfdir=/etc --disable-werror</userinput></screen>
+ --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/x86/grub.xml"
diff --git a/BOOK/boot/x86/grub-build.xml b/BOOK/boot/x86/grub-build.xml
index 8fbbcff..b78a60c 100644
--- a/BOOK/boot/x86/grub-build.xml
+++ b/BOOK/boot/x86/grub-build.xml
@@ -26,17 +26,11 @@
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='n1'])"/>
-<note>
- <para>Grub2 requires Flex 3.5.35 or greater which has not been installed
- yet. If your host does not have Flex then install it now via the
- distro's package manager.</para>
-</note>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="ab"><userinput>./configure --prefix=/usr \
+<screen os="ab"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--sysconfdir=/etc --disable-werror</userinput></screen>
diff --git a/BOOK/boot/x86_64-64-chapter.xml b/BOOK/boot/x86_64-64-chapter.xml
index 492fdf2..74c1e68 100644
--- a/BOOK/boot/x86_64-64-chapter.xml
+++ b/BOOK/boot/x86_64-64-chapter.xml
@@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
diff --git a/BOOK/boot/x86_64-chapter.xml b/BOOK/boot/x86_64-chapter.xml
index 78b75ae..64d8364 100644
--- a/BOOK/boot/x86_64-chapter.xml
+++ b/BOOK/boot/x86_64-chapter.xml
@@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
diff --git a/BOOK/introduction/x86/changelog.xml b/BOOK/introduction/x86/changelog.xml
index 09c85d8..7bf04b3 100644
--- a/BOOK/introduction/x86/changelog.xml
+++ b/BOOK/introduction/x86/changelog.xml
@@ -32,6 +32,18 @@
-->
<listitem>
+ <para>07 September 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Remove note about flex not being installed when installing Grub in ch7.</para>
+ </listitem>
+ <listitem>
+ <para>[William Harrington] - Fix grub installation instructions in Ch 7.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>04 September 2012</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/introduction/x86_64-64/changelog.xml b/BOOK/introduction/x86_64-64/changelog.xml
index 3b47be3..f36af0b 100644
--- a/BOOK/introduction/x86_64-64/changelog.xml
+++ b/BOOK/introduction/x86_64-64/changelog.xml
@@ -33,6 +33,18 @@
-->
<listitem>
+ <para>07 September 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Remove note about flex not being installed when installing Grub in ch7.</para>
+ </listitem>
+ <listitem>
+ <para>[William Harrington] - Fix grub installation instructions in Ch 7.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>06 September 2012</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/introduction/x86_64/changelog.xml b/BOOK/introduction/x86_64/changelog.xml
index 3048025..4b63400 100644
--- a/BOOK/introduction/x86_64/changelog.xml
+++ b/BOOK/introduction/x86_64/changelog.xml
@@ -33,6 +33,18 @@
-->
<listitem>
+ <para>07 September 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Remove note about flex not being installed when installing Grub in ch7.</para>
+ </listitem>
+ <listitem>
+ <para>[William Harrington] - Fix grub installation instructions in Ch 7.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>04 September 2012</para>
<itemizedlist>
<listitem>
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/{x86 => 64}/grub-build.xml | 10 ++--------
BOOK/boot/{x86 => multilib}/grub-build.xml | 10 ++--------
BOOK/boot/x86/grub-build.xml | 8 +-------
BOOK/boot/x86_64-64-chapter.xml | 2 +-
BOOK/boot/x86_64-chapter.xml | 2 +-
BOOK/introduction/x86/changelog.xml | 12 ++++++++++++
BOOK/introduction/x86_64-64/changelog.xml | 12 ++++++++++++
BOOK/introduction/x86_64/changelog.xml | 12 ++++++++++++
8 files changed, 43 insertions(+), 25 deletions(-)
copy BOOK/boot/{x86 => 64}/grub-build.xml (84%)
copy BOOK/boot/{x86 => multilib}/grub-build.xml (84%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list