r1900 - / trunk/BOOK trunk/BOOK/boot/x86_64 trunk/BOOK/final-system/x86_64 trunk/BOOK/introduction/x86_64 trunk/BOOK/materials/x86_64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jul 4 00:46:42 PDT 2006


Author: jim
Date: 2006-07-04 01:46:41 -0600 (Tue, 04 Jul 2006)
New Revision: 1900

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/boot/x86_64/grub-build.xml
   trunk/BOOK/final-system/x86_64/grub.xml
   trunk/BOOK/introduction/x86_64/changelog.xml
   trunk/BOOK/materials/x86_64/patches.xml
Log:
 r4311 at server (orig r1989):  jim | 2006-07-03 23:47:13 -0700
  r4309 at server:  jim | 2006-07-03 23:46:40 -0700
  Added x86 Grub disk geometry patch to x86_64
 



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


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4308
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:4309
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_64/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86_64/grub-build.xml	2006-07-04 07:46:33 UTC (rev 1899)
+++ trunk/BOOK/boot/x86_64/grub-build.xml	2006-07-04 07:46:41 UTC (rev 1900)
@@ -24,6 +24,14 @@
 
     <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='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/x86_64/grub.xml
===================================================================
--- trunk/BOOK/final-system/x86_64/grub.xml	2006-07-04 07:46:33 UTC (rev 1899)
+++ trunk/BOOK/final-system/x86_64/grub.xml	2006-07-04 07:46:41 UTC (rev 1900)
@@ -22,10 +22,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/grub.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>

Modified: trunk/BOOK/introduction/x86_64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/x86_64/changelog.xml	2006-07-04 07:46:33 UTC (rev 1899)
+++ trunk/BOOK/introduction/x86_64/changelog.xml	2006-07-04 07:46:41 UTC (rev 1900)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>July 4, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added x86 Grub disk geometry patch to x86_64.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+
       <para>December 09, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/x86_64/patches.xml
===================================================================
--- trunk/BOOK/materials/x86_64/patches.xml	2006-07-04 07:46:33 UTC (rev 1899)
+++ trunk/BOOK/materials/x86_64/patches.xml	2006-07-04 07:46:41 UTC (rev 1900)
@@ -29,6 +29,10 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='grub-disk-patch'])"/>
+
     <varlistentry os="perl-multilib-patch">
       <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>
       <listitem>




More information about the cross-lfs mailing list