r735 - in trunk/BOOK: . boot/x86_64-64 final-system/x86_64-64 introduction/x86_64-64 materials/x86_64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Nov 20 23:11:05 PST 2005


Author: jim
Date: 2005-11-21 00:11:01 -0700 (Mon, 21 Nov 2005)
New Revision: 735

Modified:
   trunk/BOOK/
   trunk/BOOK/boot/x86_64-64/grub-build.xml
   trunk/BOOK/final-system/x86_64-64/grub.xml
   trunk/BOOK/introduction/x86_64-64/changelog.xml
   trunk/BOOK/materials/x86_64-64/patches.xml
   trunk/BOOK/patches.ent
Log:
 r748 at server:  jim | 2005-11-20 23:06:45 -0800
 Added: Grub pure64 patch. Great Work Joe Ciccone



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:747
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:748
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/x86_64-64/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/grub-build.xml	2005-11-21 07:10:43 UTC (rev 734)
+++ trunk/BOOK/boot/x86_64-64/grub-build.xml	2005-11-21 07:11:01 UTC (rev 735)
@@ -27,10 +27,18 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86_64-64/grub.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86_64-64/grub.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub-build.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="${CC} -m32 -static" ./configure --prefix=${LFS}/usr</userinput></screen>
+<screen><userinput>./configure --prefix=${LFS}/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub-build.xml"

Modified: trunk/BOOK/final-system/x86_64-64/grub.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/grub.xml	2005-11-21 07:10:43 UTC (rev 734)
+++ trunk/BOOK/final-system/x86_64-64/grub.xml	2005-11-21 07:11:01 UTC (rev 735)
@@ -24,11 +24,15 @@
     href="../x86/grub.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <para os="p1">This patch updates grub to work in a Pure64 environment:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&grub-pure64-patch;</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="gcc -m32 -static" ./configure --prefix=/usr</userinput></screen>
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub.xml"

Modified: trunk/BOOK/introduction/x86_64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/x86_64-64/changelog.xml	2005-11-21 07:10:43 UTC (rev 734)
+++ trunk/BOOK/introduction/x86_64-64/changelog.xml	2005-11-21 07:11:01 UTC (rev 735)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>November 20, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Add Patch to allow Grub to build in a Pure 64 environment. Great Work
+          Joe Ciccone!!!.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 14, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/x86_64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/x86_64-64/patches.xml	2005-11-21 07:10:43 UTC (rev 734)
+++ trunk/BOOK/materials/x86_64-64/patches.xml	2005-11-21 07:11:01 UTC (rev 735)
@@ -32,6 +32,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry os="grub_pure64-patch">
+      <term>Grub Pure 64 Patch - 4 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;grub/&grub-pure64-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
 </sect1>

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2005-11-21 07:10:43 UTC (rev 734)
+++ trunk/BOOK/patches.ent	2005-11-21 07:11:01 UTC (rev 735)
@@ -65,6 +65,8 @@
 
 <!ENTITY coreutils-x86_uname-patch "coreutils-&coreutils-version;-uname-1.patch">
 
+<!ENTITY grub-pure64-patch "grub-&grub-version;-pure64-1.patch">
+
 <!ENTITY linux-libc-headers-x86_64_biarch-patch "linux-libc-headers-&linux-libc-headers-version;-x86_64_biarch-1.patch">
 
 <!-- Start of ppc patches -->




More information about the cross-lfs mailing list