r2085 - / trunk/BOOK trunk/BOOK/boot/mips trunk/BOOK/boot/mips64 trunk/BOOK/final-system/mips trunk/BOOK/final-system/mips64 trunk/BOOK/introduction/mips trunk/BOOK/introduction/mips64 trunk/BOOK/introduction/mips64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sat Jul 22 20:02:30 PDT 2006


Author: jim
Date: 2006-07-22 21:02:29 -0600 (Sat, 22 Jul 2006)
New Revision: 2085

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/boot/mips/colo-build.xml
   trunk/BOOK/boot/mips64/colo-build.xml
   trunk/BOOK/final-system/mips/colo.xml
   trunk/BOOK/final-system/mips64/colo.xml
   trunk/BOOK/introduction/mips/changelog.xml
   trunk/BOOK/introduction/mips64-64/changelog.xml
   trunk/BOOK/introduction/mips64/changelog.xml
   trunk/BOOK/patches.ent
Log:
 r4780 at server (orig r2202):  jim | 2006-07-22 17:22:09 -0700
  r4779 at server:  jim | 2006-07-22 17:21:02 -0700
  Added Colo Relocation Fix
 



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


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4749
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:4779
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/mips/colo-build.xml
===================================================================
--- trunk/BOOK/boot/mips/colo-build.xml	2006-07-23 00:04:19 UTC (rev 2084)
+++ trunk/BOOK/boot/mips/colo-build.xml	2006-07-23 03:02:29 UTC (rev 2085)
@@ -28,6 +28,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/colo.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/colo.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/colo.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="aa"><userinput>cd tools/elf2rfx

Modified: trunk/BOOK/boot/mips64/colo-build.xml
===================================================================
--- trunk/BOOK/boot/mips64/colo-build.xml	2006-07-23 00:04:19 UTC (rev 2084)
+++ trunk/BOOK/boot/mips64/colo-build.xml	2006-07-23 03:02:29 UTC (rev 2085)
@@ -31,6 +31,14 @@
     xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/colo.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/colo.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/colo-build.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: trunk/BOOK/final-system/mips/colo.xml
===================================================================
--- trunk/BOOK/final-system/mips/colo.xml	2006-07-23 00:04:19 UTC (rev 2084)
+++ trunk/BOOK/final-system/mips/colo.xml	2006-07-23 03:02:29 UTC (rev 2085)
@@ -29,6 +29,11 @@
     RaQ2, Qube, or the Qube2.</para>
   </note>
 
+    <para os="p3">This patch updates Fixes a relocation error when linking with
+    binutils:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&colo-relocation-patch;</userinput></screen>
+
     <para os="b">Compile the Colo package:</para>
 
 <screen><userinput>make</userinput></screen>

Modified: trunk/BOOK/final-system/mips64/colo.xml
===================================================================
--- trunk/BOOK/final-system/mips64/colo.xml	2006-07-23 00:04:19 UTC (rev 2084)
+++ trunk/BOOK/final-system/mips64/colo.xml	2006-07-23 03:02:29 UTC (rev 2085)
@@ -28,6 +28,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/colo.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/introduction/mips/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips/changelog.xml	2006-07-23 00:04:19 UTC (rev 2084)
+++ trunk/BOOK/introduction/mips/changelog.xml	2006-07-23 03:02:29 UTC (rev 2085)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>July 22, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added a patch for Colo to fix a relocation error with
+	  the use of the newer binutils.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 8, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2006-07-23 00:04:19 UTC (rev 2084)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2006-07-23 03:02:29 UTC (rev 2085)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>July 22, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added a patch for Colo to fix a relocation error with
+          the use of the newer binutils.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 8, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64-64/changelog.xml	2006-07-23 00:04:19 UTC (rev 2084)
+++ trunk/BOOK/introduction/mips64-64/changelog.xml	2006-07-23 03:02:29 UTC (rev 2085)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>July 22, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added a patch for Colo to fix a relocation error with
+          the use of the newer binutils.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 8, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-07-23 00:04:19 UTC (rev 2084)
+++ trunk/BOOK/patches.ent	2006-07-23 03:02:29 UTC (rev 2085)
@@ -200,6 +200,10 @@
 <!ENTITY colo-make-patch-md5 "b89575a0e385b5366b19a6b5f176d49b">
 <!ENTITY colo-make-patch-size "2.7 KB">
 
+<!ENTITY colo-relocation-patch "colo-&colo-version;-relocation_fix-1.patch">
+<!ENTITY colo-relocation-patch-md5 "e0607ee1071f2f805ffa1ef1c5b1a766">
+<!ENTITY colo-relocation-patch-size "4 KB">
+
 <!ENTITY dvhtool-fixes-patch "dvhtool-&dvhtool-version;-fixes-1.patch">
 <!ENTITY dvhtool-fixes-patch-md5 "a521b380354b6a0c96b2d6308372749d">
 <!ENTITY dvhtool-fixes-patch-size "6.2 KB">




More information about the cross-lfs mailing list