r2243 - / trunk/BOOK trunk/BOOK/boot/alpha trunk/BOOK/boot/mips trunk/BOOK/boot/mips64 trunk/BOOK/boot/ppc trunk/BOOK/boot/ppc64 trunk/BOOK/boot/sparc trunk/BOOK/boot/sparc64 trunk/BOOK/boot/x86 trunk/BOOK/boot/x86_64 trunk/BOOK/bootable/alpha trunk/BOOK/bootable/mips trunk/BOOK/bootable/ppc trunk/BOOK/bootable/ppc64 trunk/BOOK/bootable/sparc trunk/BOOK/bootable/x86 trunk/BOOK/bootable/x86_64 trunk/BOOK/introduction/common trunk/BOOK/materials/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Aug 20 23:23:18 PDT 2006


Author: jim
Date: 2006-08-21 00:23:04 -0600 (Mon, 21 Aug 2006)
New Revision: 2243

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/boot/alpha/kernel.xml
   trunk/BOOK/boot/mips/kernel.xml
   trunk/BOOK/boot/mips64/kernel.xml
   trunk/BOOK/boot/ppc/kernel.xml
   trunk/BOOK/boot/ppc64/kernel.xml
   trunk/BOOK/boot/sparc/kernel.xml
   trunk/BOOK/boot/sparc64/kernel.xml
   trunk/BOOK/boot/x86/kernel.xml
   trunk/BOOK/boot/x86_64/kernel.xml
   trunk/BOOK/bootable/alpha/kernel.xml
   trunk/BOOK/bootable/mips/kernel.xml
   trunk/BOOK/bootable/ppc/kernel.xml
   trunk/BOOK/bootable/ppc64/kernel.xml
   trunk/BOOK/bootable/sparc/kernel.xml
   trunk/BOOK/bootable/x86/kernel.xml
   trunk/BOOK/bootable/x86_64/kernel.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/patches.ent
Log:
 r5161 at server (orig r2372):  jim | 2006-08-20 23:14:37 -0700
  r5159 at server:  jim | 2006-08-20 23:08:14 -0700
   Added Linux Tulip Patch to all Linux 2.6.17.9 builds. Fixes an initialization error.
 



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


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:5157
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:5159
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/alpha/kernel.xml
===================================================================
--- trunk/BOOK/boot/alpha/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/alpha/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -31,6 +31,14 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/alpha/kernel.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 

Modified: trunk/BOOK/boot/mips/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/mips/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -27,6 +27,18 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
@@ -44,10 +56,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/mips64/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips64/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/mips64/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -27,6 +27,18 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
@@ -43,10 +55,6 @@
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/kernel.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 

Modified: trunk/BOOK/boot/ppc/kernel.xml
===================================================================
--- trunk/BOOK/boot/ppc/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/ppc/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -32,6 +32,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/ppc64/kernel.xml
===================================================================
--- trunk/BOOK/boot/ppc64/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/ppc64/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -30,12 +30,20 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <para os="m1">To ensure that your system boots and you can properly run both
-    32 bit and 64 bit binaries, please make sure that you enable support for
-    ELF and emulations for 32bit ELF into the kernel.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/kernel.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/sparc/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/sparc/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -32,6 +32,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/sparc64/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc64/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/sparc64/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -32,6 +32,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/x86/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/x86/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -38,6 +38,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/x86_64/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86_64/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/boot/x86_64/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -30,6 +30,14 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
     <para os="m1">To ensure that your system boots and you can properly run both
     32 bit and 64 bit binaries, please make sure that you enable support for
     ELF and emulations for 32bit ELF into the kernel.</para>

Modified: trunk/BOOK/bootable/alpha/kernel.xml
===================================================================
--- trunk/BOOK/bootable/alpha/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/bootable/alpha/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -25,6 +25,14 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
     <para os="ba">The following patch fixes some inline assembler in the kernel:</para>
 
 <screen os="bb"><userinput>patch -Np1 -i ../&linux-io_fix-patch;</userinput></screen>

Modified: trunk/BOOK/bootable/mips/kernel.xml
===================================================================
--- trunk/BOOK/bootable/mips/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/bootable/mips/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -25,6 +25,14 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
     <para os="ba">The following patch merges changes from Linux-MIPS into
     the kernel:</para>
 

Modified: trunk/BOOK/bootable/ppc/kernel.xml
===================================================================
--- trunk/BOOK/bootable/ppc/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/bootable/ppc/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -27,6 +27,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/bootable/ppc64/kernel.xml
===================================================================
--- trunk/BOOK/bootable/ppc64/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/bootable/ppc64/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -27,6 +27,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/bootable/sparc/kernel.xml
===================================================================
--- trunk/BOOK/bootable/sparc/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/bootable/sparc/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -27,6 +27,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/bootable/x86/kernel.xml
===================================================================
--- trunk/BOOK/bootable/x86/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/bootable/x86/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -27,6 +27,11 @@
     file in the kernel source tree for alternative methods to the way this
     book configures the kernel.</para>
 
+    <para os="p1">The following patch fixes on intialization issue with the tulip
+    network driver:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&linux-tulip-patch;</userinput></screen>
+
     <para os="b">Prepare for compilation by running the following command:</para>
 
 <screen os="c"><userinput>make mrproper</userinput></screen>

Modified: trunk/BOOK/bootable/x86_64/kernel.xml
===================================================================
--- trunk/BOOK/bootable/x86_64/kernel.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/bootable/x86_64/kernel.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -27,6 +27,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -50,6 +50,10 @@
         <listitem>
           <para>[jim] - Updated Linux to 2.6.17.9 and Linux Headers to 2.6.17.9-08202006.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Added Linux Tulip Patch to all Linux 2.6.17.9 builds. Fixes an
+          initialization error.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/materials/common/patches.xml	2006-08-21 06:23:04 UTC (rev 2243)
@@ -181,6 +181,15 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Linux Tulip Update Patch - <token>&linux-tulip-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&linux-tulip-patch;"/></para>
+        <para>MD5 sum: <literal>&linux-tulip-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Mktemp Tempfile Patch - <token>&mktemp-tempfile-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-08-21 06:22:52 UTC (rev 2242)
+++ trunk/BOOK/patches.ent	2006-08-21 06:23:04 UTC (rev 2243)
@@ -80,6 +80,10 @@
 <!ENTITY kbd-gcc4_fixes-patch-md5 "615bc1e381ab646f04d8045751ed1f69">
 <!ENTITY kbd-gcc4_fixes-patch-size "1.5 KB">
 
+<!ENTITY linux-tulip-patch "linux-&linux-version;-tulip-1.patch">
+<!ENTITY linux-tulip-patch-md5 "0dd7027a8cb8e59c74c24ff0a8f45f3b">
+<!ENTITY linux-tulip-patch-size "8 KB">
+
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
 <!ENTITY mktemp-tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
 <!ENTITY mktemp-tempfile-patch-size "3.6 KB">




More information about the cross-lfs mailing list