r1303 - / trunk/BOOK trunk/BOOK/boot/mips trunk/BOOK/boot/mips64 trunk/BOOK/bootable/mips trunk/BOOK/introduction/mips trunk/BOOK/introduction/mips64 trunk/BOOK/introduction/mips64-64 trunk/BOOK/materials/mips trunk/BOOK/materials/mips64 trunk/BOOK/materials/mips64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Mar 20 18:25:10 PST 2006


Author: jim
Date: 2006-03-20 19:24:22 -0700 (Mon, 20 Mar 2006)
New Revision: 1303

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/boot/mips/kernel.xml
   trunk/BOOK/boot/mips64/kernel.xml
   trunk/BOOK/bootable/mips/kernel.xml
   trunk/BOOK/introduction/mips/changelog.xml
   trunk/BOOK/introduction/mips64-64/changelog.xml
   trunk/BOOK/introduction/mips64/changelog.xml
   trunk/BOOK/materials/mips/patches.xml
   trunk/BOOK/materials/mips64-64/patches.xml
   trunk/BOOK/materials/mips64/patches.xml
   trunk/BOOK/patches.ent
Log:
 r2664 at server (orig r1303):  jim | 2006-03-20 18:19:53 -0800
  r2663 at server:  jim | 2006-03-20 18:19:30 -0800
  Updated MIPS patches for linux
 



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


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

Modified: trunk/BOOK/boot/mips/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips/kernel.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/boot/mips/kernel.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -35,14 +35,6 @@
     xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: trunk/BOOK/boot/mips64/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips64/kernel.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/boot/mips64/kernel.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -35,14 +35,6 @@
     xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: trunk/BOOK/bootable/mips/kernel.xml
===================================================================
--- trunk/BOOK/bootable/mips/kernel.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/bootable/mips/kernel.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -30,11 +30,6 @@
 
 <screen os="bb"><userinput>patch -Np1 -i ../&linux-mips-patch;</userinput></screen>
 
-    <para os="bc">The following patch fixes issue related to specific MIPS based
-    machines into the kernel:</para>
-
-<screen os="bd"><userinput>patch -Np1 -i ../&linux-mips_fix-patch;</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>

Modified: trunk/BOOK/introduction/mips/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips/changelog.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/introduction/mips/changelog.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>March 20, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated Linux patch to 2.6.16.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 19, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>March 20, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated Linux patch to 2.6.16.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 19, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64-64/changelog.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/introduction/mips64-64/changelog.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>March 20, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated Linux patch to 2.6.16.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 19, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/materials/mips/patches.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -73,21 +73,13 @@
     </varlistentry>
 
     <varlistentry os="linux-mips-patch">
-      <term>Linux-MIPS Merge Patch - 3.8 MB:</term>
+      <term>Linux-MIPS Merge Patch - 864 KB:</term>
       <listitem>
         <para><ulink
         url="&patches-root;linux/&linux-mips-patch;"/></para>
       </listitem>
     </varlistentry>
 
-    <varlistentry os="linux-mips_fix-patch">
-      <term>Linux MIPS Fixes Patch - 13 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux/&linux-mips_fix-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="linux-libc-headers-mips_atomic_fix-patch">
       <term>Linux Headers Atomic Fix Patch - 1 KB:</term>
       <listitem>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/materials/mips64/patches.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -61,10 +61,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='linux-mips_fix-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='linux-libc-headers-mips_atomic_fix-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2006-03-21 02:24:22 UTC (rev 1303)
@@ -58,10 +58,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='linux-mips_fix-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='linux-libc-headers-mips_atomic_fix-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-03-20 21:09:02 UTC (rev 1302)
+++ trunk/BOOK/patches.ent	2006-03-21 02:24:22 UTC (rev 1303)
@@ -106,8 +106,6 @@
 
 <!-- Start of mips/mips64 patches -->
 
-<!ENTITY arcload-fixes-patch "arcload-&arcload-version;-fixes-1.patch">
-
 <!ENTITY colo-make-patch "colo-&colo-version;-make_fix-1.patch">
 
 <!ENTITY dvhtool-fixes-patch "dvhtool-&dvhtool-version;-fixes-1.patch">
@@ -128,7 +126,6 @@
 <!ENTITY lfs-bootscripts-raq2-patch "lfs-bootscripts-raq2-8.patch">
 
 <!ENTITY linux-mips-patch "linux-&linux-version;-mips-1.patch">
-<!ENTITY linux-mips_fix-patch "linux-&linux-version;-mips_fix-1.patch">
 
 <!ENTITY linux-libc-headers-mips_tls-patch "linux-libc-headers-&linux-libc-headers-version;-mips_tls-1.patch">
 




More information about the cross-lfs mailing list