r1797 - / trunk/BOOK trunk/BOOK/final-system/mips trunk/BOOK/materials/mips trunk/BOOK/materials/mips64 trunk/BOOK/materials/mips64-64 trunk/BOOK/materials/ppc64 trunk/BOOK/testsuite-tools/mips

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jun 19 21:22:50 PDT 2006


Author: jim
Date: 2006-06-19 22:22:49 -0600 (Mon, 19 Jun 2006)
New Revision: 1797

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/final-system/mips/file.xml
   trunk/BOOK/final-system/mips/grep.xml
   trunk/BOOK/final-system/mips/module-init-tools.xml
   trunk/BOOK/materials/mips/patches.xml
   trunk/BOOK/materials/mips64-64/patches.xml
   trunk/BOOK/materials/mips64/patches.xml
   trunk/BOOK/materials/ppc64/patches.xml
   trunk/BOOK/patches.ent
   trunk/BOOK/testsuite-tools/mips/expect.xml
Log:
 r3998 at server (orig r1858):  jim | 2006-06-19 21:16:04 -0700
  r3997 at server:  jim | 2006-06-19 21:10:12 -0700
  Patches Updates - Rename mips_config_update to config_update. Make them more Generic
 



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


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3983
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:3997
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/final-system/mips/file.xml
===================================================================
--- trunk/BOOK/final-system/mips/file.xml	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/final-system/mips/file.xml	2006-06-20 04:22:49 UTC (rev 1797)
@@ -24,7 +24,7 @@
     <para os="m1">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen os="m2"><userinput>patch -Np1 -i ../&file-mips_update-patch;</userinput></screen>
+<screen os="m2"><userinput>patch -Np1 -i ../&file-config_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"

Modified: trunk/BOOK/final-system/mips/grep.xml
===================================================================
--- trunk/BOOK/final-system/mips/grep.xml	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/final-system/mips/grep.xml	2006-06-20 04:22:49 UTC (rev 1797)
@@ -24,7 +24,7 @@
     <para os="p1">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&grep-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&grep-config_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"

Modified: trunk/BOOK/final-system/mips/module-init-tools.xml
===================================================================
--- trunk/BOOK/final-system/mips/module-init-tools.xml	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/final-system/mips/module-init-tools.xml	2006-06-20 04:22:49 UTC (rev 1797)
@@ -24,7 +24,7 @@
     <para os="p1">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&module-init-tools-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&module-init-tools-config_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/materials/mips/patches.xml	2006-06-20 04:22:49 UTC (rev 1797)
