Changeset 9176ba26

Timestamp:

Jul 8, 2006, 9:07:11 PM (18 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

6ccae16

Parents:

934e597

Message:

Cleaned up boot and chroot sections util-linux instructions for more consistency

Location:

BOOK

Files:

• boot/common/util-linux.xml (modified) (1 diff)
• chroot/common/util-linux.xml (modified) (2 diffs)
• chroot/multilib/util-linux.xml (modified) (1 diff)

BOOK/boot/common/util-linux.xml

@@ -53 +53 @@
 
 <screen os="bb"><userinput>cp -v configure{,.orig}
-sed -e 's@/usr/include@/tools/include@g' configure.orig > configure</userinput></screen>
+sed -e 's@/usr/include@/tools/include@g' configure.orig &gt; configure</userinput></screen>
 
     <para os="bc">The Util-linux installation uses <option>-o root</option>.

BOOK/chroot/common/util-linux.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='ba'])"/>
 
-<screen os="ca"><userinput>cp -v configure configure.orig
-sed -e 's@/usr/include@/tools/include@g' configure.orig &gt; configure</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../boot/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -42 +43 @@
     xpointer="xpointer(//*[@os='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(//*[@os='be'])"/>
 
     <para os="cc">Compile some support routines:</para>

BOOK/chroot/multilib/util-linux.xml

@@ -43 +43 @@
     xpointer="xpointer(//*[@os='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"