r1931 - / 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
Sat Jul 8 00:56:19 PDT 2006


Author: jim
Date: 2006-07-08 01:56:14 -0600 (Sat, 08 Jul 2006)
New Revision: 1931

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:
 r4397 at server (orig r2027):  jim | 2006-07-08 00:55:06 -0700
  r4394 at server:  jim | 2006-07-08 00:53:37 -0700
  Updates to Linux MIPS Patches
 



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


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4387
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:4394
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/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips/kernel.xml	2006-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/boot/mips/kernel.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -35,6 +35,14 @@
     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-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/boot/mips64/kernel.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -35,6 +35,14 @@
     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-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/bootable/mips/kernel.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -25,11 +25,15 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <para os="ba">The following patch merges changes from Linux-MIPS.org into
+    <para os="ba">The following patch merges changes from Linux-MIPS into
     the kernel:</para>
 
 <screen os="bb"><userinput>patch -Np1 -i ../&linux-mips-patch;</userinput></screen>
 
+    <para os="bc">The following patch merges updates for Linux-MIPS kernel:</para>
+
+<screen os="bd"><userinput>patch -Np1 -i ../&linux-mips_fixes-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-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/introduction/mips/changelog.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -32,7 +32,20 @@
     </listitem>
 
 -->
+
     <listitem>
+      <para>July 8, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated MIPS Patches linux-2.6.17.4-mips-1.patch is the merge
+	  of Linux MIPS and Kernel.org GIT trees. Linux 2.6.17.4-mips_fixes-1.patch are
+	  updates not approved by Linux MIPS for addition, but are required for a working
+	  system.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 14, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2006-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -34,6 +34,18 @@
 -->
 
     <listitem>
+      <para>July 8, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated MIPS Patches linux-2.6.17.4-mips-1.patch is the merge
+          of Linux MIPS and Kernel.org GIT trees. Linux 2.6.17.4-mips_fixes-1.patch are
+          updates not approved by Linux MIPS for addition, but are required for a working
+          system.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 14, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64-64/changelog.xml	2006-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/introduction/mips64-64/changelog.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -34,6 +34,18 @@
 -->
 
     <listitem>
+      <para>July 8, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated MIPS Patches linux-2.6.17.4-mips-1.patch is the merge
+          of Linux MIPS and Kernel.org GIT trees. Linux 2.6.17.4-mips_fixes-1.patch are
+          updates not approved by Linux MIPS for addition, but are required for a working
+          system.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 14, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2006-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/materials/mips/patches.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -70,6 +70,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry os="linux-mips_fixes-patch">
+      <term>Linux MIPS Fixes Patch - <token>&linux-mips_fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&linux-mips_fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&linux-mips_fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry os="mktemp-update-patch">
       <term>Mktemp Config Update Patch - <token>&mktemp-update-patch-size;</token>:</term>
       <listitem>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2006-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/materials/mips64/patches.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -54,6 +54,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-mips_fixes-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='mktemp-update-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-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2006-07-08 07:56:14 UTC (rev 1931)
@@ -50,6 +50,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-mips_fixes-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='mktemp-update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-07-08 07:55:56 UTC (rev 1930)
+++ trunk/BOOK/patches.ent	2006-07-08 07:56:14 UTC (rev 1931)
@@ -209,9 +209,13 @@
 <!ENTITY glibc-mips-patch-size "1 KB">
 
 <!ENTITY linux-mips-patch "linux-&linux-version;-mips-1.patch">
-<!ENTITY linux-mips-patch-md5 "2b6dd81e8321b12acd736a8445411dd9">
-<!ENTITY linux-mips-patch-size "1 MB">
+<!ENTITY linux-mips-patch-md5 "4b2ba3e27f3b9bc6490a1693ce40c833">
+<!ENTITY linux-mips-patch-size "132 KB">
 
+<!ENTITY linux-mips_fixes-patch "linux-&linux-version;-mips_fixes-1.patch">
+<!ENTITY linux-mips_fixes-patch-md5 "c2b8e370175f4c2121541654952de0c9">
+<!ENTITY linux-mips_fixes-patch-size "8 KB">
+
 <!-- this is also used for ppc64 -->
 
 <!ENTITY util-linux-mips64-patch "util-linux-&util-linux-version;-mips64_fix-1.patch">




More information about the cross-lfs mailing list