r6677 - in branches/cross-lfs/BOOK: final-system/common final-system/multilib final-system/x86 final-system/x86_64 temp-system/64 temp-system/common temp-system/multilib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Aug 14 03:11:09 PDT 2005


Author: manuel
Date: 2005-08-14 04:11:07 -0600 (Sun, 14 Aug 2005)
New Revision: 6677

Modified:
   branches/cross-lfs/BOOK/final-system/common/bzip2.xml
   branches/cross-lfs/BOOK/final-system/common/coreutils.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2.xml
   branches/cross-lfs/BOOK/final-system/multilib/coreutils.xml
   branches/cross-lfs/BOOK/final-system/x86/coreutils.xml
   branches/cross-lfs/BOOK/final-system/x86_64/coreutils.xml
   branches/cross-lfs/BOOK/temp-system/64/bzip2.xml
   branches/cross-lfs/BOOK/temp-system/64/coreutils.xml
   branches/cross-lfs/BOOK/temp-system/common/bzip2.xml
   branches/cross-lfs/BOOK/temp-system/common/coreutils.xml
   branches/cross-lfs/BOOK/temp-system/multilib/bzip2.xml
   branches/cross-lfs/BOOK/temp-system/multilib/coreutils.xml
Log:
Xinclude redo up to coreutils.

Modified: branches/cross-lfs/BOOK/final-system/common/bzip2.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/bzip2.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/final-system/common/bzip2.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -47,37 +47,38 @@
   <sect2 id="install-bzip2" role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>Prepare Bzip2 for compilation with:</para>
+    <para os="a">The Bzip2 package does not contain a <command>configure</command>
+    script. Compile it with:</para>
 
 <screen><userinput>make -f Makefile-libbz2_so
 make clean</userinput></screen>
 
-    <para>The <parameter>-f</parameter> flag will cause Bzip2 to be built
+    <para os="b">The <parameter>-f</parameter> flag will cause Bzip2 to be built
     using a different <filename>Makefile</filename> file, in this case the
     <filename>Makefile-libbz2_so</filename> file, which creates a dynamic
     <filename class="libraryfile">libbz2.so</filename> library and links the
     Bzip2 utilities against it.</para>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>To test the results, issue:
+    <para os="d">To test the results, issue:
     <userinput>make test</userinput>.</para>
 
-    <para>If reinstalling Bzip2, perform
+    <para os="e">If reinstalling Bzip2, perform
     <userinput>rm -f /usr/bin/bz*</userinput> first, otherwise the
     following <command>make install</command> will fail.</para>
 
-    <para>Install the programs:</para>
+    <para os="f">Install the programs:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para>Install the shared <command>bzip2</command> binary into the
+    <para os="h">Install the shared <command>bzip2</command> binary into the
     <filename class="directory">/bin</filename> directory, make
     some necessary symbolic links, and clean up:</para>
 
-<screen><userinput>cp bzip2-shared /bin/bzip2
+<screen os="i"><userinput>cp bzip2-shared /bin/bzip2
 cp -a libbz2.so* /lib
 ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
 rm /usr/bin/{bunzip2,bzcat,bzip2}

Modified: branches/cross-lfs/BOOK/final-system/common/coreutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/coreutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/final-system/common/coreutils.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -46,66 +46,64 @@
   <sect2 id="install-coreutils" role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>Prevent Coreutils from installing binaries that will be
+    <para os="a">Prevent Coreutils from installing binaries that will be
     installed by other packages:</para>
 
-<screen><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
 
-    <para>Now prepare Coreutils for compilation:</para>
+    <para os="c">Now prepare Coreutils for compilation:</para>
 
-<screen><userinput>DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/usr</userinput></screen>
+<screen os="d"><userinput>DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="e">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="f"><userinput>make</userinput></screen>
 
-    <para>The test suite of Coreutils makes several assumptions about the
+    <para os="g">The test suite of Coreutils makes several assumptions about the
     presence of system users and groups that are not valid within the minimal
     environment that exists at the moment. Therefore, additional items need
     to be set up before running the tests. Skip down to <quote>Install the
     package</quote> if not running the test suite.</para>
 
-    <para>Create two <systemitem class="groupname">dummy</systemitem> groups
+    <para os="h">Create two <systemitem class="groupname">dummy</systemitem> groups
     and a <systemitem class="username">dummy</systemitem> user:</para>
 
-<screen><userinput>echo "dummy1:x:1000:" >> /etc/group
+<screen os="i"><userinput>echo "dummy1:x:1000:" >> /etc/group
 echo "dummy2:x:1001:dummy" >> /etc/group
 echo "dummy:x:1000:1000:::/bin/bash" >> /etc/passwd</userinput></screen>
 
-    <para>Now the test suite is ready to be run. First, run
+    <para os="j">Now the test suite is ready to be run. First, run
     the tests that are meant to be run as user
     <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>make NON_ROOT_USERNAME=dummy check-root</userinput></screen>
