Changeset 40c1b5b for boot/multilib

Timestamp:

Feb 21, 2006, 1:21:56 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Children:

694b637

Parents:

6069286

Message:

r776@server (orig r774): jim | 2005-11-29 12:05:02 -0800

r826@server: jim | 2005-11-29 11:03:18 -0800
Text updates to boot section

Location:

boot/multilib

Files:

• e2fsprogs.xml (modified) (5 diffs)
• inetutils.xml (modified) (3 diffs)
• module-init-tools.xml (modified) (1 diff)
• udev.xml (modified) (3 diffs)
• util-linux.xml (modified) (2 diffs)

boot/multilib/e2fsprogs.xml

@@ -26 +26 @@
     <filename class="directory">/tools/lib64</filename>:</para>
 
-<screen><userinput>chmod 0755 configure
+<screen os="m1"><userinput>chmod 0755 configure
 cp configure{,.orig}
 sed -e "/libdir=.*\/lib/s@/lib@/lib64@g" configure.orig > configure</userinput></screen>
@@ -42 +42 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
 --enable-elf-shlibs --disable-evms \
 --host=${LFS_TARGET}</userinput></screen>
@@ -48 +48 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -54 +54 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make CC="${CC} ${BUILD64}"</userinput></screen>
+<screen os="ac"><userinput>make CC="${CC} ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -74 +74 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='ae'])"/>
 
   </sect2>

boot/multilib/inetutils.xml

@@ -43 +43 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/usr --libexecdir=/usr/sbin \
    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
@@ -60 +60 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -68 +68 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
   </sect2>

boot/multilib/module-init-tools.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
+<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
    --host=${LFS_TARGET}</userinput></screen>
 

boot/multilib/udev.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
+<screen os="aa"><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
     EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
 
@@ -40 +40 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -48 +48 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
   </sect2>

boot/multilib/util-linux.xml

@@ -59 +59 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><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"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -89 +85 @@
     xpointer="xpointer(//*[@os='bj'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
+
   </sect2>