r1175 - in trunk/BOOK: boot/common boot/ppc cross-tools/multilib final-system/x86_64-64

chris at linuxfromscratch.org chris at linuxfromscratch.org
Sun Feb 12 23:25:27 PST 2006


Author: chris
Date: 2006-02-13 00:25:26 -0700 (Mon, 13 Feb 2006)
New Revision: 1175

Modified:
   trunk/BOOK/boot/common/util-linux.xml
   trunk/BOOK/boot/ppc/yaboot-build.xml
   trunk/BOOK/cross-tools/multilib/glibc-64bit.xml
   trunk/BOOK/final-system/x86_64-64/glibc.xml
Log:
Various text updates

Modified: trunk/BOOK/boot/common/util-linux.xml
===================================================================
--- trunk/BOOK/boot/common/util-linux.xml	2006-02-13 05:52:03 UTC (rev 1174)
+++ trunk/BOOK/boot/common/util-linux.xml	2006-02-13 07:25:26 UTC (rev 1175)
@@ -45,9 +45,9 @@
 <screen os="bb"><userinput>cp -v configure{,.orig}
 sed -e 's@/usr/include@/tools/include at g' configure.orig > configure</userinput></screen>
 
-    <para os="bc">Util-linux installs uses <option>-o root</option>, the following
-    <command>sed</command> removes that since we don't have users setup
-    yet:</para>
+    <para os="bc">The Util-linux installation uses <option>-o root</option>.
+    The following <command>sed</command> removes that since we don't have
+    users setup yet:</para>
 
 <screen os="bd"><userinput>cp -v MCONFIG{,.orig}
 sed -e 's|-o root||' MCONFIG.orig > MCONFIG</userinput></screen>

Modified: trunk/BOOK/boot/ppc/yaboot-build.xml
===================================================================
--- trunk/BOOK/boot/ppc/yaboot-build.xml	2006-02-13 05:52:03 UTC (rev 1174)
+++ trunk/BOOK/boot/ppc/yaboot-build.xml	2006-02-13 07:25:26 UTC (rev 1175)
@@ -12,25 +12,13 @@
 
   <indexterm zone="ch-boot-yaboot-build">
     <primary sortas="a-Yaboot">Yaboot</primary>
+    <secondary>boot</secondary>
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/ppc/yaboot.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
-    <para>The Yaboot package contains a PowerPC Boot Loader for machines using
-    OpenFirmware such as NewWorld Macintoshes.</para>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
-        Make, Ncurses, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
   <sect2 role="installation">
     <title>Installation of Yaboot</title>
 

Modified: trunk/BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- trunk/BOOK/cross-tools/multilib/glibc-64bit.xml	2006-02-13 05:52:03 UTC (rev 1174)
+++ trunk/BOOK/cross-tools/multilib/glibc-64bit.xml	2006-02-13 07:25:26 UTC (rev 1175)
@@ -74,15 +74,15 @@
       <varlistentry os="fa1">
         <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD64}"</parameter></term>
         <listitem>
-          <para>Forces GLIBC to utilize our target architecture GCC utilizing
-          the 64 BIT flags.</para>
+          <para>Forces Glibc to utilize our target architecture GCC utilizing
+          the 64 Bit flags.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry os="fa2">
         <term><parameter>--libdir=/tools/lib64</parameter></term>
         <listitem>
-          <para>Puts GLIBC into /tools/lib64 instead of /tools/lib.</para>
+          <para>Puts Glibc into /tools/lib64 instead of /tools/lib.</para>
         </listitem>
       </varlistentry>
 

Modified: trunk/BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/glibc.xml	2006-02-13 05:52:03 UTC (rev 1174)
+++ trunk/BOOK/final-system/x86_64-64/glibc.xml	2006-02-13 07:25:26 UTC (rev 1175)
@@ -123,8 +123,8 @@
     is. The following <command>sed</command> will correct this.</para>
 
     <screen><userinput>rm -v /lib/ld-linux.so.2
-    cp -v /usr/bin/ldd{,.bak}
-    sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userinput></screen>
+cp -v /usr/bin/ldd{,.bak}
+sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userinput></screen>
 
     <para>Check the script to make sure the sed worked correctly, then delete
     the backup.</para>




More information about the cross-lfs mailing list