+<screen os="k"><userinput>make NON_ROOT_USERNAME=dummy check-root</userinput></screen>
 
-    <para>Then run the remainder of the tests as the
+    <para os="l">Then run the remainder of the tests as the
     <systemitem class="username">dummy</systemitem> user:</para>
 
-<screen><userinput>src/su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
+<screen os="m"><userinput>src/su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
 
-    <para>When testing is complete, remove the
+    <para os="n">When testing is complete, remove the
     <systemitem class="username">dummy</systemitem> user and groups:</para>
 
-<screen><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
+<screen os="o"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="p">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="q"><userinput>make install</userinput></screen>
 
-    <para>Move programs to the proper locations:</para>
+    <para os="r">Move programs to the proper locations:</para>
 
-<screen><userinput>mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
+<screen os="s"><userinput>mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
 mv /usr/bin/{date,echo,false,head,hostname,install,ln} /bin
 mv /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin
 mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin
 mv /usr/bin/chroot /usr/sbin</userinput></screen>
 
-    <para>Finally, create a symlink to be FHS-compliant:</para>
+    <para os="t">Finally, create a symlink to be FHS-compliant:</para>
 
-<screen><userinput>ln -s ../../bin/install /usr/bin</userinput></screen>
+<screen os="u"><userinput>ln -s ../../bin/install /usr/bin</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 id="contents-coreutils" role="content">

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -44,42 +44,42 @@
 
     <para>Prepare Bzip2 for compilation with:</para>
 
-    <para>We need to remove the tests to since they won't work on
+    <para os="ba">We need to remove the tests since they won't work on
     a multi-architecture build, and tell change the default lib path
-    to lib64:</para>
+    to <filename class="directory">lib64</filename>:</para>
 
-<screen><userinput>sed -i 's@/lib\(/\| \|$\)@/lib64\1 at g' Makefile</userinput></screen>
+<screen os="bb"><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' \
+    -e 's@/lib\(/\| \|$\)@/lib64\1 at g' Makefile</userinput></screen>
 
-    <para>The Bzip2 package does not contain a <command>configure</command>
-    script. Compile it with:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"
 make clean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Compile the package:</para>
-
 <screen><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[4])"/>
-
     <para>Now we remove the 32 bit versions of the programs so we
     can install the 64 bit versions.</para>
 
 <screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
 
-    <para>Install the programs:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[6])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><userinput>cp bzip2-shared /bin/bzip2
 cp -a libbz2.so* /lib64

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -42,44 +42,42 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>Prepare Bzip2 for compilation with:</para>
-
-    <para>We need to remove the tests to since they won't work on
+    <para>We need to remove the tests since they won't work on
     a multi-architecture build, and tell change the default lib path
-    to lib32:</para>
+    to <filename class="directory">lib32</filename>:</para>
 
-<screen><userinput>sed -i 's@/lib\(/\| \|$\)@/lib32\1 at g' Makefile</userinput></screen>
+<screen><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' \
+    -e 's@/lib\(/\| \|$\)@/lib32\1 at g' Makefile</userinput></screen>
 
-    <para>The Bzip2 package does not contain a <command>configure</command>
-    script. Compile it with:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
 make clean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Compile the package:</para>
-
 <screen><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[4])"/>
-
     <para>Now we remove the 32 bit versions of the programs so we
     can install the n32 bit versions.</para>
 
 <screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
 
-    <para>Install the programs:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[6])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><userinput>cp bzip2-shared /bin/bzip2
 cp -a libbz2.so* /lib32

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -42,38 +42,47 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>Prepare Bzip2 for compilation with:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
 make clean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[2])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[4])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the programs:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(id('install-bzip2')/para[6])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>cp bzip2-shared /bin/bzip2
