r773 - in trunk/BOOK: . chroot chroot/common chroot/mips chroot/mips64 chroot/multilib introduction/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Nov 29 12:04:52 PST 2005


Author: jim
Date: 2005-11-29 13:04:51 -0700 (Tue, 29 Nov 2005)
New Revision: 773

Removed:
   trunk/BOOK/chroot/64/
Modified:
   trunk/BOOK/
   trunk/BOOK/chroot/common/util-linux.xml
   trunk/BOOK/chroot/mips/creatingdirs.xml
   trunk/BOOK/chroot/mips64-64-chapter.xml
   trunk/BOOK/chroot/mips64/creatingdirs.xml
   trunk/BOOK/chroot/multilib/util-linux.xml
   trunk/BOOK/chroot/sparc64-64-chapter.xml
   trunk/BOOK/chroot/x86_64-64-chapter.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
 r825 at server:  jim | 2005-11-29 07:37:35 -0800
 Text updates to chroot



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

Modified: trunk/BOOK/chroot/common/util-linux.xml
===================================================================
--- trunk/BOOK/chroot/common/util-linux.xml	2005-11-29 08:33:00 UTC (rev 772)
+++ trunk/BOOK/chroot/common/util-linux.xml	2005-11-29 20:04:51 UTC (rev 773)
@@ -41,9 +41,9 @@
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure</userinput></screen>
+<screen os="cb"><userinput>./configure</userinput></screen>
 
-    <para os="cb">Compile some support routines:</para>
+    <para os="cc">Compile some support routines:</para>
 
 <screen os="cd"><userinput>make ARCH="" CPU="" -C lib</userinput></screen>
 

Modified: trunk/BOOK/chroot/mips/creatingdirs.xml
===================================================================
--- trunk/BOOK/chroot/mips/creatingdirs.xml	2005-11-29 08:33:00 UTC (rev 772)
+++ trunk/BOOK/chroot/mips/creatingdirs.xml	2005-11-29 20:04:51 UTC (rev 773)
@@ -34,10 +34,10 @@
 install -d /opt/{bin,doc,include,info}
 install -d /opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
 
-   <para>These entries are needed for the RaQ2 bootloader. Only use these
+   <para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
    if you are utilizing the Colo bootloader:</para>
 
-<screen><userinput>cd /boot
+<screen os="m2"><userinput>cd /boot
 ln -sf . boot</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/chroot/mips64/creatingdirs.xml
===================================================================
--- trunk/BOOK/chroot/mips64/creatingdirs.xml	2005-11-29 08:33:00 UTC (rev 772)
+++ trunk/BOOK/chroot/mips64/creatingdirs.xml	2005-11-29 20:04:51 UTC (rev 773)
@@ -37,11 +37,13 @@
 ln -s ../lib/locale /usr/lib32
 ln -s ../lib/locale /usr/lib64</userinput></screen>
 
-   <para>These entries are needed for the RaQ2 bootloader. Only use these
-   if you are utilizing the Colo bootloader:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen><userinput>cd /boot
-ln -sf . boot</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='m2'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"

Modified: trunk/BOOK/chroot/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/chroot/mips64-64-chapter.xml	2005-11-29 08:33:00 UTC (rev 772)
+++ trunk/BOOK/chroot/mips64-64-chapter.xml	2005-11-29 20:04:51 UTC (rev 773)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/BOOK/chroot/multilib/util-linux.xml
===================================================================
--- trunk/BOOK/chroot/multilib/util-linux.xml	2005-11-29 08:33:00 UTC (rev 772)
+++ trunk/BOOK/chroot/multilib/util-linux.xml	2005-11-29 20:04:51 UTC (rev 773)
@@ -34,11 +34,11 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
+<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
+    xpointer="xpointer(//*[@os='cc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"

Modified: trunk/BOOK/chroot/sparc64-64-chapter.xml
===================================================================
--- trunk/BOOK/chroot/sparc64-64-chapter.xml	2005-11-29 08:33:00 UTC (rev 772)
+++ trunk/BOOK/chroot/sparc64-64-chapter.xml	2005-11-29 20:04:51 UTC (rev 773)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/BOOK/chroot/x86_64-64-chapter.xml
===================================================================
--- trunk/BOOK/chroot/x86_64-64-chapter.xml	2005-11-29 08:33:00 UTC (rev 772)
+++ trunk/BOOK/chroot/x86_64-64-chapter.xml	2005-11-29 20:04:51 UTC (rev 773)
@@ -12,7 +12,7 @@
   <title>If You Are Going to Chroot</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-11-29 08:33:00 UTC (rev 772)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-11-29 20:04:51 UTC (rev 773)
@@ -37,9 +37,18 @@
 -->
 
    <listitem>
-      <para>November 28 2005</para>
+      <para>November 29, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[jim] - Text updates to chroot.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+   <listitem>
+      <para>November 28, 2005</para>
+      <itemizedlist>
+        <listitem>
           <para>[jim] - Text updates to glibc in all sections.</para>
         </listitem>
         <listitem>
@@ -52,7 +61,7 @@
     </listitem>
 
    <listitem>
-      <para>November 27 2005</para>
+      <para>November 27, 2005</para>
       <itemizedlist>
         <listitem>
           <para>[jim] - Text updates to gcc in all sections.</para>
@@ -64,7 +73,7 @@
     </listitem>
 
    <listitem>
-      <para>November 25 2005</para>
+      <para>November 25, 2005</para>
       <itemizedlist>
         <listitem>
           <para>[jim] - Text updates to binutils in all sections.</para>
@@ -73,7 +82,7 @@
     </listitem>
 
     <listitem>
-      <para>November 24 2005</para>
+      <para>November 24, 2005</para>
       <itemizedlist>
         <listitem>
           <para>[Matt Darcy] - Text updates to resources page </para>




More information about the cross-lfs mailing list