Author: jim
Date: 2006-07-09 01:45:20 -0600 (Sun, 09 Jul 2006)
New Revision: 1939
Modified:
/
trunk/BOOK/boot/common/util-linux.xml
trunk/BOOK/chroot/common/util-linux.xml
trunk/BOOK/chroot/multilib/util-linux.xml
Log:
[EMAIL PROTECTED] (orig r2037): [EMAIL PROTECTED] | 2006-07-08 21:07:11 -0700
Cleaned up boot and chroot sections util-linux instructions for more
consistency
Property changes on:
___________________________________________________________________
Name: svk:merge
- b6734a72-470d-0410-b049-f317dca95413:/:2036
+ b6734a72-470d-0410-b049-f317dca95413:/:2037
Modified: trunk/BOOK/boot/common/util-linux.xml
===================================================================
--- trunk/BOOK/boot/common/util-linux.xml 2006-07-09 07:45:11 UTC (rev
1938)
+++ trunk/BOOK/boot/common/util-linux.xml 2006-07-09 07:45:20 UTC (rev
1939)
@@ -52,7 +52,7 @@
<command>configure</command> script:</para>
<screen os="bb"><userinput>cp -v configure{,.orig}
-sed -e 's@/usr/include@/tools/[EMAIL PROTECTED]' configure.orig >
configure</userinput></screen>
+sed -e 's@/usr/include@/tools/[EMAIL PROTECTED]' configure.orig >
configure</userinput></screen>
<para os="bc">The Util-linux installation uses <option>-o root</option>.
The following <command>sed</command> removes that since we don't have
Modified: trunk/BOOK/chroot/common/util-linux.xml
===================================================================
--- trunk/BOOK/chroot/common/util-linux.xml 2006-07-09 07:45:11 UTC (rev
1938)
+++ trunk/BOOK/chroot/common/util-linux.xml 2006-07-09 07:45:20 UTC (rev
1939)
@@ -34,14 +34,17 @@
href="../../boot/common/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'ba'])"/>
-<screen os="ca"><userinput>cp -v configure configure.orig
-sed -e 's@/usr/include@/tools/[EMAIL PROTECTED]' configure.orig >
configure</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../../boot/common/util-linux.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'bb'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../../final-system/common/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
-<screen os="cb"><userinput>./configure</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../../boot/common/util-linux.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'be'])"/>
<para os="cc">Compile some support routines:</para>
Modified: trunk/BOOK/chroot/multilib/util-linux.xml
===================================================================
--- trunk/BOOK/chroot/multilib/util-linux.xml 2006-07-09 07:45:11 UTC (rev
1938)
+++ trunk/BOOK/chroot/multilib/util-linux.xml 2006-07-09 07:45:20 UTC (rev
1939)
@@ -42,7 +42,7 @@
href="../common/util-linux.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
-<screen os="cb"><userinput>CC="${CC} ${BUILD64}"
./configure</userinput></screen>
+<screen os="be"><userinput>CC="${CC} ${BUILD64}"
./configure</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/util-linux.xml"
--
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
