* Merged newxml into HEAD

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3435 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 32 insertions, 26 deletions

diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 945a129bb..78833341f 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -1,38 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-tools-coreutils">
-<title>Installing Coreutils-&coreutils-version;</title>
-<?dbhtml filename="coreutils.html" dir="chapter05"?>
+<title>Coreutils-&coreutils-version;</title>
+<?dbhtml filename="coreutils.html"?>
 
-<screen>&buildtime; &coreutils-time-tools;
-&diskspace; &coreutils-compsize-tools;</screen>
+<indexterm zone="ch-tools-coreutils">
+<primary sortas="a-Coreutils">Coreutils</primary>
+<secondary>tools</secondary></indexterm>
 
-<literallayout>Official download location for Coreutils (&coreutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/coreutils/"/>
-And for the patch:
-<ulink url="&patches-root;&coreutils-posixver-patch;"/></literallayout> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/para[1])"/>
 
-&aa-coreutils-dep;
+<screen>&buildtime; 0.9 SBU
+&diskspace; 69 MB</screen>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/para[2])"/>
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Coreutils</title>
 
-<para>This package has an issue when compiled against Glibc-&glibc-version;.
-Without the patch below, some of the Coreutils utilities (such as
+<para>Prepare Coreutils for compilation:</para>
+
+<screen><userinput>DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/tools</userinput></screen>
+
+<para>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 syntax that has been in use for
 approximately 30 years. This old syntax is so pervasive that compatibility
-should be preserved until the many places where it is used can be updated. More
-details on this are provided in the comments inside the patch itself. Use of
-this patch is by no means compulsory, but not using it means you'll have to
-deal with the consequences yourself: patch the many packages that still use the
-old syntax. Therefore, better apply the patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&coreutils-posixver-patch;</userinput></screen>
-
-<para>Now prepare Coreutils for compilation:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
+should be preserved until the many places where it is used can be
+updated.  Backwards compatibility is achieved by setting the
+DEFAULT_POSIX2_VERSION environment variable to &quot;199209&quot; in the above
+command.  If you don&apos;t want coreutils to be backwards compatible
+with the traditional syntax, then simply omit setting the DEFAULT_POSIX2_VERSION
+environment variable.  Realise though, that doing so will mean you&apos;ll have
+to deal with the consequences yourself: patch the many packages that still use
+the old syntax.  We therefore recommend using the instructions exactly as given
+above.</para>
 
 <para>Compile the package:</para>
 
@@ -50,9 +57,8 @@ platforms but generally are not a problem on Linux.)</para>
 
 </sect2>
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para>
+<sect2><title> </title><para> </para>
 <para>The details on this package are found in <xref linkend="contents-coreutils"/>.</para>
-<para>&nbsp;</para></sect2>
+<para> </para></sect2>
 
 </sect1>
-