r1713 - profiles/LFS/trunk/chapter05

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sun Feb 6 11:25:34 PST 2005


Author: kpfleming
Date: 2005-02-06 12:25:33 -0700 (Sun, 06 Feb 2005)
New Revision: 1713

Modified:
   profiles/LFS/trunk/chapter05/addinguser.xml
   profiles/LFS/trunk/chapter05/adjustingtoolchain.xml
   profiles/LFS/trunk/chapter05/bash.xml
   profiles/LFS/trunk/chapter05/binutils-pass1.xml
   profiles/LFS/trunk/chapter05/binutils-pass2.xml
   profiles/LFS/trunk/chapter05/bison.xml
   profiles/LFS/trunk/chapter05/bzip2.xml
   profiles/LFS/trunk/chapter05/coreutils.xml
   profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
   profiles/LFS/trunk/chapter05/dejagnu.xml
   profiles/LFS/trunk/chapter05/diffutils.xml
   profiles/LFS/trunk/chapter05/expect.xml
   profiles/LFS/trunk/chapter05/findutils.xml
   profiles/LFS/trunk/chapter05/flex.xml
   profiles/LFS/trunk/chapter05/gawk.xml
   profiles/LFS/trunk/chapter05/gcc-pass1.xml
   profiles/LFS/trunk/chapter05/gcc-pass2.xml
   profiles/LFS/trunk/chapter05/gettext.xml
   profiles/LFS/trunk/chapter05/glibc.xml
   profiles/LFS/trunk/chapter05/grep.xml
   profiles/LFS/trunk/chapter05/gzip.xml
   profiles/LFS/trunk/chapter05/kernel-headers.xml
   profiles/LFS/trunk/chapter05/libc-headers.xml
   profiles/LFS/trunk/chapter05/m4.xml
   profiles/LFS/trunk/chapter05/make.xml
   profiles/LFS/trunk/chapter05/ncurses.xml
   profiles/LFS/trunk/chapter05/patch.xml
   profiles/LFS/trunk/chapter05/perl.xml
   profiles/LFS/trunk/chapter05/sed.xml
   profiles/LFS/trunk/chapter05/settingenvironment.xml
   profiles/LFS/trunk/chapter05/strip.xml
   profiles/LFS/trunk/chapter05/tar.xml
   profiles/LFS/trunk/chapter05/tcl.xml
   profiles/LFS/trunk/chapter05/texinfo.xml
   profiles/LFS/trunk/chapter05/udev.xml
   profiles/LFS/trunk/chapter05/util-linux.xml
Log:
tidy



Modified: profiles/LFS/trunk/chapter05/addinguser.xml
===================================================================
--- profiles/LFS/trunk/chapter05/addinguser.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/addinguser.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 
 %general_entities;
 ]>
-
 <alfs>
-
-<stage name="Adding the LFS User">
-	<execute command="groupadd -f lfs" />
-	
-	<execute command="id -u &lfs-user; &real-amp;> /dev/null || useradd -s /bin/bash -g lfs -m -k /dev/null &lfs-user;" />
-
-	<execute command="echo &lfs-user;:&lfs-password; | chpasswd" />
-
-	<ownership user="&lfs-user;">
-		<name>&LFS;/tools</name>
-		<name>&LFS;&build_dir;</name>
-	</ownership>
-</stage>
-
+  <stage name="Adding the LFS User">
+    <execute command="groupadd -f lfs" />
+    <execute command="id -u &lfs-user; &real-amp;> /dev/null || useradd -s /bin/bash -g lfs -m -k /dev/null &lfs-user;" />
+    <execute command="echo &lfs-user;:&lfs-password; | chpasswd" />
+    <ownership user="&lfs-user;">
+      <name>&LFS;/tools</name>
+      <name>&LFS;&build_dir;</name>
+    </ownership>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/adjustingtoolchain.xml
===================================================================
--- profiles/LFS/trunk/chapter05/adjustingtoolchain.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/adjustingtoolchain.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,45 +1,37 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<stage name="Adjusting the Toolchain">
-	<stage name="Adjusting the Linker">
-		<stageinfo>
-			<base>&build_dir;/binutils-build</base>
-		</stageinfo>
-
-		<make>
-			<param>-C ld</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<remove>&build_dir;/&binutils-directory;</remove>
-	<remove>&build_dir;/binutils-build</remove>
-
-	<search_replace>
-		<file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
-		<find> /lib/&glibc-loader;</find>
-		<replace> /tools/lib/&glibc-loader;</replace>
-	</search_replace>
-
-	<remove>/tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</remove>
-
-<!-- Test basic functions of toolchain with:
-	echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /tools';
+  <stage name="Adjusting the Toolchain">
+    <stage name="Adjusting the Linker">
+      <stageinfo>
+        <base>&build_dir;/binutils-build</base>
+      </stageinfo>
+      <make>
+        <param>-C ld</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <remove>&build_dir;/&binutils-directory;</remove>
+    <remove>&build_dir;/binutils-build</remove>
+    <search_replace>
+      <file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
+      <find>/lib/&glibc-loader;</find>
+      <replace>/tools/lib/&glibc-loader;</replace>
+    </search_replace>
+    <remove>/tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</remove>
+    <!-- Test basic functions of toolchain with:
+        echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /tools';
 Output of last line s/b: [Requesting program interpreter: /tools/lib/ld-linux.so.2]
 If so:  
-	rm dummy.c a.out
+        rm dummy.c a.out
 Otherwise, STOP HERE & find & fix the problem
 -->