@@ -21,21 +21,21 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="expect-mips_update-patch">
-      <term>Expect Config Update Patch - <token>&expect-mips_update-patch-size;</token>:</term>
+    <varlistentry os="expect-config_update-patch">
+      <term>Expect Config Update Patch - <token>&expect-config_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;expect/&expect-mips_update-patch;"/></para>
-        <para>MD5 sum: <literal>&expect-mips_update-patch-md5;</literal></para>
+        url="&patches-root;expect/&expect-config_update-patch;"/></para>
+        <para>MD5 sum: <literal>&expect-config_update-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
-    <varlistentry os="file-mips_update-patch">
-      <term>File Config Update Patch -  <token>&file-mips_update-patch-size;</token>:</term>
+    <varlistentry os="file-config_update-patch">
+      <term>File Config Update Patch -  <token>&file-config_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;file/&file-mips_update-patch;"/></para>
-        <para>MD5 sum: <literal>&file-mips_update-patch-md5;</literal></para>
+        url="&patches-root;file/&file-config_update-patch;"/></para>
+        <para>MD5 sum: <literal>&file-config_update-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -52,12 +52,12 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="grep-mips_update-patch">
-      <term>Grep Config Update Patch - <token>&grep-mips_update-patch-size;</token>:</term>
+    <varlistentry os="grep-config_update-patch">
+      <term>Grep Config Update Patch - <token>&grep-config_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;grep/&grep-mips_update-patch;"/></para>
-        <para>MD5 sum: <literal>&grep-mips_update-patch-md5;</literal></para>
+        url="&patches-root;grep/&grep-config_update-patch;"/></para>
+        <para>MD5 sum: <literal>&grep-config_update-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -79,12 +79,12 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="module-init-tools-mips_update-patch">
-      <term>Module-init-tools Config Update Patch - <token>&module-init-tools-mips_update-patch-size;</token>:</term>
+    <varlistentry os="module-init-tools-config_update-patch">
+      <term>Module-init-tools Config Update Patch - <token>&module-init-tools-config_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;module-init-tools/&module-init-tools-mips_update-patch;"/></para>
-        <para>MD5 sum: <literal>&module-init-tools-mips_update-patch-md5;</literal></para>
+        url="&patches-root;module-init-tools/&module-init-tools-config_update-patch;"/></para>
+        <para>MD5 sum: <literal>&module-init-tools-config_update-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/materials/mips64/patches.xml	2006-06-20 04:22:49 UTC (rev 1797)
@@ -30,11 +30,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='expect-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='expect-config_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='file-config_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/patches.xml"
@@ -46,7 +46,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='grep-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='grep-config_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
@@ -58,7 +58,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='module-init-tools-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='module-init-tools-config_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/patches.xml"

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2006-06-20 04:22:49 UTC (rev 1797)
@@ -22,11 +22,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='expect-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='expect-config_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='file-config_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64-64/patches.xml"
@@ -42,7 +42,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='grep-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='grep-config_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
@@ -54,7 +54,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='module-init-tools-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='module-init-tools-config_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips64/patches.xml"

Modified: trunk/BOOK/materials/ppc64/patches.xml
===================================================================
--- trunk/BOOK/materials/ppc64/patches.xml	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/materials/ppc64/patches.xml	2006-06-20 04:22:49 UTC (rev 1797)
@@ -29,12 +29,12 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="mktemp-update-patch">
-      <term>Mktemp Config Update Patch - <token>&mktemp-update-patch-size;</token>:</term>
+    <varlistentry os="mktemp-config_update-patch">
+      <term>Mktemp Config Update Patch - <token>&mktemp-config_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;mktemp/&mktemp-update-patch;"/></para>
-        <para>MD5 sum: <literal>&mktemp-update-patch-md5;</literal></para>
+        url="&patches-root;mktemp/&mktemp-config_update-patch;"/></para>
+        <para>MD5 sum: <literal>&mktemp-config_update-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/patches.ent	2006-06-20 04:22:49 UTC (rev 1797)
@@ -156,6 +156,30 @@
 <!ENTITY gcc-pure64-patch-md5 "cea9bf46663392d627de81e2456698e3">
 <!ENTITY gcc-pure64-patch-size "15 KB">
 
+<!-- Start of Config Update patches -->
+
+<!ENTITY expect-config_update-patch "expect-&expect-version;-config_update-1.patch">
+<!ENTITY expect-config_update-patch-md5 "eb8989a8baf11e0f02efbdf7e6843fc1">
+<!ENTITY expect-config_update-patch-size "51 KB">
+
+<!ENTITY file-config_update-patch "file-&file-version;-config_update-1.patch">
+<!ENTITY file-config_update-patch-md5 "aee7ed8aa5cf781ae8c58d04194ce45a">
+<!ENTITY file-config_update-patch-size "33 KB">
+
+<!ENTITY grep-config_update-patch "grep-&grep-version;-config_update-1.patch">
+<!ENTITY grep-config_update-patch-md5 "085690e21bf2c8c27aca987f73389c90">
+<!ENTITY grep-config_update-patch-size "48 KB">
+
+<!ENTITY module-init-tools-config_update-patch "module-init-tools-&module-init-tools-version;-config_update-1.patch">
+<!ENTITY module-init-tools-config_update-patch-md5 "bdc816dd354e254f8053751286903f1c">
+<!ENTITY module-init-tools-config_update-patch-size "33 KB">
+
+<!-- Multiple Architecture patches -->
+
+<!ENTITY mktemp-update-patch "mktemp-&mktemp-version;-config_update-1.patch">
+<!ENTITY mktemp-update-patch-md5 "2eab6432dbf4d4447b85435363c6a557">
+<!ENTITY mktemp-update-patch-size "56 KB">
+
 <!-- Start of Alpha patches -->
 
 <!ENTITY aboot-alpha-patch "aboot-&aboot-version;-kernel26_gcc4_fixes-2.patch">