-cp -a libbz2.so* /lib
-ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
-rm /usr/bin/{bunzip2,bzcat,bzip2}
-ln -s bzip2 /bin/bunzip2
-ln -s bzip2 /bin/bzcat</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/final-system/multilib/coreutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/coreutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/final-system/multilib/coreutils.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -44,21 +44,87 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(id('install-coreutils')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(id('install-coreutils')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Now prepare Coreutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" DEFAULT_POSIX2_VERSION=199209 \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" DEFAULT_POSIX2_VERSION=199209 \
    ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(id('install-coreutils')/para[3]/range-to(id('install-coreutils')/para[last()]))"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='r'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='t'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/x86/coreutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86/coreutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/final-system/x86/coreutils.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -23,17 +23,97 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>A known issue with the <command>uname</command> program from
+    <para os="aa">A known issue with the <command>uname</command> program from
     this package is that the <option>-p</option> switch always
     returns <computeroutput>unknown</computeroutput>. The following patch
     fixes this behavior for Intel architectures:</para>
 
-<screen><userinput>patch -Np1 -i ../&coreutils-x86_uname-patch;</userinput></screen>
+<screen os="ab"><userinput>patch -Np1 -i ../&coreutils-x86_uname-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(id('install-coreutils')/para[1]/range-to(id('install-coreutils')/para[last()]))"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='r'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='t'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/x86_64/coreutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/coreutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/final-system/x86_64/coreutils.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -7,6 +7,119 @@
   %patches-entities;
 ]>
 
+<sect1 id="ch-system-coreutils" role="wrap">
+  <?dbhtml filename="coreutils.html"?>
+
+  <title>Coreutils-&coreutils-version;</title>
+
+  <indexterm zone="ch-system-coreutils">
+    <primary sortas="a-Coreutils">Coreutils</primary>
+  </indexterm>
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/coreutils.xml"
-  xpointer="xpointer(/sect1)"/>
+  href="../common/coreutils.xml"
+  xpointer="xpointer(id('package-coreutils'))"/>
+
+  <sect2 role="installation">
+    <title>Installation of Coreutils</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/coreutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/coreutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/coreutils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='r'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='t'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/coreutils.xml"
+  xpointer="xpointer(id('contents-coreutils'))"/>
+
+</sect1>
+

Modified: branches/cross-lfs/BOOK/temp-system/64/bzip2.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/bzip2.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/temp-system/64/bzip2.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -43,14 +43,17 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>We need to remove the tests to since they won't work on
-    a multi-architecture build, and tell change the default lib path
-    to lib64:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-<screen><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' Makefile</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='cb'])"/>
 
-    <para>The Bzip2 package does not contain a <command>configure</command>
-    script. Compile it with:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/temp-system/64/coreutils.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/coreutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/temp-system/64/coreutils.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -45,13 +45,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bc'])"/>
 
-<para>Prepare Coreutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
 <screen><userinput>DEFAULT_POSIX2_VERSION=199209 CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --cache-file=config.cache \
@@ -59,15 +61,23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/bzip2.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/bzip2.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/temp-system/common/bzip2.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -43,13 +43,14 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>We need to remove the tests to since they won't work on
+    <para os="ca">We need to remove the tests to since they won't work on
     a multi-architecture build:</para>
 
-<screen><userinput>sed -i 's@^\(all:.*\) test@\1 at g' Makefile</userinput></screen>
+<screen os="cb"><userinput>sed -i 's@^\(all:.*\) test@\1 at g' Makefile</userinput></screen>
 
-    <para>The Bzip2 package does not contain a <command>configure</command>
-    script. Compile it with:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/bzip2.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/coreutils.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/coreutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/temp-system/common/coreutils.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -43,18 +43,18 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>Coreutils has in issue where  UTILS_OPEN_MAX does not get
+    <para os="ba">Coreutils has in issue where  UTILS_OPEN_MAX does not get
     defined when cross-compiling. So we define it:</para>
 
-<screen><userinput>echo "utils_cv_sys_open_max=1024" >> config.cache</userinput></screen>
+<screen os="bc"><userinput>echo "utils_cv_sys_open_max=1024" >> config.cache</userinput></screen>
 
-    <para>Prepare Coreutils for compilation:</para>
+    <para os="bd">Prepare Coreutils for compilation:</para>
 
 <screen><userinput>DEFAULT_POSIX2_VERSION=199209 \
    ./configure --prefix=/tools --cache-file=config.cache \
    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
 
-    <para>This package has an issue when compiled against versions of
+    <para os="be">This package has an issue when compiled against versions of
     Glibc later than 2.3.2. Some of the Coreutils utilities (such as
     <command>head</command>, <command>tail</command>, and
     <command>sort</command>) will reject their traditional syntax, a
@@ -71,13 +71,13 @@
     Therefore, it is recommended that the instructions be followed exactly
     as given above.</para>
 
-    <para>Compile the package:</para>
+    <para os="bf">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="bg"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="bh">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="bi"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/bzip2.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/bzip2.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/temp-system/multilib/bzip2.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -43,15 +43,17 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>We need to remove the tests to since they won't work on
-    a multi-architecture build, and tell change the default lib path
-    to lib64:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/multilib/bzip2-64bit.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
-<screen><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' \
-  -e 's@/lib\(/\| \|$\)@/lib64\1 at g' Makefile</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/multilib/bzip2-64bit.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
-    <para>The Bzip2 package does not contain a <command>configure</command>
-    script. Compile it with:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/coreutils.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/coreutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
+++ branches/cross-lfs/BOOK/temp-system/multilib/coreutils.xml	2005-08-14 10:11:07 UTC (rev 6677)
@@ -45,13 +45,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bc'])"/>
 
-<para>Prepare Coreutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
 <screen><userinput>DEFAULT_POSIX2_VERSION=199209 CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --cache-file=config.cache \
@@ -59,15 +61,23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
   </sect2>
 




More information about the lfs-book mailing list