[Clfs-commits] commit: r4773 - in /trunk/BOOK: boot/x86/grub-build.xml boot/x86_64/grub-build.xml final-system/x86/grub.xml final-system/x86_64/grub.xml introduction/common/changelog.xml materials/x86/patches.xml materials/x86_64/patches.xml patches.ent

svn at cross-lfs.org svn at cross-lfs.org
Fri Feb 27 21:04:27 PST 2009


Author: jim
Date: Sat Feb 28 05:04:27 2009
New Revision: 4773

Log:
Grub Update - Thank you Zackcd ..

Modified:
    trunk/BOOK/boot/x86/grub-build.xml
    trunk/BOOK/boot/x86_64/grub-build.xml
    trunk/BOOK/final-system/x86/grub.xml
    trunk/BOOK/final-system/x86_64/grub.xml
    trunk/BOOK/introduction/common/changelog.xml
    trunk/BOOK/materials/x86/patches.xml
    trunk/BOOK/materials/x86_64/patches.xml
    trunk/BOOK/patches.ent

Modified: trunk/BOOK/boot/x86/grub-build.xml
==============================================================================
--- trunk/BOOK/boot/x86/grub-build.xml (original)
+++ trunk/BOOK/boot/x86/grub-build.xml Sat Feb 28 05:04:27 2009
@@ -33,6 +33,30 @@
     <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"

Modified: trunk/BOOK/boot/x86_64/grub-build.xml
==============================================================================
--- trunk/BOOK/boot/x86_64/grub-build.xml (original)
+++ trunk/BOOK/boot/x86_64/grub-build.xml Sat Feb 28 05:04:27 2009
@@ -27,20 +27,36 @@
     xpointer="xpointer(//*[@os='n1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <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"

Modified: trunk/BOOK/final-system/x86/grub.xml
==============================================================================
--- trunk/BOOK/final-system/x86/grub.xml (original)
+++ trunk/BOOK/final-system/x86/grub.xml Sat Feb 28 05:04:27 2009
@@ -30,18 +30,28 @@
       <ulink url="http://trac.cross-lfs.org/wiki/bootloaders"/></para>
     </note>
 
-    <para os="p1">GRUB has an issue where it sometimes doesn't detect
+    <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>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&grub-use_mmap-patch;</userinput></screen>
+
+    <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="p2"><userinput>patch -Np1 -i ../&grub-fixes-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&grub-fixes-patch;</userinput></screen>
 
-    <para os="p3">By default, GRUB doesn't support ext2 filesystems with 256-byte inodes. Fix this by applying the following patch:</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="p4"><userinput>patch -Np1 -i ../&grub-256byte_inode-patch;</userinput></screen>
+<screen os="p6"><userinput>patch -Np1 -i ../&grub-256byte_inode-patch;</userinput></screen>
+
+    <para os="p7">By default, GRUB doesn't support ext4 filesystems. Fix this by applying the following patch:</para>
+
+<screen os="p8"><userinput>patch -Np1 -i ../&grub-ext4-patch;</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>

Modified: trunk/BOOK/final-system/x86_64/grub.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64/grub.xml (original)
+++ trunk/BOOK/final-system/x86_64/grub.xml Sat Feb 28 05:04:27 2009
@@ -24,12 +24,6 @@
     href="../x86/grub.xml"
     xpointer="xpointer(//*[@os='n1'])"/>
 
-    <para os="ap3">GRUB has an issue that can cause it to segfault when you
-    try to configure a drive to utilize GRUB on x86_64 machines. The following
-    patch fixes this problem:</para>
-
-<screen os="ap4"><userinput>patch -Np1 -i ../&grub-use_mmap-patch;</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -45,6 +39,22 @@
     <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"

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sat Feb 28 05:04:27 2009
@@ -44,6 +44,10 @@
         </listitem>
         <listitem>
           <para>[Jim] - Updated Udev to 139.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Updated Grub Instructions. Included Patch for ext4. 
+          Thank you Zack!!!.</para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/materials/x86/patches.xml
==============================================================================
--- trunk/BOOK/materials/x86/patches.xml (original)
+++ trunk/BOOK/materials/x86/patches.xml Sat Feb 28 05:04:27 2009
@@ -30,6 +30,15 @@
       </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>
@@ -39,6 +48,14 @@
       </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"

Modified: trunk/BOOK/materials/x86_64/patches.xml
==============================================================================
--- trunk/BOOK/materials/x86_64/patches.xml (original)
+++ trunk/BOOK/materials/x86_64/patches.xml Sat Feb 28 05:04:27 2009
@@ -31,16 +31,15 @@
 
     <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'])"/>
 
-    <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>
+    <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>

Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent (original)
+++ trunk/BOOK/patches.ent Sat Feb 28 05:04:27 2009
@@ -224,6 +224,10 @@
 <!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-1.patch">
 <!ENTITY grub-fixes-patch-md5 "6f095b98bde1db8d5b1a7ceef96ca351">
 <!ENTITY grub-fixes-patch-size "129 KB">




More information about the Clfs-commits mailing list