@@ -172,35 +196,16 @@
 <!ENTITY dvhtool-fixes-patch-md5 "a521b380354b6a0c96b2d6308372749d">
 <!ENTITY dvhtool-fixes-patch-size "6.2 KB">
 
-<!ENTITY expect-mips_update-patch "expect-&expect-version;-mips_config_update-1.patch">
-<!ENTITY expect-mips_update-patch-md5 "eb8989a8baf11e0f02efbdf7e6843fc1">
-<!ENTITY expect-mips_update-patch-size "51 KB">
-
-<!ENTITY file-mips_update-patch "file-&file-version;-mips_config_update-1.patch">
-<!ENTITY file-mips_update-patch-md5 "aee7ed8aa5cf781ae8c58d04194ce45a">
-<!ENTITY file-mips_update-patch-size "33 KB">
-
 <!ENTITY glibc-mips-patch "glibc-&glibc-version;-mips_fixes-1.patch">
 <!ENTITY glibc-mips-patch-md5 "d1b48de82f31118da51bea1d9c3c7c2c">
 <!ENTITY glibc-mips-patch-size "1 KB">
 
-<!ENTITY grep-mips_update-patch "grep-&grep-version;-mips_config_update-1.patch">
-<!ENTITY grep-mips_update-patch-md5 "085690e21bf2c8c27aca987f73389c90">
-<!ENTITY grep-mips_update-patch-size "48 KB">
-
 <!ENTITY linux-mips-patch "linux-&linux-version;-mips-1.patch">
 <!ENTITY linux-mips-patch-md5 "2b6dd81e8321b12acd736a8445411dd9">
 <!ENTITY linux-mips-patch-size "1 MB">
 
 <!-- this is also used for ppc64 -->
-<!ENTITY mktemp-update-patch "mktemp-&mktemp-version;-config_update-1.patch">
-<!ENTITY mktemp-update-patch-md5 "2eab6432dbf4d4447b85435363c6a557">
-<!ENTITY mktemp-update-patch-size "56 KB">
 
-<!ENTITY module-init-tools-mips_update-patch "module-init-tools-&module-init-tools-version;-mips_config_update-1.patch">
-<!ENTITY module-init-tools-mips_update-patch-md5 "bdc816dd354e254f8053751286903f1c">
-<!ENTITY module-init-tools-mips_update-patch-size "33 KB">
-
 <!ENTITY util-linux-mips64-patch "util-linux-&util-linux-version;-mips64_fix-1.patch">
 <!ENTITY util-linux-mips64-patch-md5 "20fb9ad811661059cf3b11ccdf391f5a">
 <!ENTITY util-linux-mips64-patch-size "1 KB">

Modified: trunk/BOOK/testsuite-tools/mips/expect.xml
===================================================================
--- trunk/BOOK/testsuite-tools/mips/expect.xml	2006-06-20 03:55:40 UTC (rev 1796)
+++ trunk/BOOK/testsuite-tools/mips/expect.xml	2006-06-20 04:22:49 UTC (rev 1797)
@@ -35,7 +35,7 @@
 
     <para os="p1">This patch updates config.guess and config.sub for MIPS processors:</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&expect-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&expect-config_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/expect.xml"




More information about the cross-lfs mailing list