r806 - in trunk/BOOK: . boot/common boot/mips boot/mips64 boot/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Fri Dec 2 22:08:04 PST 2005


Author: jim
Date: 2005-12-02 23:08:03 -0700 (Fri, 02 Dec 2005)
New Revision: 806

Modified:
   trunk/BOOK/
   trunk/BOOK/boot/common/module-init-tools.xml
   trunk/BOOK/boot/mips/module-init-tools.xml
   trunk/BOOK/boot/mips64/module-init-tools.xml
   trunk/BOOK/boot/multilib/module-init-tools.xml
Log:
 r891 at server:  jim | 2005-12-02 22:05:56 -0800
 Text Updates



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:885
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:891
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/common/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/common/module-init-tools.xml	2005-12-03 03:11:59 UTC (rev 805)
+++ trunk/BOOK/boot/common/module-init-tools.xml	2005-12-03 06:08:03 UTC (rev 806)
@@ -30,21 +30,31 @@
     href="../../final-system/common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="d"><userinput>./configure --prefix=/ \
-   --host=${LFS_TARGET}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>make</userinput></screen>
+<screen os="f"><userinput>./configure --prefix=/ \
+   --host=${LFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="i"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/boot/mips/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/mips/module-init-tools.xml	2005-12-03 03:11:59 UTC (rev 805)
+++ trunk/BOOK/boot/mips/module-init-tools.xml	2005-12-03 06:08:03 UTC (rev 806)
@@ -40,7 +40,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/module-init-tools.xml"
@@ -52,12 +52,16 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/boot/mips64/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/mips64/module-init-tools.xml	2005-12-03 03:11:59 UTC (rev 805)
+++ trunk/BOOK/boot/mips64/module-init-tools.xml	2005-12-03 06:08:03 UTC (rev 806)
@@ -40,10 +40,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../multilib/module-init-tools.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -58,6 +58,14 @@
     href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/boot/multilib/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/multilib/module-init-tools.xml	2005-12-03 03:11:59 UTC (rev 805)
+++ trunk/BOOK/boot/multilib/module-init-tools.xml	2005-12-03 06:08:03 UTC (rev 806)
@@ -30,17 +30,17 @@
     href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
-   --host=${LFS_TARGET}</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
+<screen os="f"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
+   --host=${LFS_TARGET}</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='h'])"/>
@@ -49,6 +49,14 @@
     href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <sect2 role="content">




More information about the cross-lfs mailing list