-
-</stage>
-
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/bash.xml
===================================================================
--- profiles/LFS/trunk/chapter05/bash.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/bash.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,63 +1,53 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="bash" version="&bash-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&bash-md5;</digest>
-			<archive>&packages_dir;/&bash-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bash-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&bash-wcontinued-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/tools</param>
-			<param>--without-bash-malloc</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>tests</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<link>
-			<option>force</option>
-			<target>bash</target>
-			<name>/tools/bin/sh</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bash-directory;</remove>
-	</stage>
-</package>
-
+  <package name="bash" version="&bash-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&bash-md5;</digest>
+        <archive>&packages_dir;/&bash-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bash-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&bash-wcontinued-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/tools</param>
+        <param>--without-bash-malloc</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>tests</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>bash</target>
+        <name>/tools/bin/sh</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bash-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/binutils-pass1.xml
===================================================================
--- profiles/LFS/trunk/chapter05/binutils-pass1.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/binutils-pass1.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,67 +1,57 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="binutils-pass1" version="&binutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&binutils-md5;</digest>
-			<archive>&packages_dir;/&binutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<option>parents</option>
-			<name>binutils-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/binutils-build</base>
-		</stageinfo>
-
-		<configure command="../&binutils-directory;/configure">
-			<param>--prefix=/tools</param>
-			<param>--disable-nls</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-			<param>configure-host</param>
-		</make>
-
-		<make>
-			<param>LDFLAGS="-all-static"</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>-C ld</param>
-			<param>clean</param>
-		</make>
-
-		<make>
-			<param>&jlevel;</param>
-			<param>-C ld</param>
-			<param>LDFLAGS="-all-static"</param>
-			<param>LIB_PATH=/tools/lib</param>
-		</make>
-	</stage>
-</package>
-
+  <package name="binutils-pass1" version="&binutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&binutils-md5;</digest>
+        <archive>&packages_dir;/&binutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <option>parents</option>
+        <name>binutils-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/binutils-build</base>
+      </stageinfo>
+      <configure command="../&binutils-directory;/configure">
+        <param>--prefix=/tools</param>
+        <param>--disable-nls</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+        <param>configure-host</param>
+      </make>
+      <make>
+        <param>LDFLAGS="-all-static"</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>-C ld</param>
+        <param>clean</param>
+      </make>
+      <make>
+        <param>&jlevel;</param>
+        <param>-C ld</param>
+        <param>LDFLAGS="-all-static"</param>
+        <param>LIB_PATH=/tools/lib</param>
+      </make>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/binutils-pass2.xml
===================================================================
--- profiles/LFS/trunk/chapter05/binutils-pass2.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/binutils-pass2.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,67 +1,57 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="binutils-pass2" version="&binutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&binutils-md5;</digest>
-			<archive>&packages_dir;/&binutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<option>parents</option>
-			<name>binutils-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/binutils-build</base>
-		</stageinfo>
-
-		<configure command="../&binutils-directory;/configure">
-			<param>--prefix=/tools</param>
-			<param>--enable-shared</param>
-			<param>--with-lib-path=/tools/lib</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>-k check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<make>
-			<param>-C ld</param>
-			<param>clean</param>
-		</make>
-
-		<make>
-			<param>-C ld</param>
-			<param>LIB_PATH=/usr/lib:/lib</param>
-		</make>
-	</stage>
-</package>
-
+  <package name="binutils-pass2" version="&binutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&binutils-md5;</digest>
+        <archive>&packages_dir;/&binutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <option>parents</option>
+        <name>binutils-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/binutils-build</base>
+      </stageinfo>
+      <configure command="../&binutils-directory;/configure">
+        <param>--prefix=/tools</param>
+        <param>--enable-shared</param>
+        <param>--with-lib-path=/tools/lib</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>-k check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>-C ld</param>
+        <param>clean</param>
+      </make>
+      <make>
+        <param>-C ld</param>
+        <param>LIB_PATH=/usr/lib:/lib</param>
+      </make>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/bison.xml
===================================================================
--- profiles/LFS/trunk/chapter05/bison.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/bison.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="bison" version="&bison-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&bison-md5;</digest>
-			<archive>&packages_dir;/&bison-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bison-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bison-directory;</remove>
-	</stage>
-</package>
-
+  <package name="bison" version="&bison-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&bison-md5;</digest>
+        <archive>&packages_dir;/&bison-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bison-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bison-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/bzip2.xml
===================================================================
--- profiles/LFS/trunk/chapter05/bzip2.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/bzip2.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,39 +1,33 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="bzip2" version="&bzip2-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&bzip2-md5;</digest>
-			<archive>&packages_dir;/&bzip2-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bzip2-directory;</base>
-		</stageinfo>
-
-		<make />
-
-		<make>
-			<param>PREFIX=/tools</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bzip2-directory;</remove>
-	</stage>
-</package>
-
+  <package name="bzip2" version="&bzip2-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&bzip2-md5;</digest>
+        <archive>&packages_dir;/&bzip2-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bzip2-directory;</base>
+      </stageinfo>
+      <make />
+      <make>
+        <param>PREFIX=/tools</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bzip2-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/coreutils.xml
===================================================================
--- profiles/LFS/trunk/chapter05/coreutils.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/coreutils.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,52 +1,44 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="coreutils" version="&coreutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&coreutils-md5;</digest>
-			<archive>&packages_dir;/&coreutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&coreutils-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<prefix>DEFAULT_POSIX2_VERSION=199209</prefix>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>RUN_EXPENSIVE_TESTS=yes</param>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&coreutils-directory;</remove>
-	</stage>
-</package>
-
+  <package name="coreutils" version="&coreutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&coreutils-md5;</digest>
+        <archive>&packages_dir;/&coreutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&coreutils-directory;</base>
+      </stageinfo>
+      <configure>
+        <prefix>DEFAULT_POSIX2_VERSION=199209</prefix>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>RUN_EXPENSIVE_TESTS=yes</param>
+	<param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&coreutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,148 +1,140 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
+  <stage name="Creating the $LFS/tools Directory">
+    <mkdir>
+      <option>parents</option>
+      <name>&LFS;/tools</name>
+    </mkdir>
+    <link>
+      <option>force</option>
+      <target>&LFS;/tools</target>
+      <name>/</name>
+    </link>
+    <!-- From this point forward isn't in the book, it's only here for nALFS to use -->
+    <mkdir base="&LFS;">
+      <option>parents</option>
+      <name>&LFS;&packages_dir;</name>
+      <name>&LFS;&build_dir;</name>
+    </mkdir>
+    <!--
+      If you run a kernel that supports VFS bindings (2.4 or later),
+      you can uncomment this command instead of using the <copy>.
+      Don't forget to also uncomment the unmounting command from
+      the end of the profile.
 
-<stage name="Creating the $LFS/tools Directory">
-	<mkdir>
-		<option>parents</option>
-		<name>&LFS;/tools</name>
-	</mkdir>
-	
-	<link>
-		<option>force</option>
-		<target>&LFS;/tools</target>
-		<name>/</name>
-	</link>
-	
-	<!-- From this point forward isn't in the book, it's only here for nALFS to use -->
-	<mkdir base="&LFS;">
-		<option>parents</option>
-		<name>&LFS;&packages_dir;</name>
-		<name>&LFS;&build_dir;</name>
-	</mkdir>
-	
-	<!--
-	        If you run a kernel that supports VFS bindings (2.4 or later),
-	        you can uncomment this command instead of using the <copy>.
-	        Don't forget to also uncomment the unmounting command from
-		the end of the profile.
-	
-	        Warning: if you use the mount option, and if the execution
-	        of your profile fails, be careful to unmount the package
-	        directory before you delete the content the target partition!
-	
-	        Note: a space has been inserted between the two dashes in the
-		bind parameter to avoid the double dash being deteted as the
-		end of the comment. You need to remove it if you use this
-                command.
-	
-	<execute command="mount">
-		<param>- -bind</param>
-		<param>&orig_packages_dir;</param>
-		<param>&LFS;&packages_dir;</param>
-	</execute>
-	
-	-->
+      Warning: if you use the mount option, and if the execution
+      of your profile fails, be careful to unmount the package
+      directory before you delete the content the target partition!
 
