r1670 - / trunk/BOOK trunk/BOOK/boot/x86 trunk/BOOK/final-system/x86 trunk/BOOK/introduction/common trunk/BOOK/materials/x86

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon May 29 00:51:15 PDT 2006


Author: jim
Date: 2006-05-29 01:51:13 -0600 (Mon, 29 May 2006)
New Revision: 1670

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/boot/x86/grub-build.xml
   trunk/BOOK/final-system/x86/grub.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/materials/x86/patches.xml
   trunk/BOOK/patches.ent
Log:
 r3675 at server (orig r1718):  jim | 2006-05-28 22:58:19 -0700
  r3673 at server:  jim | 2006-05-28 22:57:55 -0700
  Added: Grub disk geometry patch
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1717
   + b6734a72-470d-0410-b049-f317dca95413:/:1718


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3622
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3673
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/x86/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86/grub-build.xml	2006-05-29 07:49:33 UTC (rev 1669)
+++ trunk/BOOK/boot/x86/grub-build.xml	2006-05-29 07:51:13 UTC (rev 1670)
@@ -24,6 +24,14 @@
 
     <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='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/x86/grub.xml
===================================================================
--- trunk/BOOK/final-system/x86/grub.xml	2006-05-29 07:49:33 UTC (rev 1669)
+++ trunk/BOOK/final-system/x86/grub.xml	2006-05-29 07:51:13 UTC (rev 1670)
@@ -23,6 +23,12 @@
   <sect2 role="installation">
     <title>Installation of GRUB</title>
 
+   <para os="p1">Sometimes grub under Linux 2.6 doesn't detect the disk geometry correctly,
+   which will result in an error message. The error message is
+   Error 24: Attempt to access block outside partition. The following patch fixes this issue:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&grub-disk-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>
     options) are changed. If any environment variables that override default

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-29 07:49:33 UTC (rev 1669)
+++ trunk/BOOK/general.ent	2006-05-29 07:51:13 UTC (rev 1670)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20060525">
+<!ENTITY version "SVN-20060528">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
 <!ENTITY version-x86_64-64 "&version;-x86_64-Pure64">
@@ -15,7 +15,7 @@
 <!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "May 25, 2006">
+<!ENTITY releasedate "May 28, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-05-29 07:49:33 UTC (rev 1669)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-05-29 07:51:13 UTC (rev 1670)
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>May 28, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added a patch to Grub to prevent.
+	   Error 24: Attempt to access block outside partition.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 25, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/x86/patches.xml
===================================================================
--- trunk/BOOK/materials/x86/patches.xml	2006-05-29 07:49:33 UTC (rev 1669)
+++ trunk/BOOK/materials/x86/patches.xml	2006-05-29 07:51:13 UTC (rev 1670)
@@ -30,6 +30,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry os="grub-disk-patch">
+      <term>Grub Disk Geometry Fix - <token>&grub-disk-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;grub/&grub-disk-patch;"/></para>
+        <para>MD5 sum: <literal>&grub-disk-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-05-29 07:49:33 UTC (rev 1669)
+++ trunk/BOOK/patches.ent	2006-05-29 07:51:13 UTC (rev 1670)
@@ -246,6 +246,10 @@
 <!ENTITY coreutils-x86_uname-patch-md5 "c05b735710fbd62239588c07084852a0">
 <!ENTITY coreutils-x86_uname-patch-size "4.5 KB">
 
+<!ENTITY grub-disk-patch "grub-&grub-version;-disk_geometry-1.patch">
+<!ENTITY grub-disk-patch-md5 "2d29c8ad60d548f2abfaec79ea8bc268">
+<!ENTITY grub-disk-patch-size "28 KB">
+
 <!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-1.patch">
 <!ENTITY lilo-cross-x86_64-patch-md5 "00487cebd84e9958dddb3adf357babeb">
 <!ENTITY lilo-cross-x86_64-patch-size "1 KB">




More information about the cross-lfs mailing list