r1113 - in trunk/BOOK: boot/common chroot/common final-system/common final-system/multilib

chris at linuxfromscratch.org chris at linuxfromscratch.org
Mon Jan 30 22:12:20 PST 2006


Author: chris
Date: 2006-01-30 23:12:19 -0700 (Mon, 30 Jan 2006)
New Revision: 1113

Modified:
   trunk/BOOK/boot/common/createfiles.xml
   trunk/BOOK/chroot/common/createfiles.xml
   trunk/BOOK/final-system/common/bison.xml
   trunk/BOOK/final-system/common/gcc.xml
   trunk/BOOK/final-system/common/temp-perl.xml
   trunk/BOOK/final-system/multilib/temp-perl.xml
Log:
Moved perl symlink to temp-perl section, and added userinput tags to a couple commands.

Modified: trunk/BOOK/boot/common/createfiles.xml
===================================================================
--- trunk/BOOK/boot/common/createfiles.xml	2006-01-31 00:52:54 UTC (rev 1112)
+++ trunk/BOOK/boot/common/createfiles.xml	2006-01-31 06:12:19 UTC (rev 1113)
@@ -15,8 +15,8 @@
   links which will be replaced by real files throughout the course of
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>ln -s /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
-ln -s /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
-ln -s bash ${LFS}/bin/sh</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
+ln -sv bash ${LFS}/bin/sh</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/chroot/common/createfiles.xml
===================================================================
--- trunk/BOOK/chroot/common/createfiles.xml	2006-01-31 00:52:54 UTC (rev 1112)
+++ trunk/BOOK/chroot/common/createfiles.xml	2006-01-31 06:12:19 UTC (rev 1113)
@@ -14,9 +14,8 @@
   href="../../boot/common/createfiles.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -s /tools/bin/{bash,cat,pwd,stty} /bin
-ln -s /tools/bin/perl /usr/bin
-ln -s /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -s bash /bin/sh</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} /bin
+ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+ln -sv bash /bin/sh</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/final-system/common/bison.xml
===================================================================
--- trunk/BOOK/final-system/common/bison.xml	2006-01-31 00:52:54 UTC (rev 1112)
+++ trunk/BOOK/final-system/common/bison.xml	2006-01-31 06:12:19 UTC (rev 1113)
@@ -42,7 +42,7 @@
     program is not already in $PATH.  The following addition will correct
     this.</para>
 
-<screen os="b2">echo '#define YYENABLE_NLS 1' >> config.h</screen>  
+<screen os="b2"><userinput>echo '#define YYENABLE_NLS 1' >> config.h</userinput></screen>  
 
     <para os="c">Compile the package:</para>
 

Modified: trunk/BOOK/final-system/common/gcc.xml
===================================================================
--- trunk/BOOK/final-system/common/gcc.xml	2006-01-31 00:52:54 UTC (rev 1112)
+++ trunk/BOOK/final-system/common/gcc.xml	2006-01-31 06:12:19 UTC (rev 1113)
@@ -47,7 +47,7 @@
     temporary files.  We will be installing mktemp later, so the following sed
     will simulate its presence.</para>
 
-<screen os="e2">sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</screen>
+<screen os="e2"><userinput>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen>
 
     <para os="f">The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>

Modified: trunk/BOOK/final-system/common/temp-perl.xml
===================================================================
--- trunk/BOOK/final-system/common/temp-perl.xml	2006-01-31 00:52:54 UTC (rev 1112)
+++ trunk/BOOK/final-system/common/temp-perl.xml	2006-01-31 06:12:19 UTC (rev 1113)
@@ -57,6 +57,10 @@
 install -d /tools/lib/perl5/&perl-version;
 cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
 
+    <para os="j">Finally, create a necessary symlink:</para>
+
+<screen os="k"><userinput>ln -s /tools/bin/perl /usr/bin</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/temp-perl.xml
===================================================================
--- trunk/BOOK/final-system/multilib/temp-perl.xml	2006-01-31 00:52:54 UTC (rev 1112)
+++ trunk/BOOK/final-system/multilib/temp-perl.xml	2006-01-31 06:12:19 UTC (rev 1113)
@@ -56,6 +56,14 @@
     href="../common/temp-perl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/temp-perl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/temp-perl.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <sect2 role="content">




More information about the cross-lfs mailing list