-	<stage name="Copying package and patch files">
-		<stageinfo>
-			<base>&orig_packages_dir;</base>
-		</stageinfo>
-
-		<copy>
-			<source>&autoconf-package;</source>
-			<source>&automake-package;</source>
-			<source>&bash-package;</source>
-			<source>&bash-fixes-patch;</source>
-			<source>&bash-wcontinued-patch;</source>
-			<source>&binutils-package;</source>
-			<source>&bison-package;</source>
-			<source>&bzip2-package;</source>
-			<source>&coreutils-package;</source>
-			<source>&coreutils-dupes-patch;</source>
-			<source>&coreutils-uname-patch;</source>
-			<source>&dejagnu-package;</source>
-			<source>&diffutils-package;</source>
-			<source>&e2fsprogs-package;</source>
-			<source>&expect-package;</source>
-			<source>&expect-spawn-patch;</source>
-			<source>&file-package;</source>
-			<source>&findutils-package;</source>
-			<source>&flex-package;</source>
-			<source>&flex-debian-fixes-patch;</source>
-			<source>&gawk-package;</source>
-			<source>&gcc-package;</source>
-<!--			<source>&gcc-core-package;</source> -->
-<!--			<source>&gcc-gpp-package;</source> -->
-<!--			<source>&gcc-testsuite-package;</source> -->
-			<source>&gcc-linkonce-patch;</source>
-			<source>&gcc-no-fixincludes-patch;</source>
-			<source>&gcc-specs-patch;</source>
-			<source>&gettext-package;</source>
-			<source>&glibc-package;</source>
-			<source>&grep-package;</source>
-			<source>&groff-package;</source>
-			<source>&grub-package;</source>
-			<source>&gzip-package;</source>
-			<source>&hotplug-package;</source>
-			<source>&iana-etc-package;</source>
-			<source>&inetutils-package;</source>
-			<source>&inetutils-no-man-pages-patch;</source>
-			<source>&inetutils-kernel-headers-patch;</source>
- 			<source>&iproute2-package;</source>
- 			<source>&iproute2-remove-db-patch;</source>
-			<source>&iproute2-find-update-patch;</source>
-			<source>&kbd-package;</source>
-			<source>&less-package;</source>
-			<source>&lfs-bootscripts-package;</source>
-			<source>&libol-package;</source>
-			<source>&libtool-package;</source>
-			<source>&libxml2-package;</source>
-			<source>&linux-package;</source>
-			<source>&linux-security-patch;</source>
-			<source>&linux-libc-headers-package;</source>
-			<source>&kernel-config;</source>
-			<source>&m4-package;</source>
-			<source>&make-package;</source>
-			<source>&man-package;</source>
-			<source>&man-pages-package;</source>
-			<source>&mktemp-package;</source>
-			<source>&mktemp-tempfile-patch;</source>
-			<source>&module-init-tools-package;</source>
-			<source>&ncurses-package;</source>
-			<source>&nALFS-package;</source>
-			<source>&patch-package;</source>
-			<source>&perl-package;</source>
-			<source>&perl-libc-1-patch;</source>
-			<source>&procps-package;</source>
-			<source>&psmisc-package;</source>
-			<source>&readline-package;</source>
-			<source>&readline-fixes-patch;</source>
-			<source>&sed-package;</source>
-			<source>&shadow-package;</source>
-			<source>&syslog-ng-package;</source>
-			<source>&sysvinit-package;</source>
-			<source>&tar-package;</source>
-			<source>&tcl-package;</source>
-			<source>&texinfo-package;</source>
-			<source>&udev-package;</source>
-			<source>&udev-permissions-file;</source>
-			<source>&udev-rules-file;</source>
-			<source>&util-linux-package;</source>
-			<source>&util-linux-cramfs-patch;</source>
-			<source>&vim-package;</source>
-			<source>&vim-lang-package;</source>
-			<source>&vim-security-patch;</source>
-			<source>&zlib-package;</source>
-			<destination>&LFS;&packages_dir;</destination>
-		</copy>
-	</stage>
-</stage>
+      Note: a space has been inserted between the two dashes in the
+      bind parameter to avoid the double dash being deteted as the
+      end of the comment. You need to remove it if you use this
+      command.
+    <execute command="mount">
+      <param>- -bind</param>
+      <param>&orig_packages_dir;</param>
+      <param>&LFS;&packages_dir;</param>
+    </execute>
+    -->
+    <stage name="Copying package and patch files">
+      <stageinfo>
+        <base>&orig_packages_dir;</base>
+      </stageinfo>
+      <copy>
+        <source>&autoconf-package;</source>
+        <source>&automake-package;</source>
+        <source>&bash-package;</source>
+        <source>&bash-fixes-patch;</source>
+        <source>&bash-wcontinued-patch;</source>
+        <source>&binutils-package;</source>
+        <source>&bison-package;</source>
+        <source>&bzip2-package;</source>
+        <source>&coreutils-package;</source>
+        <source>&coreutils-dupes-patch;</source>
+        <source>&coreutils-uname-patch;</source>
+        <source>&dejagnu-package;</source>
+        <source>&diffutils-package;</source>
+        <source>&e2fsprogs-package;</source>
+        <source>&expect-package;</source>
+        <source>&expect-spawn-patch;</source>
+        <source>&file-package;</source>
+        <source>&findutils-package;</source>
+        <source>&flex-package;</source>
+        <source>&flex-debian-fixes-patch;</source>
+        <source>&gawk-package;</source>
+        <source>&gcc-package;</source>
+        <!-- <source>&gcc-core-package;</source> -->
+        <!-- <source>&gcc-gpp-package;</source> -->
+        <!-- <source>&gcc-testsuite-package;</source> -->
+        <source>&gcc-linkonce-patch;</source>
+        <source>&gcc-no-fixincludes-patch;</source>
+        <source>&gcc-specs-patch;</source>
+        <source>&gettext-package;</source>
+        <source>&glibc-package;</source>
+        <source>&grep-package;</source>
+        <source>&groff-package;</source>
+        <source>&grub-package;</source>
+        <source>&gzip-package;</source>
+        <source>&hotplug-package;</source>
+        <source>&iana-etc-package;</source>
+        <source>&inetutils-package;</source>
+        <source>&inetutils-no-man-pages-patch;</source>
+        <source>&inetutils-kernel-headers-patch;</source>
+        <source>&iproute2-package;</source>
+        <source>&iproute2-remove-db-patch;</source>
+        <source>&iproute2-find-update-patch;</source>
+        <source>&kbd-package;</source>
+        <source>&less-package;</source>
+        <source>&lfs-bootscripts-package;</source>
+        <source>&libol-package;</source>
+        <source>&libtool-package;</source>
+        <source>&libxml2-package;</source>
+        <source>&linux-package;</source>
+        <source>&linux-security-patch;</source>
+        <source>&linux-libc-headers-package;</source>
+        <source>&kernel-config;</source>
+        <source>&m4-package;</source>
+        <source>&make-package;</source>
+        <source>&man-package;</source>
+        <source>&man-pages-package;</source>
+        <source>&mktemp-package;</source>
+        <source>&mktemp-tempfile-patch;</source>
+        <source>&module-init-tools-package;</source>
+        <source>&ncurses-package;</source>
+        <source>&nALFS-package;</source>
+        <source>&patch-package;</source>
+        <source>&perl-package;</source>
+        <source>&perl-libc-1-patch;</source>
+        <source>&procps-package;</source>
+        <source>&psmisc-package;</source>
+        <source>&readline-package;</source>
+        <source>&readline-fixes-patch;</source>
+        <source>&sed-package;</source>
+        <source>&shadow-package;</source>
+        <source>&syslog-ng-package;</source>
+        <source>&sysvinit-package;</source>
+        <source>&tar-package;</source>
+        <source>&tcl-package;</source>
+        <source>&texinfo-package;</source>
+        <source>&udev-package;</source>
+        <source>&udev-permissions-file;</source>
+        <source>&udev-rules-file;</source>
+        <source>&util-linux-package;</source>
+        <source>&util-linux-cramfs-patch;</source>
+        <source>&vim-package;</source>
+        <source>&vim-lang-package;</source>
+        <source>&vim-security-patch;</source>
+        <source>&zlib-package;</source>
+        <destination>&LFS;&packages_dir;</destination>
+      </copy>
+    </stage>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/dejagnu.xml
===================================================================
--- profiles/LFS/trunk/chapter05/dejagnu.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/dejagnu.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,40 +1,34 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="dejagnu" version="&dejagnu-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&dejagnu-md5;</digest>
-			<archive>&packages_dir;/&dejagnu-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&dejagnu-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&dejagnu-directory;</remove>
-	</stage>
-</package>
-
+  <package name="dejagnu" version="&dejagnu-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&dejagnu-md5;</digest>
+        <archive>&packages_dir;/&dejagnu-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&dejagnu-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&dejagnu-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/diffutils.xml
===================================================================
--- profiles/LFS/trunk/chapter05/diffutils.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/diffutils.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="diffutils" version="&diffutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&diffutils-md5;</digest>
-			<archive>&packages_dir;/&diffutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&diffutils-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&diffutils-directory;</remove>
-	</stage>
-</package>
-
+  <package name="diffutils" version="&diffutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&diffutils-md5;</digest>
+        <archive>&packages_dir;/&diffutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&diffutils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&diffutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/expect.xml
===================================================================
--- profiles/LFS/trunk/chapter05/expect.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/expect.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,58 +1,49 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="expect" version="&expect-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&expect-md5;</digest>
-			<archive>&packages_dir;/&expect-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&expect-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&expect-spawn-patch;</param>
-		</patch>
-
-		<configure>
-			<param>--prefix=/tools</param>
-			<param>--with-tcl=/tools/lib</param>
-			<param>--with-x=no</param>
-		</configure>
-
-		<make />
-
-<!--
-		<make>
-			<param>test</param>
-		</make>
--->
-
-		<make>
-			<param>SCRIPTS=""</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&tcl-directory;</remove>
-		<remove>&build_dir;/&expect-directory;</remove>
-	</stage>
-</package>
-
+  <package name="expect" version="&expect-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&expect-md5;</digest>
+        <archive>&packages_dir;/&expect-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&expect-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&expect-spawn-patch;</param>
+      </patch>
+      <configure>
+        <param>--prefix=/tools</param>
+        <param>--with-tcl=/tools/lib</param>
+        <param>--with-x=no</param>
+      </configure>
+      <make />
+      <!--
+      <make>
+        <param>test</param>
+      </make>
+      -->
+      <make>
+        <param>SCRIPTS=""</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&tcl-directory;</remove>
+      <remove>&build_dir;/&expect-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/findutils.xml
===================================================================
--- profiles/LFS/trunk/chapter05/findutils.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/findutils.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="findutils" version="&findutils-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&findutils-md5;</digest>
-			<archive>&packages_dir;/&findutils-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&findutils-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&findutils-directory;</remove>
-	</stage>
-</package>
-
+  <package name="findutils" version="&findutils-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&findutils-md5;</digest>
+        <archive>&packages_dir;/&findutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&findutils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&findutils-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/flex.xml
===================================================================
--- profiles/LFS/trunk/chapter05/flex.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/flex.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,60 +1,50 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="flex" version="&flex-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&flex-md5;</digest>
-			<archive>&packages_dir;/&flex-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&flex-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&flex-debian-fixes-patch;</param>
-		</patch>
-
-		<execute command="touch">
-		  <param>doc/flex.1</param>
-		</execute>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>bigcheck</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&flex-directory;</remove>
-	</stage>
-</package>
-
+  <package name="flex" version="&flex-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&flex-md5;</digest>
+        <archive>&packages_dir;/&flex-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&flex-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&flex-debian-fixes-patch;</param>
+      </patch>
+      <execute command="touch">
+        <param>doc/flex.1</param>
+      </execute>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>bigcheck</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&flex-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/gawk.xml
===================================================================
--- profiles/LFS/trunk/chapter05/gawk.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/gawk.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gawk" version="&gawk-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gawk-md5;</digest>
-			<archive>&packages_dir;/&gawk-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gawk-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gawk-directory;</remove>
-	</stage>
-</package>
-
+  <package name="gawk" version="&gawk-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gawk-md5;</digest>
+        <archive>&packages_dir;/&gawk-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gawk-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gawk-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/gcc-pass1.xml
===================================================================
--- profiles/LFS/trunk/chapter05/gcc-pass1.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/gcc-pass1.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,68 +1,59 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gcc-pass1" version="&gcc-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gcc-md5;</digest>
-			<archive>&packages_dir;/&gcc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<option>parents</option>
-			<name>gcc-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/gcc-build</base>
-		</stageinfo>
-
-		<configure command="../&gcc-directory;/configure">
-			<prefix>CC="gcc -B/usr/bin"</prefix>
-			<param>--prefix=/tools</param>
-			<param>--libexecdir=/tools/lib</param>
-			<param>--with-local-prefix=/tools</param>
-			<param>--disable-nls</param>
-			<param>--enable-shared</param>
-			<param>--enable-languages=c</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-			<param>BOOT_LDFLAGS="-static"</param>
-			<param>bootstrap</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-
-                <link>
-			<option>force</option>
-			<target>gcc</target>
-			<name>/tools/bin/cc</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/gcc-build</remove>
-		<remove>&build_dir;/&gcc-directory;</remove>
-	</stage>
-</package>
-
+  <package name="gcc-pass1" version="&gcc-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gcc-md5;</digest>
+        <archive>&packages_dir;/&gcc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <option>parents</option>
+        <name>gcc-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/gcc-build</base>
+      </stageinfo>
+      <configure command="../&gcc-directory;/configure">
+        <prefix>CC="gcc -B/usr/bin"</prefix>
+        <param>--prefix=/tools</param>
+        <param>--libexecdir=/tools/lib</param>
+        <param>--with-local-prefix=/tools</param>
+        <param>--disable-nls</param>
+        <param>--enable-shared</param>
+        <param>--enable-languages=c</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+        <param>BOOT_LDFLAGS="-static"</param>
+        <param>bootstrap</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>gcc</target>
+        <name>/tools/bin/cc</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/gcc-build</remove>
+      <remove>&build_dir;/&gcc-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/gcc-pass2.xml
===================================================================
--- profiles/LFS/trunk/chapter05/gcc-pass2.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/gcc-pass2.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,89 +1,76 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gcc-pass2" version="&gcc-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gcc-md5;</digest>
-			<archive>&packages_dir;/&gcc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<option>parents</option>
-			<name>gcc-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/gcc-build</base>
-		</stageinfo>
-
-<!-- Run the following command:  expect -c "spawn ls"
+  <package name="gcc-pass2" version="&gcc-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gcc-md5;</digest>
+        <archive>&packages_dir;/&gcc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <option>parents</option>
+        <name>gcc-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/gcc-build</base>
+      </stageinfo>
+      <!-- Run the following command:  expect -c "spawn ls"
 If you receive the message:
-	The system has no more ptys.  Ask your system administrator to create more.
+        The system has no more ptys.  Ask your system administrator to create more.
 Your host distribution is not set up for proper PTY operation. In this case there is no point in running the test
 suites for GCC and Binutils until you are able to resolve the issue.
--->
-
-		<patch base="&build_dir;/&gcc-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc-no-fixincludes-patch;</param>
-		</patch>
-
-		<patch base="&build_dir;/&gcc-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc-specs-patch;</param>
-		</patch>
-
-		<configure command="../&gcc-directory;/configure">
-			<param>--prefix=/tools</param>
-			<param>--libexecdir=/tools/lib</param>
-			<param>--with-local-prefix=/tools</param>
-			<param>--enable-clocale=gnu</param>
-			<param>--enable-shared</param>
-			<param>--enable-threads=posix</param>
-			<param>--enable-__cxa_atexit</param>
-			<param>--enable-languages=c,c++</param>
-			<param>--disable-libstdcxx-pch</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>-k check</param>
-		</make>
-
-		<execute command="../&gcc-directory;/contrib/test_summary" />
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gcc-directory;</remove>
-		<remove>&build_dir;/gcc-build</remove>
-	</stage>
-</package>
-
+      -->
+      <patch base="&build_dir;/&gcc-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gcc-no-fixincludes-patch;</param>
+      </patch>
+      <patch base="&build_dir;/&gcc-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&gcc-specs-patch;</param>
+      </patch>
+      <configure command="../&gcc-directory;/configure">
+        <param>--prefix=/tools</param>
+        <param>--libexecdir=/tools/lib</param>
+        <param>--with-local-prefix=/tools</param>
+        <param>--enable-clocale=gnu</param>
+        <param>--enable-shared</param>
+        <param>--enable-threads=posix</param>
+        <param>--enable-__cxa_atexit</param>
+        <param>--enable-languages=c,c++</param>
+        <param>--disable-libstdcxx-pch</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>-k check</param>
+      </make>
+      <execute command="../&gcc-directory;/contrib/test_summary" />
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gcc-directory;</remove>
+      <remove>&build_dir;/gcc-build</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/gettext.xml
===================================================================
--- profiles/LFS/trunk/chapter05/gettext.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/gettext.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,52 +1,44 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gettext" version="&gettext-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gettext-md5;</digest>
-			<archive>&packages_dir;/&gettext-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gettext-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-			<param>--disable-libasprintf</param>
-			<param>--disable-csharp</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gettext-directory;</remove>
-	</stage>
-</package>
-
+  <package name="gettext" version="&gettext-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gettext-md5;</digest>
+        <archive>&packages_dir;/&gettext-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gettext-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+        <param>--disable-libasprintf</param>
+        <param>--disable-csharp</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gettext-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/glibc.xml
===================================================================
--- profiles/LFS/trunk/chapter05/glibc.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/glibc.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,97 +1,83 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="glibc" version="&glibc-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&glibc-md5;</digest>
-			<archive>&packages_dir;/&glibc-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<mkdir base="&build_dir;">
-			<option>parents</option>
-			<name>glibc-build</name>
-		</mkdir>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<environment>
-				<variable name="CFLAGS" />
-				<variable name="CXXFLAGS" />
-			</environment>
-			<base>&build_dir;/glibc-build</base>
-		</stageinfo>
-
-		<configure command="../&glibc-directory;/configure">
-			<param>--prefix=/tools</param>
-			<param>--disable-profile</param>
-			<param>--enable-add-ons</param>
-			<param>--enable-kernel=2.6.0</param>
-			<param>--with-binutils=/tools/bin</param>
-			<param>--without-gd</param>
-			<param>--without-cvs</param>
-			<param>--with-headers=/tools/include</param>
-			<param>--disable-selinux</param>
-		</configure>
-
-		<make>
-			<prefix>PARALLELMFLAGS=&jlevel;</prefix>
-		</make>
-
-		<make>
-			<param>check</param>
-		</make>
-
-		<mkdir>
-			<name>/tools/etc</name>
-		</mkdir>
-
-		<execute command="touch">
-			<param>/tools/etc/ld.so.conf</param>
-		</execute>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/tools/lib/locale</name>
-		</mkdir>
-
-<!--
-		<make>
-			<param>localedata/install-locales</param>
-		</make>
--->
-
-		<execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
-		<execute command="localedef -i de_DE at euro -f ISO-8859-15 de_DE at euro" />
-		<execute command="localedef -i en_HK -f ISO-8859-1 en_HK" />
-		<execute command="localedef -i en_PH -f ISO-8859-1 en_PH" />
-		<execute command="localedef -i en_US -f ISO-8859-1 en_US" />
-		<execute command="localedef -i es_MX -f ISO-8859-1 es_MX" />
-		<execute command="localedef -i fa_IR -f UTF-8 fa_IR" />
-		<execute command="localedef -i fr_FR -f ISO-8859-1 fr_FR" />
-		<execute command="localedef -i fr_FR at euro -f ISO-8859-15 fr_FR at euro" />
-		<execute command="localedef -i it_IT -f ISO-8859-1 it_IT" />
-		<execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&glibc-directory;</remove>
-		<remove>&build_dir;/glibc-build</remove>
-	</stage>
-</package>
-
+  <package name="glibc" version="&glibc-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&glibc-md5;</digest>
+        <archive>&packages_dir;/&glibc-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <mkdir base="&build_dir;">
+        <option>parents</option>
+        <name>glibc-build</name>
+      </mkdir>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/glibc-build</base>
+      </stageinfo>
+      <configure command="../&glibc-directory;/configure">
+        <param>--prefix=/tools</param>
+        <param>--disable-profile</param>
+        <param>--enable-add-ons</param>
+        <param>--enable-kernel=2.6.0</param>
+        <param>--with-binutils=/tools/bin</param>
+        <param>--without-gd</param>
+        <param>--without-cvs</param>
+        <param>--with-headers=/tools/include</param>
+        <param>--disable-selinux</param>
+      </configure>
+      <make>
+        <prefix>PARALLELMFLAGS=&jlevel;</prefix>
+      </make>
+      <make>
+        <param>check</param>
+      </make>
+      <mkdir>
+        <name>/tools/etc</name>
+      </mkdir>
+      <execute command="touch">
+        <param>/tools/etc/ld.so.conf</param>
+      </execute>
+      <make>
+        <param>install</param>
+      </make>
+      <mkdir>
+        <option>parents</option>
+        <name>/tools/lib/locale</name>
+      </mkdir>
+      <!--
+      <make>
+        <param>localedata/install-locales</param>
+      </make>
+      -->
+      <execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
+      <execute command="localedef -i de_DE at euro -f ISO-8859-15 de_DE at euro" />
+      <execute command="localedef -i en_HK -f ISO-8859-1 en_HK" />
+      <execute command="localedef -i en_PH -f ISO-8859-1 en_PH" />
+      <execute command="localedef -i en_US -f ISO-8859-1 en_US" />
+      <execute command="localedef -i es_MX -f ISO-8859-1 es_MX" />
+      <execute command="localedef -i fa_IR -f UTF-8 fa_IR" />
+      <execute command="localedef -i fr_FR -f ISO-8859-1 fr_FR" />
+      <execute command="localedef -i fr_FR at euro -f ISO-8859-15 fr_FR at euro" />
+      <execute command="localedef -i it_IT -f ISO-8859-1 it_IT" />
+      <execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&glibc-directory;</remove>
+      <remove>&build_dir;/glibc-build</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/grep.xml
===================================================================
--- profiles/LFS/trunk/chapter05/grep.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/grep.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,52 +1,44 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="grep" version="&grep-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&grep-md5;</digest>
-			<archive>&packages_dir;/&grep-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&grep-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-			<param>--disable-perl-regexp</param>
-			<param>--with-included-regex</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&grep-directory;</remove>
-	</stage>
-</package>
-
+  <package name="grep" version="&grep-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&grep-md5;</digest>
+        <archive>&packages_dir;/&grep-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&grep-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+        <param>--disable-perl-regexp</param>
+        <param>--with-included-regex</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&grep-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/gzip.xml
===================================================================
--- profiles/LFS/trunk/chapter05/gzip.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/gzip.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="gzip" version="&gzip-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&gzip-md5;</digest>
-			<archive>&packages_dir;/&gzip-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gzip-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gzip-directory;</remove>
-	</stage>
-</package>
-
+  <package name="gzip" version="&gzip-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&gzip-md5;</digest>
+        <archive>&packages_dir;/&gzip-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gzip-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gzip-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/kernel-headers.xml
===================================================================
--- profiles/LFS/trunk/chapter05/kernel-headers.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/kernel-headers.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,63 +1,53 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="kernel-headers" version="&linux-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&linux-md5;</digest>
-			<archive>&packages_dir;/&linux-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&linux-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>mrproper</param>
-		</make>
-
-		<make>
-			<param>include/linux/version.h</param>
-		</make>
-
-		<make>
-			<param>include/asm</param>
-		</make>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/tools/glibc-kernheaders/asm</name>
-		</mkdir>
-
-		<copy>
-			<option>recursive</option>
-			<source>include/asm/*</source>
-			<destination>/tools/glibc-kernheaders/asm</destination>
-		</copy>
-
-		<copy>
-			<option>recursive</option>
-			<source>include/asm-generic</source>
-			<destination>/tools/glibc-kernheaders</destination>
-		</copy>
-
-		<copy>
-			<option>recursive</option>
-			<source>include/linux</source>
-			<destination>/tools/glibc-kernheaders</destination>
-		</copy>
-	</stage>
-</package>
-
+  <package name="kernel-headers" version="&linux-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&linux-md5;</digest>
+        <archive>&packages_dir;/&linux-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&linux-directory;</base>
+      </stageinfo>
+      <make>
+        <param>mrproper</param>
+      </make>
+      <make>
+        <param>include/linux/version.h</param>
+      </make>
+      <make>
+        <param>include/asm</param>
+      </make>
+      <mkdir>
+        <option>parents</option>
+        <name>/tools/glibc-kernheaders/asm</name>
+      </mkdir>
+      <copy>
+        <option>recursive</option>
+        <source>include/asm/*</source>
+        <destination>/tools/glibc-kernheaders/asm</destination>
+      </copy>
+      <copy>
+        <option>recursive</option>
+        <source>include/asm-generic</source>
+        <destination>/tools/glibc-kernheaders</destination>
+      </copy>
+      <copy>
+        <option>recursive</option>
+        <source>include/linux</source>
+        <destination>/tools/glibc-kernheaders</destination>
+      </copy>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/libc-headers.xml
===================================================================
--- profiles/LFS/trunk/chapter05/libc-headers.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/libc-headers.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,44 +1,38 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="libc-headers" version="&linux-libc-headers-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&linux-libc-headers-md5;</digest>
-			<archive>&packages_dir;/&linux-libc-headers-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&linux-libc-headers-directory;</base>
-		</stageinfo>
-
-		<copy>
-		  	<option>recursive</option>
-			<source>include/asm-i386</source>
-			<destination>/tools/include/asm</destination>
-		</copy>
-
-		<copy>
-		  	<option>recursive</option>
-			<source>include/linux</source>
-			<destination>/tools/include</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&linux-libc-headers-directory;</remove>
-	</stage>
-</package>
-
+  <package name="libc-headers" version="&linux-libc-headers-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&linux-libc-headers-md5;</digest>
+        <archive>&packages_dir;/&linux-libc-headers-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&linux-libc-headers-directory;</base>
+      </stageinfo>
+      <copy>
+        <option>recursive</option>
+        <source>include/asm-i386</source>
+        <destination>/tools/include/asm</destination>
+      </copy>
+      <copy>
+        <option>recursive</option>
+        <source>include/linux</source>
+        <destination>/tools/include</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&linux-libc-headers-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/m4.xml
===================================================================
--- profiles/LFS/trunk/chapter05/m4.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/m4.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="m4" version="&m4-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&m4-md5;</digest>
-			<archive>&packages_dir;/&m4-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&m4-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&m4-directory;</remove>
-	</stage>
-</package>
-
+  <package name="m4" version="&m4-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&m4-md5;</digest>
+        <archive>&packages_dir;/&m4-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&m4-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&m4-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/make.xml
===================================================================
--- profiles/LFS/trunk/chapter05/make.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/make.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="make" version="&make-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&make-md5;</digest>
-			<archive>&packages_dir;/&make-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&make-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&make-directory;</remove>
-	</stage>
-</package>
-
+  <package name="make" version="&make-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&make-md5;</digest>
+        <archive>&packages_dir;/&make-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&make-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&make-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/ncurses.xml
===================================================================
--- profiles/LFS/trunk/chapter05/ncurses.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/ncurses.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,48 +1,41 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="ncurses" version="&ncurses-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&ncurses-md5;</digest>
-			<archive>&packages_dir;/&ncurses-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&ncurses-directory;</base>
-		</stageinfo>
-
-                <configure>
-			<param>--prefix=/tools</param>
-			<param>--with-shared</param>
-			<param>--without-debug</param>
-			<param>--without-ada</param>
-			<param>--enable-overwrite</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&ncurses-directory;</remove>
-	</stage>
-</package>
-
+  <package name="ncurses" version="&ncurses-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&ncurses-md5;</digest>
+        <archive>&packages_dir;/&ncurses-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&ncurses-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+        <param>--with-shared</param>
+        <param>--without-debug</param>
+        <param>--without-ada</param>
+        <param>--enable-overwrite</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&ncurses-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/patch.xml
===================================================================
--- profiles/LFS/trunk/chapter05/patch.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/patch.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="patch" version="&patch-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&patch-md5;</digest>
-			<archive>&packages_dir;/&patch-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&patch-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<prefix>CPPFLAGS=-D_GNU_SOURCE</prefix>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&patch-directory;</remove>
-	</stage>
-</package>
-
+  <package name="patch" version="&patch-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&patch-md5;</digest>
+        <archive>&packages_dir;/&patch-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&patch-directory;</base>
+      </stageinfo>
+      <configure>
+        <prefix>CPPFLAGS=-D_GNU_SOURCE</prefix>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&patch-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/perl.xml
===================================================================
--- profiles/LFS/trunk/chapter05/perl.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/perl.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,66 +1,56 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="perl" version="&perl-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&perl-md5;</digest>
-			<archive>&packages_dir;/&perl-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&perl-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&perl-libc-1-patch;</param>
-		</patch>
-
-		<configure command="./configure.gnu">
-			<param>--prefix=/tools</param>
-			<param>-Dstatic_ext='IO Fcntl POSIX'</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-			<param>perl</param>
-			<param>utilities</param>
-		</make>
-
-		<copy>
-			<source>perl</source>
-			<source>pod/pod2man</source>
-			<destination>/tools/bin</destination>
-		</copy>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/tools/lib/perl5/&perl-version;</name>
-		</mkdir>
-
-		<copy>
-			<option>recursive</option>
-			<source>lib/*</source>
-			<destination>/tools/lib/perl5/&perl-version;</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&perl-directory;</remove>
-	</stage>
-</package>
-
+  <package name="perl" version="&perl-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&perl-md5;</digest>
+        <archive>&packages_dir;/&perl-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&perl-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&perl-libc-1-patch;</param>
+      </patch>
+      <configure command="./configure.gnu">
+        <param>--prefix=/tools</param>
+        <param>-Dstatic_ext='IO Fcntl POSIX'</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+        <param>perl</param>
+        <param>utilities</param>
+      </make>
+      <copy>
+        <source>perl</source>
+        <source>pod/pod2man</source>
+        <destination>/tools/bin</destination>
+      </copy>
+      <mkdir>
+        <option>parents</option>
+        <name>/tools/lib/perl5/&perl-version;</name>
+      </mkdir>
+      <copy>
+        <option>recursive</option>
+        <source>lib/*</source>
+        <destination>/tools/lib/perl5/&perl-version;</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&perl-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/sed.xml
===================================================================
--- profiles/LFS/trunk/chapter05/sed.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/sed.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="sed" version="&sed-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&sed-md5;</digest>
-			<archive>&packages_dir;/&sed-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&sed-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&sed-directory;</remove>
-	</stage>
-</package>
-
+  <package name="sed" version="&sed-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&sed-md5;</digest>
+        <archive>&packages_dir;/&sed-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&sed-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&sed-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/settingenvironment.xml
===================================================================
--- profiles/LFS/trunk/chapter05/settingenvironment.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/settingenvironment.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,35 +1,31 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 
 %general_entities;
 ]>
-
 <alfs>
-
-<stage name="Setting Up the Environment">
-	<stageinfo>
-		<user>&lfs-user;</user>
-	</stageinfo>
-
-	<textdump>
-		<file>&lfs-user-dir;/.bash_profile</file>
-		<content>
-			=exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash
-		</content>
-	</textdump>
-
-	<textdump>
-		<file>&lfs-user-dir;/.bashrc</file>
-		<content>
-			=set +h
-			=umask 022
-			=LFS=&LFS;
-			=LC_ALL=POSIX
-			=PATH=/tools/bin:/bin:/usr/bin
-			=export LFS LC_ALL PATH
-		</content>
-	</textdump>
-</stage>
-
+  <stage name="Setting Up the Environment">
+    <stageinfo>
+      <user>&lfs-user;</user>
+    </stageinfo>
+    <textdump>
+      <file>&lfs-user-dir;/.bash_profile</file>
+      <content>
+	=exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash
+      </content>
+    </textdump>
+    <textdump>
+      <file>&lfs-user-dir;/.bashrc</file>
+      <content>
+      	=set +h
+	=umask 022
+	=LFS=&LFS;
+	=LC_ALL=POSIX
+	=PATH=/tools/bin:/bin:/usr/bin
+	=export LFS LC_ALL PATH
+      </content>
+    </textdump>
+  </stage>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/strip.xml
===================================================================
--- profiles/LFS/trunk/chapter05/strip.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/strip.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
-
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[]>
 <alfs>
-<!--	
+  <!--    
  ************************ 
- * OPTIONAL BUT USEFULL *
+ * OPTIONAL BUT USEFUL  *
  ************************
 
- * remove the space in between the - -strip command to make the strip work
+ * remove the space in between the - -strip commands to make the strip work
 
-<stage name="First stripping of debug symbols">
-	<execute command="/tools/bin/strip">
-		<param>- -strip-debug</param>
-		<param>/tools/lib/*</param>
-	</execute>
-
-	<execute command="/tools/bin/strip">
-		<param>- -strip-unneeded</param>
-		<param>/tools/{,s}bin/*</param>
-	</execute>
-
-	<remove>/tools/{doc,info,man}</remove>
-
-</stage>
+  <stage name="First stripping of debug symbols">
+    <execute command="/tools/bin/strip">
+      <param>- -strip-debug</param>
+      <param>/tools/lib/*</param>
+    </execute>
+    <execute command="/tools/bin/strip">
+      <param>- -strip-unneeded</param>
+      <param>/tools/{,s}bin/*</param>
+    </execute>
+    <remove>/tools/{doc,info,man}</remove>
+  </stage>
 -->
 </alfs>

Modified: profiles/LFS/trunk/chapter05/tar.xml
===================================================================
--- profiles/LFS/trunk/chapter05/tar.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/tar.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="tar" version="&tar-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&tar-md5;</digest>
-			<archive>&packages_dir;/&tar-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&tar-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&tar-directory;</remove>
-	</stage>
-</package>
-
+  <package name="tar" version="&tar-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&tar-md5;</digest>
+        <archive>&packages_dir;/&tar-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&tar-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&tar-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/tcl.xml
===================================================================
--- profiles/LFS/trunk/chapter05/tcl.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/tcl.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,51 +1,43 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="tcl" version="&tcl-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&tcl-md5;</digest>
-			<archive>&packages_dir;/&tcl-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&tcl-directory;/unix</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make />
-
-<!--
-		<make>
-			<prefix>TZ=UTC</prefix>
-			<param>test</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<link>
-			<option>force</option>
-			<target>tclsh8.4</target>
-			<name>/tools/bin/tclsh</name>
-                </link>
-	</stage>
-</package>
-
+  <package name="tcl" version="&tcl-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&tcl-md5;</digest>
+        <archive>&packages_dir;/&tcl-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&tcl-directory;/unix</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make />
+      <!--
+      <make>
+        <prefix>TZ=UTC</prefix>
+        <param>test</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>tclsh8.4</target>
+        <name>/tools/bin/tclsh</name>
+      </link>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/texinfo.xml
===================================================================
--- profiles/LFS/trunk/chapter05/texinfo.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/texinfo.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,50 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="texinfo" version="&texinfo-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&texinfo-md5;</digest>
-			<archive>&packages_dir;/&texinfo-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&texinfo-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/tools</param>
-		</configure>
-
-		<make>
-			<param>&jlevel;</param>
-		</make>
-
-<!--
-		<make>
-			<param>check</param>
-		</make>
--->
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&texinfo-directory;</remove>
-	</stage>
-</package>
-
+  <package name="texinfo" version="&texinfo-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&texinfo-md5;</digest>
+        <archive>&packages_dir;/&texinfo-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&texinfo-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/tools</param>
+      </configure>
+      <make>
+        <param>&jlevel;</param>
+      </make>
+      <!--
+      <make>
+        <param>check</param>
+      </make>
+      -->
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&texinfo-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/udev.xml
===================================================================
--- profiles/LFS/trunk/chapter05/udev.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/udev.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,60 +1,51 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="udev" version="&udev-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&udev-md5;</digest>
-			<archive>&packages_dir;/&udev-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&udev-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&udev-etcdir-patch;</param>
-		</patch>
-
-		<make>
-		  	<param>prefix=/tools</param>
-			<param>udevdir=/dev</param>
-		</make>
-
-		<make>
-			<param>prefix=/tools</param>	
-			<param>install</param>
-		</make>
-		
-		<copy base="&packages_dir;">
-        		<option>force</option>
-        		<source>&udev-permissions-file;</source>
-        		<destination>/tools/etc/udev/permissions.d/00-lfs.permissions</destination>
-		</copy>
-
-		<copy base="&packages_dir;">
-        		<option>force</option>
-        		<source>&udev-rules-file;</source>
-        		<destination>/tools/etc/udev/rules.d/00-lfs.rules</destination>
-		</copy>				
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&udev-directory;</remove>
-	</stage>
-</package>
-
+  <package name="udev" version="&udev-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&udev-md5;</digest>
+        <archive>&packages_dir;/&udev-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&udev-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&udev-etcdir-patch;</param>
+      </patch>
+      <make>
+        <param>prefix=/tools</param>
+        <param>udevdir=/dev</param>
+      </make>
+      <make>
+        <param>prefix=/tools</param>
+        <param>install</param>
+      </make>
+      <copy base="&packages_dir;">
+        <option>force</option>
+        <source>&udev-permissions-file;</source>
+        <destination>/tools/etc/udev/permissions.d/00-lfs.permissions</destination>
+      </copy>
+      <copy base="&packages_dir;">
+        <option>force</option>
+        <source>&udev-rules-file;</source>
+        <destination>/tools/etc/udev/rules.d/00-lfs.rules</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&udev-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/LFS/trunk/chapter05/util-linux.xml
===================================================================
--- profiles/LFS/trunk/chapter05/util-linux.xml	2005-02-06 19:15:03 UTC (rev 1712)
+++ profiles/LFS/trunk/chapter05/util-linux.xml	2005-02-06 19:25:33 UTC (rev 1713)
@@ -1,64 +1,54 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
 
 %general_entities;
 %package_entities;
 ]>
-
 <alfs>
-
-<package name="util-linux" version="&util-linux-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&util-linux-md5;</digest>
-			<archive>&packages_dir;/&util-linux-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&util-linux-directory;</base>
-		</stageinfo>
-
-		<search_replace>
-			<file>configure</file>
-			<find>/usr/include</find>
-			<replace>/tools/include</replace>
-		</search_replace>
-
-		<configure />
-
-		<make>
-			<param>&jlevel;</param>
-			<param>-C lib</param>
-		</make>
-
-		<make>
-			<param>&jlevel;</param>
-			<param>-C mount</param>
-			<param>mount</param>
-			<param>umount</param>
-		</make>
-
-		<make>
-			<param>&jlevel;</param>
-			<param>-C text-utils</param>
-			<param>more</param>
-		</make>
-
-		<copy>
-			<source>mount/{,u}mount</source>
-			<source>text-utils/more</source>
-			<destination>/tools/bin</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&util-linux-directory;</remove>
-	</stage>
-</package>
-
+  <package name="util-linux" version="&util-linux-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&util-linux-md5;</digest>
+        <archive>&packages_dir;/&util-linux-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&util-linux-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>configure</file>
+        <find>/usr/include</find>
+        <replace>/tools/include</replace>
+      </search_replace>
+      <configure />
+      <make>
+        <param>&jlevel;</param>
+        <param>-C lib</param>
+      </make>
+      <make>
+        <param>&jlevel;</param>
+        <param>-C mount</param>
+        <param>mount</param>
+        <param>umount</param>
+      </make>
+      <make>
+        <param>&jlevel;</param>
+        <param>-C text-utils</param>
+        <param>more</param>
+      </make>
+      <copy>
+        <source>mount/{,u}mount</source>
+        <source>text-utils/more</source>
+        <destination>/tools/bin</destination>
+      </copy>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&util-linux-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list