r1571 - in profiles/LFS/branches/6.0: . chapter05 chapter06 chapter07 chapter09 config_separate config_tarball

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Oct 26 20:32:29 PDT 2004


Author: thomasp
Date: 2004-10-26 21:32:26 -0600 (Tue, 26 Oct 2004)
New Revision: 1571

Added:
   profiles/LFS/branches/6.0/chapter05/adjustingtoolchain.xml
   profiles/LFS/branches/6.0/chapter06/kernfs.xml
   profiles/LFS/branches/6.0/chapter06/module-init-tools.xml
   profiles/LFS/branches/6.0/chapter06/readjustingtoolchain.xml
   profiles/LFS/branches/6.0/chapter07/profile.xml
Removed:
   profiles/LFS/branches/6.0/chapter05/lockingglibc.xml
   profiles/LFS/branches/6.0/chapter06/adjustingtoolchain.xml
   profiles/LFS/branches/6.0/chapter06/module-tools.xml
   profiles/LFS/branches/6.0/chapter06/proc.xml
   profiles/LFS/branches/6.0/chapter07/bash_startup.xml
Modified:
   profiles/LFS/branches/6.0/LFS.xml
   profiles/LFS/branches/6.0/README
   profiles/LFS/branches/6.0/chapter05/addinguser.xml
   profiles/LFS/branches/6.0/chapter05/bash.xml
   profiles/LFS/branches/6.0/chapter05/binutils-pass1.xml
   profiles/LFS/branches/6.0/chapter05/binutils-pass2.xml
   profiles/LFS/branches/6.0/chapter05/bzip2.xml
   profiles/LFS/branches/6.0/chapter05/coreutils.xml
   profiles/LFS/branches/6.0/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/6.0/chapter05/dejagnu.xml
   profiles/LFS/branches/6.0/chapter05/diffutils.xml
   profiles/LFS/branches/6.0/chapter05/expect.xml
   profiles/LFS/branches/6.0/chapter05/findutils.xml
   profiles/LFS/branches/6.0/chapter05/gawk.xml
   profiles/LFS/branches/6.0/chapter05/gcc-pass1.xml
   profiles/LFS/branches/6.0/chapter05/gcc-pass2.xml
   profiles/LFS/branches/6.0/chapter05/gettext.xml
   profiles/LFS/branches/6.0/chapter05/glibc.xml
   profiles/LFS/branches/6.0/chapter05/grep.xml
   profiles/LFS/branches/6.0/chapter05/gzip.xml
   profiles/LFS/branches/6.0/chapter05/kernel-headers.xml
   profiles/LFS/branches/6.0/chapter05/make.xml
   profiles/LFS/branches/6.0/chapter05/ncurses.xml
   profiles/LFS/branches/6.0/chapter05/patch.xml
   profiles/LFS/branches/6.0/chapter05/perl.xml
   profiles/LFS/branches/6.0/chapter05/sed.xml
   profiles/LFS/branches/6.0/chapter05/settingenvironment.xml
   profiles/LFS/branches/6.0/chapter05/tar.xml
   profiles/LFS/branches/6.0/chapter05/tcl.xml
   profiles/LFS/branches/6.0/chapter05/texinfo.xml
   profiles/LFS/branches/6.0/chapter05/util-linux.xml
   profiles/LFS/branches/6.0/chapter06/autoconf.xml
   profiles/LFS/branches/6.0/chapter06/automake.xml
   profiles/LFS/branches/6.0/chapter06/bash.xml
   profiles/LFS/branches/6.0/chapter06/binutils.xml
   profiles/LFS/branches/6.0/chapter06/bison.xml
   profiles/LFS/branches/6.0/chapter06/bzip2.xml
   profiles/LFS/branches/6.0/chapter06/changingowner.xml
   profiles/LFS/branches/6.0/chapter06/coreutils.xml
   profiles/LFS/branches/6.0/chapter06/createfiles.xml
   profiles/LFS/branches/6.0/chapter06/creatingdirs.xml
   profiles/LFS/branches/6.0/chapter06/diffutils.xml
   profiles/LFS/branches/6.0/chapter06/e2fsprogs.xml
   profiles/LFS/branches/6.0/chapter06/file.xml
   profiles/LFS/branches/6.0/chapter06/findutils.xml
   profiles/LFS/branches/6.0/chapter06/flex.xml
   profiles/LFS/branches/6.0/chapter06/gawk.xml
   profiles/LFS/branches/6.0/chapter06/gcc.xml
   profiles/LFS/branches/6.0/chapter06/gettext.xml
   profiles/LFS/branches/6.0/chapter06/glibc.xml
   profiles/LFS/branches/6.0/chapter06/grep.xml
   profiles/LFS/branches/6.0/chapter06/groff.xml
   profiles/LFS/branches/6.0/chapter06/grub.xml
   profiles/LFS/branches/6.0/chapter06/gzip.xml
   profiles/LFS/branches/6.0/chapter06/iana-etc.xml
   profiles/LFS/branches/6.0/chapter06/inetutils.xml
   profiles/LFS/branches/6.0/chapter06/iproute2.xml
   profiles/LFS/branches/6.0/chapter06/kbd.xml
   profiles/LFS/branches/6.0/chapter06/less.xml
   profiles/LFS/branches/6.0/chapter06/libtool.xml
   profiles/LFS/branches/6.0/chapter06/m4.xml
   profiles/LFS/branches/6.0/chapter06/make.xml
   profiles/LFS/branches/6.0/chapter06/man-pages.xml
   profiles/LFS/branches/6.0/chapter06/man.xml
   profiles/LFS/branches/6.0/chapter06/mktemp.xml
   profiles/LFS/branches/6.0/chapter06/ncurses.xml
   profiles/LFS/branches/6.0/chapter06/patch.xml
   profiles/LFS/branches/6.0/chapter06/perl.xml
   profiles/LFS/branches/6.0/chapter06/procps.xml
   profiles/LFS/branches/6.0/chapter06/psmisc.xml
   profiles/LFS/branches/6.0/chapter06/pwdgroup.xml
   profiles/LFS/branches/6.0/chapter06/readline.xml
   profiles/LFS/branches/6.0/chapter06/sed.xml
   profiles/LFS/branches/6.0/chapter06/shadow.xml
   profiles/LFS/branches/6.0/chapter06/sysklogd.xml
   profiles/LFS/branches/6.0/chapter06/sysvinit.xml
   profiles/LFS/branches/6.0/chapter06/tar.xml
   profiles/LFS/branches/6.0/chapter06/texinfo.xml
   profiles/LFS/branches/6.0/chapter06/util-linux.xml
   profiles/LFS/branches/6.0/chapter06/vim.xml
   profiles/LFS/branches/6.0/chapter06/zlib.xml
   profiles/LFS/branches/6.0/chapter07/bootscripts.xml
   profiles/LFS/branches/6.0/chapter07/hostname.xml
   profiles/LFS/branches/6.0/chapter07/hosts.xml
   profiles/LFS/branches/6.0/chapter07/inputrc.xml
   profiles/LFS/branches/6.0/chapter07/network.xml
   profiles/LFS/branches/6.0/chapter07/setclock.xml
   profiles/LFS/branches/6.0/chapter09/libxml2.xml
   profiles/LFS/branches/6.0/config_separate/fstab.xml
   profiles/LFS/branches/6.0/config_separate/grub.xml
   profiles/LFS/branches/6.0/config_separate/kernel.xml
   profiles/LFS/branches/6.0/config_separate/package.ent
   profiles/LFS/branches/6.0/config_tarball/fstab.xml
   profiles/LFS/branches/6.0/config_tarball/grub.xml
   profiles/LFS/branches/6.0/config_tarball/kernel.xml
   profiles/LFS/branches/6.0/config_tarball/package.ent
   profiles/LFS/branches/6.0/runit
Log:
clean-up and sync stage names with book, patch provided by Daniel Baumann

Modified: profiles/LFS/branches/6.0/LFS.xml
===================================================================
--- profiles/LFS/branches/6.0/LFS.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/LFS.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -24,13 +24,13 @@
 
 <alfs version="3.1" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-<stage name="Chapter 5 - Constructing a temporary system">
+<stage name="Chapter 5 - Constructing a Temporary System">
 
 	<xi:include href="chapter05/creatingtoolsdir.xml" />
 	<xi:include href="chapter05/addinguser.xml" />
 	<xi:include href="chapter05/settingenvironment.xml" />
 
-	<stage name="Installing packages in /tools as &lfs-user;.">
+	<stage name="Installing packages in /tools as &lfs-user;">
 		<stageinfo>
 			<root>/</root>
 			<user>&lfs-user;</user>
@@ -50,7 +50,7 @@
 		<xi:include href="chapter05/libc-headers.xml" />
 		<xi:include href="chapter05/kernel-headers.xml" />
 		<xi:include href="chapter05/glibc.xml" />
-		<xi:include href="chapter05/lockingglibc.xml" />
+		<xi:include href="chapter05/adjustingtoolchain.xml" />
 		<xi:include href="chapter05/tcl.xml" />
 		<xi:include href="chapter05/expect.xml" />
 		<xi:include href="chapter05/dejagnu.xml" />
@@ -79,12 +79,11 @@
 		<xi:include href="chapter05/udev.xml" />
 		<xi:include href="chapter05/strip.xml" />
 	</stage>
-
 </stage>
 
-<stage name="Chapter 6 - Installing basic system software">
-	<stage name="Creating directories and mounting the proc and sysfs file systems">
-		<xi:include href="chapter06/proc.xml" />
+<stage name="Chapter 6 - Installing Basic System Software">
+	<stage name="Creating Directories and Mounting Virtual Kernel File Systems">
+		<xi:include href="chapter06/kernfs.xml" />
 	</stage>
 
 	<stage name="Chroot with /tools">
@@ -108,7 +107,7 @@
 		<xi:include href="chapter06/libc-headers.xml" />
 		<xi:include href="chapter06/man-pages.xml" />
 		<xi:include href="chapter06/glibc.xml" />
-		<xi:include href="chapter06/adjustingtoolchain.xml" />
+		<xi:include href="chapter06/readjustingtoolchain.xml" />
 		<xi:include href="chapter06/binutils.xml" />
 		<xi:include href="chapter06/gcc.xml" />
 		<xi:include href="chapter06/coreutils.xml" />
@@ -145,7 +144,7 @@
 		<xi:include href="chapter06/gzip.xml" />
 		<xi:include href="chapter06/man.xml" />
 		<xi:include href="chapter06/make.xml" />
-		<xi:include href="chapter06/module-tools.xml" />
+		<xi:include href="chapter06/module-init-tools.xml" />
 		<xi:include href="chapter06/patch.xml" />
 		<xi:include href="chapter06/procps.xml" />
 		<xi:include href="chapter06/psmisc.xml" />
@@ -159,7 +158,7 @@
 	</stage>
 </stage>
 
-<stage name="Chapter 7 - Setting up system boot scripts">
+<stage name="Chapter 7 - Setting Up System Bootscripts">
 	<stageinfo>
 		<root>&LFS;</root>
 		<environment>
@@ -176,13 +175,13 @@
 	<xi:include href="chapter07/setclock.xml" />
 	<xi:include href="config/console.xml" />
 	<xi:include href="chapter07/inputrc.xml" />
-	<xi:include href="chapter07/bash_startup.xml" />
+	<xi:include href="chapter07/profile.xml" />
 	<xi:include href="chapter07/hostname.xml" />
 	<xi:include href="chapter07/hosts.xml" />
 	<xi:include href="chapter07/network.xml" />
 </stage>
 
-<stage name="Chapter 8 - Making the LFS system bootable">
+<stage name="Chapter 8 - Making the LFS System Bootable">
 	<stageinfo>
 		<root>&LFS;</root>
 		<environment>
@@ -198,7 +197,6 @@
 	<xi:include href="config/fstab.xml" />
 	<xi:include href="config/kernel.xml" />
 	<xi:include href="config/grub.xml" />
-
 </stage>
 
 <stage name="Chapter 9 - The End">

Modified: profiles/LFS/branches/6.0/README
===================================================================
--- profiles/LFS/branches/6.0/README	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/README	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,18 +10,18 @@
 
 To use the profile you should :-
 
-1) If you downloaded the LFS packages seperately you should copy 
+1) If you downloaded the LFS packages seperately you should copy
    the config_separate directory to a directory named config :-
 
   	cp -r config_separate config
-	
+
 or
 
    If you downloaded the lfs-package tarball you should copy the
    config_tarball directory to a directory named config :-
 
    	cp -r config_tarball config
-  
+
 2) Customize the files in the new configuration directory
    - the file general.ent contains a bunch of entity declarations
      (Note: this file contains an entity called TERM that should be
@@ -30,13 +30,13 @@
             value for a GNU/Linux system.)
    - the file fstab.xml contains the commands to generate the fstab file
    - the file kernel.xml contains the commands for building the kernel
-   - the file grub.xml contains the commands for configuring the grub 
-     bootloader although the steps to do this are commented out by 
+   - the file grub.xml contains the commands for configuring the grub
+     bootloader although the steps to do this are commented out by
      default
    - the files keymap-ch6.xml and keymap-ch8.xml are used to set up
      the default keymap
    - the file console.xml is for setting up the default keymap with
-     support for i18n.	
+     support for i18n.
 
 3) This profile contains two additional packages that are installed
    during chapter 9, libxml2 and nALFS. This is done under the
@@ -44,7 +44,6 @@
    your new LFS system to continue building other packages (via BLFS
    or other profiles).
 
-4) Execute sh ./runit as root. Please note that if you have installed 
+4) Execute sh ./runit as root. Please note that if you have installed
    nALFS into a location other than /usr/local/bin you will need to edit
    runit to point to your copy of nALFS.
-

Modified: profiles/LFS/branches/6.0/chapter05/addinguser.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/addinguser.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/addinguser.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Adding lfs user">
+<stage name="Adding the LFS User">
 	<execute command="groupadd -f lfs" />
 	
 	<execute command="id -u &lfs-user; &> /dev/null || useradd -s /bin/bash -g lfs -m -k /dev/null &lfs-user;" />

Copied: profiles/LFS/branches/6.0/chapter05/adjustingtoolchain.xml (from rev 1570, profiles/LFS/branches/6.0/chapter05/lockingglibc.xml)
===================================================================
--- profiles/LFS/branches/6.0/chapter05/lockingglibc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/adjustingtoolchain.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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';
+Output of last line s/b: [Requesting program interpreter: /tools/lib/ld-linux.so.2]
+If so:  
+	rm dummy.c a.out
+Otherwise, STOP HERE & find & fix the problem
+-->
+
+</stage>
+
+</alfs>

Modified: profiles/LFS/branches/6.0/chapter05/bash.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/bash.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/bash.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bash" version="&bash-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bash-md5;</digest>
 			<archive>&packages_dir;/&bash-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bash-directory;</base>
 		</stageinfo>
@@ -47,7 +47,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bash-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/binutils-pass1.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/binutils-pass1.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/binutils-pass1.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="binutils-pass1" version="&binutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&binutils-md5;</digest>
 			<archive>&packages_dir;/&binutils-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />

Modified: profiles/LFS/branches/6.0/chapter05/binutils-pass2.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/binutils-pass2.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/binutils-pass2.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="binutils-pass2" version="&binutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&binutils-md5;</digest>
 			<archive>&packages_dir;/&binutils-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />

Modified: profiles/LFS/branches/6.0/chapter05/bzip2.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/bzip2.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/bzip2.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bzip2" version="&bzip2-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bzip2-md5;</digest>
 			<archive>&packages_dir;/&bzip2-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bzip2-directory;</base>
 		</stageinfo>
@@ -31,7 +31,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bzip2-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/coreutils.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/coreutils.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/coreutils.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="coreutils" version="&coreutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&coreutils-md5;</digest>
 			<archive>&packages_dir;/&coreutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&coreutils-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&coreutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/creatingtoolsdir.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/creatingtoolsdir.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -9,7 +9,7 @@
 
 <alfs>
 
-<stage name="Creating tools directory.">
+<stage name="Creating the $LFS/tools Directory">
 	<mkdir>
 		<option>parents</option>
 		<name>&LFS;/tools</name>
@@ -111,7 +111,7 @@
 			<source>&man-pages-package;</source>
 			<source>&mktemp-package;</source>
 			<source>&mktemp-tempfile-patch;</source>
-			<source>&module-tools-package;</source>
+			<source>&module-init-tools-package;</source>
 			<source>&ncurses-package;</source>
 			<source>&nALFS-package;</source>
 			<source>&patch-package;</source>

Modified: profiles/LFS/branches/6.0/chapter05/dejagnu.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/dejagnu.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/dejagnu.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="dejagnu" version="&dejagnu-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&dejagnu-md5;</digest>
 			<archive>&packages_dir;/&dejagnu-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&dejagnu-directory;</base>
 		</stageinfo>
@@ -32,7 +32,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&dejagnu-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/diffutils.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/diffutils.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/diffutils.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="diffutils" version="&diffutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&diffutils-md5;</digest>
 			<archive>&packages_dir;/&diffutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&diffutils-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&diffutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/expect.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/expect.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/expect.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="expect" version="&expect-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&expect-md5;</digest>
 			<archive>&packages_dir;/&expect-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&expect-directory;</base>
 		</stageinfo>
@@ -49,7 +49,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&tcl-directory;</remove>
 		<remove>&build_dir;/&expect-directory;</remove>
 	</stage>

Modified: profiles/LFS/branches/6.0/chapter05/findutils.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/findutils.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/findutils.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="findutils" version="&findutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&findutils-md5;</digest>
 			<archive>&packages_dir;/&findutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&findutils-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&findutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/gawk.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/gawk.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/gawk.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gawk" version="&gawk-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gawk-md5;</digest>
 			<archive>&packages_dir;/&gawk-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gawk-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gawk-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/gcc-pass1.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/gcc-pass1.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/gcc-pass1.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gcc-pass1" version="&gcc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gcc-core-md5;</digest>
 			<archive>&packages_dir;/&gcc-core-package;</archive>
@@ -29,7 +29,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -63,7 +63,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/gcc-build</remove>
 		<remove>&build_dir;/&gcc-directory;</remove>
 	</stage>

Modified: profiles/LFS/branches/6.0/chapter05/gcc-pass2.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/gcc-pass2.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/gcc-pass2.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gcc-pass2" version="&gcc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gcc-core-md5;</digest>
 			<archive>&packages_dir;/&gcc-core-package;</archive>
@@ -35,7 +35,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -90,7 +90,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gcc-directory;</remove>
 		<remove>&build_dir;/gcc-build</remove>
 	</stage>

Modified: profiles/LFS/branches/6.0/chapter05/gettext.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/gettext.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/gettext.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gettext" version="&gettext-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gettext-md5;</digest>
 			<archive>&packages_dir;/&gettext-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gettext-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gettext-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/glibc.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/glibc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/glibc.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="glibc" version="&glibc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&glibc-md5;</digest>
 			<archive>&packages_dir;/&glibc-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -70,6 +70,12 @@
 			<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" />
@@ -83,7 +89,7 @@
 		<execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&glibc-directory;</remove>
 		<remove>&build_dir;/glibc-build</remove>
 	</stage>

Modified: profiles/LFS/branches/6.0/chapter05/grep.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/grep.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/grep.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="grep" version="&grep-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&grep-md5;</digest>
 			<archive>&packages_dir;/&grep-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&grep-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&grep-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/gzip.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/gzip.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/gzip.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gzip" version="&gzip-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gzip-md5;</digest>
 			<archive>&packages_dir;/&gzip-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gzip-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gzip-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/kernel-headers.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/kernel-headers.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/kernel-headers.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="kernel-headers" version="&linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&linux-directory;</base>
 		</stageinfo>

Deleted: profiles/LFS/branches/6.0/chapter05/lockingglibc.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/lockingglibc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/lockingglibc.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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="Locking glibc.">
-	<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
-Otherwise, STOP HERE & find & fix the problem
--->
-
-</stage>
-
-</alfs>

Modified: profiles/LFS/branches/6.0/chapter05/make.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/make.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/make.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="make" version="&make-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&make-md5;</digest>
 			<archive>&packages_dir;/&make-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&make-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&make-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/ncurses.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/ncurses.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/ncurses.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="ncurses" version="&ncurses-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&ncurses-md5;</digest>
 			<archive>&packages_dir;/&ncurses-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&ncurses-directory;</base>
 		</stageinfo>
@@ -38,7 +38,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&ncurses-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/patch.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/patch.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/patch.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="patch" version="&patch-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&patch-md5;</digest>
 			<archive>&packages_dir;/&patch-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&patch-directory;</base>
 		</stageinfo>
@@ -35,7 +35,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&patch-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/perl.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/perl.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/perl.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="perl" version="&perl-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&perl-md5;</digest>
 			<archive>&packages_dir;/&perl-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&perl-directory;</base>
 		</stageinfo>
@@ -57,7 +57,7 @@
 		</copy>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&perl-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/sed.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/sed.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/sed.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="sed" version="&sed-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&sed-md5;</digest>
 			<archive>&packages_dir;/&sed-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&sed-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&sed-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/settingenvironment.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/settingenvironment.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/settingenvironment.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Setting up the environment.">
+<stage name="Setting Up the Environment">
 	<stageinfo>
 		<user>&lfs-user;</user>
 	</stageinfo>

Modified: profiles/LFS/branches/6.0/chapter05/tar.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/tar.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/tar.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="tar" version="&tar-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&tar-md5;</digest>
 			<archive>&packages_dir;/&tar-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&tar-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&tar-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/tcl.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/tcl.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/tcl.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="tcl" version="&tcl-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&tcl-md5;</digest>
 			<archive>&packages_dir;/&tcl-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&tcl-directory;/unix</base>
 		</stageinfo>

Modified: profiles/LFS/branches/6.0/chapter05/texinfo.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/texinfo.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/texinfo.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="texinfo" version="&texinfo-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&texinfo-md5;</digest>
 			<archive>&packages_dir;/&texinfo-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&texinfo-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&texinfo-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter05/util-linux.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/util-linux.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter05/util-linux.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="util-linux" version="&util-linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&util-linux-md5;</digest>
 			<archive>&packages_dir;/&util-linux-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&util-linux-directory;</base>
 		</stageinfo>
@@ -53,7 +53,7 @@
 		</copy>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&util-linux-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/6.0/chapter06/adjustingtoolchain.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/adjustingtoolchain.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/adjustingtoolchain.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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="Re-adjusting the toolchain.">
-	<stage name="Adjusting the linker.">
-		<stageinfo>
-			<base>&build_dir;/binutils-build</base>
-		</stageinfo>
-
-		<make>
-			<param>-C ld</param>
-			<param>INSTALL=/tools/bin/install</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<remove>&build_dir;/&binutils-directory;</remove>
-	<remove>&build_dir;/binutils-build</remove>
-
-	<stage name="Amending GCC specs file.">
-		<search_replace>
-			<file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
-			<find> /tools/lib/&glibc-loader;</find>
-			<replace> /lib/&glibc-loader;</replace>
-		</search_replace>
-	</stage>
-
-	<!-- Test basic functions of toolchain with:
-		echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /lib';
-	Output of last line s/b: [Requesting program interpreter: /lib/ld-linux.so.2]
-	If so:
-		rm dummy.c a.out
-	Otherwise, STOP HERE & find & fix the problem
-	-->
-</stage>
-
-</alfs>

Modified: profiles/LFS/branches/6.0/chapter06/autoconf.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/autoconf.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/autoconf.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="autoconf" version="&autoconf-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&autoconf-md5;</digest>
 			<archive>&packages_dir;/&autoconf-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&autoconf-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&autoconf-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/automake.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/automake.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/automake.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="automake" version="&automake-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&automake-md5;</digest>
 			<archive>&packages_dir;/&automake-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&automake-directory;</base>
 		</stageinfo>
@@ -41,7 +41,7 @@
 
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&automake-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/bash.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/bash.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/bash.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bash" version="&bash-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bash-md5;</digest>
 			<archive>&packages_dir;/&bash-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bash-directory;</base>
 		</stageinfo>
@@ -49,7 +49,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bash-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/binutils.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/binutils.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/binutils.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="binutils" version="&binutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&binutils-md5;</digest>
 			<archive>&packages_dir;/&binutils-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -63,7 +63,7 @@
 		</copy>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&binutils-directory;</remove>
 		<remove>&build_dir;/binutils-build</remove>
 	</stage>

Modified: profiles/LFS/branches/6.0/chapter06/bison.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/bison.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/bison.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bison" version="&bison-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bison-md5;</digest>
 			<archive>&packages_dir;/&bison-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bison-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bison-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/bzip2.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/bzip2.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/bzip2.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bzip2" version="&bzip2-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bzip2-md5;</digest>
 			<archive>&packages_dir;/&bzip2-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bzip2-directory;</base>
 		</stageinfo>
@@ -72,7 +72,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bzip2-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/changingowner.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/changingowner.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/changingowner.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -3,7 +3,7 @@
 
 <alfs>
 
-<stage name="Changing ownership of tools directory">
+<stage name="Changing Ownership">
 	<ownership user="0" group="0">
 		<option>recursive</option>
 		<name>/tools</name>

Modified: profiles/LFS/branches/6.0/chapter06/coreutils.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/coreutils.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/coreutils.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="coreutils" version="&coreutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&coreutils-md5;</digest>
 			<archive>&packages_dir;/&coreutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&coreutils-directory;</base>
 		</stageinfo>
@@ -123,7 +123,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&coreutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/createfiles.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/createfiles.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/createfiles.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -3,7 +3,7 @@
 
 <alfs>
 
-<stage name="Creating essential symlinks.">
+<stage name="Creating Essential Symlinks">
 	<link>
 		<option>force</option>
 		<target>/tools/bin/bash</target>

Modified: profiles/LFS/branches/6.0/chapter06/creatingdirs.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/creatingdirs.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/creatingdirs.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -3,7 +3,7 @@
 
 <alfs>
 
-<stage name="Creating directory tree">
+<stage name="Creating Directories">
 	<mkdir base="/">
 		<option>parents</option>
 	

Modified: profiles/LFS/branches/6.0/chapter06/diffutils.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/diffutils.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/diffutils.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="diffutils" version="&diffutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&diffutils-md5;</digest>
 			<archive>&packages_dir;/&diffutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&diffutils-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&diffutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/e2fsprogs.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/e2fsprogs.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/e2fsprogs.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="e2fsprogs" version="&e2fsprogs-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&e2fsprogs-md5;</digest>
 			<archive>&packages_dir;/&e2fsprogs-package;</archive>
@@ -22,7 +22,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/e2fsprogs-build</base>
 		</stageinfo>
@@ -51,7 +51,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&e2fsprogs-directory;</remove>
 		<remove>&build_dir;/e2fsprogs-build</remove>
 	</stage>

Modified: profiles/LFS/branches/6.0/chapter06/file.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/file.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/file.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="file" version="&file-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&file-md5;</digest>
 			<archive>&packages_dir;/&file-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&file-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&file-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/findutils.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/findutils.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/findutils.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="findutils" version="&findutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&findutils-md5;</digest>
 			<archive>&packages_dir;/&findutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&findutils-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&findutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/flex.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/flex.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/flex.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="flex" version="&flex-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&flex-md5;</digest>
 			<archive>&packages_dir;/&flex-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&flex-directory;</base>
 		</stageinfo>
@@ -72,7 +72,7 @@
 		</permissions>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&flex-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/gawk.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/gawk.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/gawk.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gawk" version="&gawk-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gawk-md5;</digest>
 			<archive>&packages_dir;/&gawk-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gawk-directory;</base>
 		</stageinfo>
@@ -41,7 +41,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gawk-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/gcc.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/gcc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/gcc.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gcc" version="&gcc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gcc-core-md5;</digest>
 			<archive>&packages_dir;/&gcc-core-package;</archive>
@@ -40,7 +40,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -104,7 +104,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gcc-directory;</remove>
 		<remove>&build_dir;/gcc-build</remove>
 	</stage>

Modified: profiles/LFS/branches/6.0/chapter06/gettext.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/gettext.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/gettext.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gettext" version="&gettext-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gettext-md5;</digest>
 			<archive>&packages_dir;/&gettext-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gettext-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gettext-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/glibc.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/glibc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/glibc.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="glibc" version="&glibc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&glibc-md5;</digest>
 			<archive>&packages_dir;/&glibc-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -85,7 +85,7 @@
 		</make>
 	</stage>
 
-	<stage name="Configuring.">
+	<stage name="Configuring">
 		<textdump>
 			<file>/etc/nsswitch.conf</file>
 			<content>
@@ -127,7 +127,7 @@
 		</textdump>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&glibc-directory;</remove>
 		<remove>&build_dir;/glibc-build</remove>
 	</stage>

Modified: profiles/LFS/branches/6.0/chapter06/grep.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/grep.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/grep.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="grep" version="&grep-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&grep-md5;</digest>
 			<archive>&packages_dir;/&grep-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&grep-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&grep-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/groff.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/groff.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/groff.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="groff" version="&groff-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&groff-md5;</digest>
 			<archive>&packages_dir;/&groff-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&groff-directory;</base>
 		</stageinfo>
@@ -53,7 +53,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&groff-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/grub.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/grub.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/grub.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="grub" version="&grub-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&grub-md5;</digest>
 			<archive>&packages_dir;/&grub-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -49,7 +49,7 @@
 		</copy>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&grub-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/gzip.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/gzip.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/gzip.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gzip" version="&gzip-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gzip-md5;</digest>
 			<archive>&packages_dir;/&gzip-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gzip-directory;</base>
 		</stageinfo>
@@ -66,7 +66,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gzip-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/iana-etc.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/iana-etc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/iana-etc.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="iana-etc" version="&iana-etc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&iana-etc-md5;</digest>
 			<archive>&packages_dir;/&iana-etc-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&iana-etc-directory;</base>
 		</stageinfo>
@@ -30,7 +30,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&iana-etc-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/inetutils.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/inetutils.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/inetutils.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="inetutils" version="&inetutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&inetutils-md5;</digest>
 			<archive>&packages_dir;/&inetutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&inetutils-directory;</base>
 		</stageinfo>
@@ -58,7 +58,7 @@
 		</move>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&inetutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/iproute2.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/iproute2.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/iproute2.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="iproute2" version="&iproute2-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&iproute2-md5;</digest>
 			<archive>&packages_dir;/&iproute2-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&iproute2-directory;</base>
 		</stageinfo>
@@ -41,7 +41,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&iproute2-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/kbd.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/kbd.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/kbd.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="kbd" version="&kbd-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&kbd-md5;</digest>
 			<archive>&packages_dir;/&kbd-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&kbd-directory;</base>
 		</stageinfo>
@@ -35,7 +35,7 @@
 
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&kbd-directory;</remove>
 	</stage>
 </package>

Copied: profiles/LFS/branches/6.0/chapter06/kernfs.xml (from rev 1570, profiles/LFS/branches/6.0/chapter06/proc.xml)
===================================================================
--- profiles/LFS/branches/6.0/chapter06/proc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/kernfs.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+
+%general_entities;
+]>
+
+<alfs>
+
+<stage name="Mounting Virtual Kernel File Systems">
+
+	<mkdir base="&LFS;">
+		<option>parents</option>
+		<name>proc</name>
+		<name>sys</name>
+	</mkdir>
+
+	<execute command="mount">
+		<param>-t proc</param>
+		<param>proc</param>
+		<param>&LFS;/proc</param>
+	</execute>
+
+	<execute command="mount">
+		<param>-t sysfs</param>
+		<param>sysfs</param>
+		<param>&LFS;/sys</param>
+	</execute>
+
+	<execute command="mount">
+		<param>-f</param>
+		<param>-t ramfs</param>
+		<param>ramfs</param>
+		<param>&LFS;/dev</param>
+	</execute>
+
+	<execute command="mount">
+		<param>-f</param>
+		<param>-t tmpfs</param>
+		<param>tmpfs</param>
+		<param>&LFS;/dev/shm</param>
+	</execute>
+
+	<execute command="mount">
+		<param>-f</param>
+		<param>-t devpts</param>
+		<param>-o gid=4,mode=620</param>
+		<param>devpts</param>
+		<param>&LFS;/dev/pts</param>
+	</execute>
+</stage>
+
+</alfs>

Modified: profiles/LFS/branches/6.0/chapter06/less.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/less.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/less.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="less" version="&less-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&less-md5;</digest>
 			<archive>&packages_dir;/&less-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&less-directory;</base>
 		</stageinfo>
@@ -36,7 +36,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&less-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/libtool.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/libtool.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/libtool.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="libtool" version="&libtool-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&libtool-md5;</digest>
 			<archive>&packages_dir;/&libtool-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&libtool-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&libtool-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/m4.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/m4.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/m4.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="m4" version="&m4-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&m4-md5;</digest>
 			<archive>&packages_dir;/&m4-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&m4-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&m4-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/make.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/make.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/make.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="make" version="&make-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&make-md5;</digest>
 			<archive>&packages_dir;/&make-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&make-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&make-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/man-pages.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/man-pages.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/man-pages.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="man-pages" version="&man-pages-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&man-pages-md5;</digest>
 			<archive>&packages_dir;/&man-pages-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&man-pages-directory;</base>
 		</stageinfo>
@@ -28,7 +28,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&man-pages-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/man.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/man.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/man.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="man" version="&man-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&man-md5;</digest>
 			<archive>&packages_dir;/&man-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&man-directory;</base>
 		</stageinfo>
@@ -52,7 +52,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&man-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/mktemp.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/mktemp.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/mktemp.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="mktemp" version="&mktemp-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&mktemp-md5;</digest>
 			<archive>&packages_dir;/&mktemp-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&mktemp-directory;</base>
 		</stageinfo>
@@ -45,7 +45,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&mktemp-directory;</remove>
 	</stage>
 </package>

Copied: profiles/LFS/branches/6.0/chapter06/module-init-tools.xml (from rev 1570, profiles/LFS/branches/6.0/chapter06/module-tools.xml)
===================================================================
--- profiles/LFS/branches/6.0/chapter06/module-tools.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/module-init-tools.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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="module-init-tools" version="&module-init-tools-version;">
+	<stage name="Unpacking">
+		<unpack>
+			<digest>&module-init-tools-md5;</digest>
+			<archive>&packages_dir;/&module-init-tools-package;</archive>
+			<destination>&build_dir;</destination>
+		</unpack>
+	</stage>
+
+	<stage name="Installing">
+		<stageinfo>
+			<base>&build_dir;/&module-init-tools-directory;</base>
+		</stageinfo>
+
+		<configure>
+		  	<param>--prefix=""</param>
+			<param>--enable-zlib</param>
+		</configure>
+
+		<make />
+
+		<make>
+  			<param>check</param>
+		</make>
+
+		<make>
+			<param>install</param>
+		</make>
+	</stage>
+
+	<stage name="Cleanup">
+		<remove>&build_dir;/&module-init-tools-directory;</remove>
+	</stage>
+</package>
+
+</alfs>

Deleted: profiles/LFS/branches/6.0/chapter06/module-tools.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/module-tools.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/module-tools.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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="module-init-tools" version="&module-tools-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&module-tools-md5;</digest>
-			<archive>&packages_dir;/&module-tools-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&module-tools-directory;</base>
-		</stageinfo>
-
-		<configure>
-		  	<param>--prefix=""</param>
-			<param>--enable-zlib</param>
-		</configure>
-
-		<make />
-
-		<make>
-  			<param>check</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&module-tools-directory;</remove>
-	</stage>
-</package>
-
-</alfs>

Modified: profiles/LFS/branches/6.0/chapter06/ncurses.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/ncurses.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/ncurses.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="ncurses" version="&ncurses-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&ncurses-md5;</digest>
 			<archive>&packages_dir;/&ncurses-package;</archive>
@@ -19,7 +19,7 @@
 
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&ncurses-directory;</base>
 		</stageinfo>
@@ -62,7 +62,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&ncurses-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/patch.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/patch.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/patch.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="patch" version="&patch-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&patch-md5;</digest>
 			<archive>&packages_dir;/&patch-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&patch-directory;</base>
 		</stageinfo>
@@ -35,7 +35,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&patch-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/perl.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/perl.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/perl.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="perl" version="&perl-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&perl-md5;</digest>
 			<archive>&packages_dir;/&perl-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&perl-directory;</base>
 		</stageinfo>
@@ -46,7 +46,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&perl-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/6.0/chapter06/proc.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/proc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/proc.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-
-%general_entities;
-]>
-
-<alfs>
-
-<stage name="Creating directories and mounting file systems">
-
-	<mkdir base="&LFS;">
-		<option>parents</option>
-		<name>proc</name>
-		<name>sys</name>
-	</mkdir>
-
-	<execute command="mount">
-		<param>-t proc</param>
-		<param>proc</param>
-		<param>&LFS;/proc</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-t sysfs</param>
-		<param>sysfs</param>
-		<param>&LFS;/sys</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t ramfs</param>
-		<param>ramfs</param>
-		<param>&LFS;/dev</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t tmpfs</param>
-		<param>tmpfs</param>
-		<param>&LFS;/dev/shm</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t devpts</param>
-		<param>-o gid=4,mode=620</param>
-		<param>devpts</param>
-		<param>&LFS;/dev/pts</param>
-	</execute>
-</stage>
-
-</alfs>

Modified: profiles/LFS/branches/6.0/chapter06/procps.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/procps.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/procps.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="procps" version="&procps-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&procps-md5;</digest>
 			<archive>&packages_dir;/&procps-package;</archive>
@@ -19,7 +19,7 @@
 
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&procps-directory;</base>
 		</stageinfo>
@@ -31,7 +31,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&procps-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/psmisc.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/psmisc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/psmisc.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="psmisc" version="&psmisc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&psmisc-md5;</digest>
 			<archive>&packages_dir;/&psmisc-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&psmisc-directory;</base>
 		</stageinfo>
@@ -52,7 +52,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&psmisc-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/pwdgroup.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/pwdgroup.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/pwdgroup.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -3,7 +3,7 @@
 
 <alfs>
 
-<stage name="Creating the passwd, group and log files.">
+<stage name="Creating the passwd, group, and log Files">
 	<textdump base="/etc">
 		<file>passwd</file>
 		<content>=root:x:0:0:root:/root:/bin/bash</content>
@@ -44,7 +44,6 @@
 		<name>run/utmp</name>
 		<name>log/lastlog</name>
 	</permissions>
-
 </stage>
 
 </alfs>

Copied: profiles/LFS/branches/6.0/chapter06/readjustingtoolchain.xml (from rev 1570, profiles/LFS/branches/6.0/chapter06/adjustingtoolchain.xml)
===================================================================
--- profiles/LFS/branches/6.0/chapter06/adjustingtoolchain.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/readjustingtoolchain.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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="Re-adjusting the Toolchain">
+	<stage name="Adjusting the Linker">
+		<stageinfo>
+			<base>&build_dir;/binutils-build</base>
+		</stageinfo>
+
+		<make>
+			<param>-C ld</param>
+			<param>INSTALL=/tools/bin/install</param>
+			<param>install</param>
+		</make>
+	</stage>
+
+	<remove>&build_dir;/&binutils-directory;</remove>
+	<remove>&build_dir;/binutils-build</remove>
+
+	<stage name="Amending the GCC specs File">
+		<search_replace>
+			<file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
+			<find> /tools/lib/&glibc-loader;</find>
+			<replace> /lib/&glibc-loader;</replace>
+		</search_replace>
+	</stage>
+
+	<!-- Test basic functions of toolchain with:
+		echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /lib';
+	Output of last line s/b: [Requesting program interpreter: /lib/ld-linux.so.2]
+	If so:
+		rm dummy.c a.out
+	Otherwise, STOP HERE & find & fix the problem
+	-->
+</stage>
+
+</alfs>

Modified: profiles/LFS/branches/6.0/chapter06/readline.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/readline.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/readline.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="readline" version="&readline-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&readline-md5;</digest>
 			<archive>&packages_dir;/&readline-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&readline-directory;</base>
 		</stageinfo>
@@ -64,7 +64,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&readline-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/sed.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/sed.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/sed.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="sed" version="&sed-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&sed-md5;</digest>
 			<archive>&packages_dir;/&sed-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&sed-directory;</base>
 		</stageinfo>	
@@ -41,7 +41,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&sed-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/shadow.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/shadow.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/shadow.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="shadow" version="&shadow-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&shadow-md5;</digest>
 			<archive>&packages_dir;/&shadow-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&shadow-directory;</base>
 		</stageinfo>
@@ -110,7 +110,7 @@
 		<remove>/bin/groups</remove>
 	</stage>
 
-	<stage name="Configuring.">
+	<stage name="Configuring">
 		<execute command="pwconv" />
 		<execute command="grpconv" />
 
@@ -121,7 +121,7 @@
 	</stage>
 
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&shadow-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/sysklogd.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/sysklogd.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/sysklogd.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="sysklogd" version="&sysklogd-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&sysklogd-md5;</digest>
 			<archive>&packages_dir;/&sysklogd-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&sysklogd-directory;</base>
 		</stageinfo>
@@ -59,7 +59,7 @@
 		</textdump>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&sysklogd-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/sysvinit.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/sysvinit.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/sysvinit.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="sysvinit" version="&sysvinit-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&sysvinit-md5;</digest>
 			<archive>&packages_dir;/&sysvinit-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&sysvinit-directory;</base>
 		</stageinfo>
@@ -78,7 +78,7 @@
 
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&sysvinit-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/tar.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/tar.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/tar.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="tar" version="&tar-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&tar-md5;</digest>
 			<archive>&packages_dir;/&tar-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&tar-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&tar-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/texinfo.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/texinfo.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/texinfo.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="texinfo" version="&texinfo-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&texinfo-md5;</digest>
 			<archive>&packages_dir;/&texinfo-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&texinfo-directory;</base>
 		</stageinfo>
@@ -51,7 +51,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&texinfo-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/util-linux.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/util-linux.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/util-linux.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="util-linux" version="&util-linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&util-linux-md5;</digest>
 			<archive>&packages_dir;/&util-linux-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&util-linux-directory;</base>
 		</stageinfo>
@@ -54,7 +54,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&util-linux-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/vim.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/vim.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/vim.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="vim" version="&vim-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&vim-md5;</digest>
 			<archive>&packages_dir;/&vim-package;</archive>
@@ -23,7 +23,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&vim-directory;</base>
 		</stageinfo>
@@ -78,7 +78,7 @@
 
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&vim-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter06/zlib.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/zlib.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter06/zlib.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="zlib" version="&zlib-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&zlib-md5;</digest>
 			<archive>&packages_dir;/&zlib-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&zlib-directory;</base>
 		</stageinfo>
@@ -82,7 +82,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&zlib-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/6.0/chapter07/bash_startup.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter07/bash_startup.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter07/bash_startup.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-
-%general_entities;
-]>
-
-<alfs>
-
-<stage name="Bash Shell Startup Files">
-	<textdump base="/etc">
-		<file>profile</file>
-		<content>
-		=# Begin /etc/profile
-		=# Written for Linux From Scratch
-		=# by Alexander E. Patrakov
-		=
-		=export LC_ALL=&locale-language;_&locale-country;
-		=export LANG=&locale-language;_&locale-country;
-		=export INPUTRC=/etc/inputrc
-		=
-		=# End /etc/profile
-		</content>
-	</textdump>
-</stage>
-
-</alfs>

Modified: profiles/LFS/branches/6.0/chapter07/bootscripts.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter07/bootscripts.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter07/bootscripts.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bootscripts" version="&lfs-bootscripts-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&lfs-bootscripts-md5;</digest>
 			<archive>&packages_dir;/&lfs-bootscripts-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&lfs-bootscripts-directory;</base>
 		</stageinfo>
@@ -28,7 +28,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&lfs-bootscripts-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/chapter07/hostname.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter07/hostname.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter07/hostname.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Configuring the localnet script">
+<stage name="Configuring the localnet Script">
 	<textdump>
 		<file>/etc/sysconfig/network</file>
 		<content>=HOSTNAME=&hostname;</content>

Modified: profiles/LFS/branches/6.0/chapter07/hosts.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter07/hosts.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter07/hosts.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Creating the /etc/hosts file">
+<stage name="Creating the /etc/hosts File">
 	<textdump>
 		<file>/etc/hosts</file>
 		<content>

Modified: profiles/LFS/branches/6.0/chapter07/inputrc.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter07/inputrc.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter07/inputrc.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Creating /etc/inputrc">
+<stage name="Creating the /etc/inputrc File">
 	<textdump base="/etc">
         	<file>inputrc</file>
         	<content>

Modified: profiles/LFS/branches/6.0/chapter07/network.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter07/network.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter07/network.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Configuring the network script">
+<stage name="Configuring the network Script">
 	<mkdir>
 		<option>parents</option>
 		<name>/etc/sysconfig/network-devices/ifconfig.eth0</name>

Copied: profiles/LFS/branches/6.0/chapter07/profile.xml (from rev 1570, profiles/LFS/branches/6.0/chapter07/bash_startup.xml)
===================================================================
--- profiles/LFS/branches/6.0/chapter07/bash_startup.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter07/profile.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+
+%general_entities;
+]>
+
+<alfs>
+
+<stage name="The Bash Shell Startup Files">
+	<textdump base="/etc">
+		<file>profile</file>
+		<content>
+		=# Begin /etc/profile
+		=# Written for Linux From Scratch
+		=# by Alexander E. Patrakov
+		=
+		=export LC_ALL=&locale-language;_&locale-country;
+		=export LANG=&locale-language;_&locale-country;
+		=export INPUTRC=/etc/inputrc
+		=
+		=# End /etc/profile
+		</content>
+	</textdump>
+</stage>
+
+</alfs>

Modified: profiles/LFS/branches/6.0/chapter07/setclock.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter07/setclock.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter07/setclock.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Configuring the setclock script">
+<stage name="Configuring the setclock Script">
 	<textdump>
 		<file>/etc/sysconfig/clock</file>
 		<content>

Modified: profiles/LFS/branches/6.0/chapter09/libxml2.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter09/libxml2.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/chapter09/libxml2.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="libxml2" version="&libxml2-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&libxml2-md5;</digest>
 			<archive>&packages_dir;/&libxml2-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&libxml2-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&libxml2-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/6.0/config_separate/fstab.xml
===================================================================
--- profiles/LFS/branches/6.0/config_separate/fstab.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/config_separate/fstab.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Creating the /etc/fstab file">
+<stage name="Creating the /etc/fstab File">
 	<textdump>
 		<file>/etc/fstab</file>
 		<content>

Modified: profiles/LFS/branches/6.0/config_separate/grub.xml
===================================================================
--- profiles/LFS/branches/6.0/config_separate/grub.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/config_separate/grub.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -9,7 +9,7 @@
 
 <alfs>
 
-<stage name="Making the LFS system bootable">
+<stage name="Making the LFS System Bootable">
 	<!--
 	The following shell command sets up grub.  The batch param on the first line
 	has to have the space between the dashes removed for this to work.	

Modified: profiles/LFS/branches/6.0/config_separate/kernel.xml
===================================================================
--- profiles/LFS/branches/6.0/config_separate/kernel.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/config_separate/kernel.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <package name="linux" version="&linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
@@ -23,7 +23,7 @@
 		</ownership>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&linux-src-location;/&linux-directory;</base>
 		</stageinfo>

Modified: profiles/LFS/branches/6.0/config_separate/package.ent
===================================================================
--- profiles/LFS/branches/6.0/config_separate/package.ent	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/config_separate/package.ent	2004-10-27 03:32:26 UTC (rev 1571)
@@ -236,10 +236,10 @@
 <!ENTITY mktemp-tempfile-patch-md5 "1b65466c0238120110dc1d906ad66de4">
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-1.patch">
 
-<!ENTITY module-tools-md5 "f8bfc480c4168978eca7037cd341da07">
-<!ENTITY module-tools-version "3.0">
-<!ENTITY module-tools-package "module-init-tools-&module-tools-version;.tar.bz2">
-<!ENTITY module-tools-directory "module-init-tools-&module-tools-version;">
+<!ENTITY module-init-tools-md5 "f8bfc480c4168978eca7037cd341da07">
+<!ENTITY module-init-tools-version "3.0">
+<!ENTITY module-init-tools-package "module-init-tools-&module-init-tools-version;.tar.bz2">
+<!ENTITY module-init-tools-directory "module-init-tools-&module-init-tools-version;">
 
 <!ENTITY nALFS-md5 "1e7bb2216cbddec8c97fc0a440216bf1">
 <!ENTITY nALFS-version "1.2.4">

Modified: profiles/LFS/branches/6.0/config_tarball/fstab.xml
===================================================================
--- profiles/LFS/branches/6.0/config_tarball/fstab.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/config_tarball/fstab.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Creating the /etc/fstab file">
+<stage name="Creating the /etc/fstab File">
 	<textdump>
 		<file>/etc/fstab</file>
 		<content>

Modified: profiles/LFS/branches/6.0/config_tarball/grub.xml
===================================================================
--- profiles/LFS/branches/6.0/config_tarball/grub.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/config_tarball/grub.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -9,7 +9,7 @@
 
 <alfs>
 
-<stage name="Making the LFS system bootable">
+<stage name="Making the LFS System Bootable">
 	<!--
 	The following shell command sets up grub.  The batch param on the first line
 	has to have the space between the dashes removed for this to work.	

Modified: profiles/LFS/branches/6.0/config_tarball/kernel.xml
===================================================================
--- profiles/LFS/branches/6.0/config_tarball/kernel.xml	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/config_tarball/kernel.xml	2004-10-27 03:32:26 UTC (rev 1571)
@@ -10,7 +10,7 @@
 <alfs xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <package name="linux" version="&linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
@@ -23,7 +23,7 @@
 		</ownership>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&linux-src-location;/&linux-directory;</base>
 		</stageinfo>

Modified: profiles/LFS/branches/6.0/config_tarball/package.ent
===================================================================
--- profiles/LFS/branches/6.0/config_tarball/package.ent	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/config_tarball/package.ent	2004-10-27 03:32:26 UTC (rev 1571)
@@ -236,10 +236,10 @@
 <!ENTITY mktemp-tempfile-patch-md5 "">
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-1.patch">
 
-<!ENTITY module-tools-md5 "">
-<!ENTITY module-tools-version "3.0">
-<!ENTITY module-tools-package "module-init-tools-&module-tools-version;.tar.bz2">
-<!ENTITY module-tools-directory "module-init-tools-&module-tools-version;">
+<!ENTITY module-init-tools-md5 "">
+<!ENTITY module-init-tools-version "3.0">
+<!ENTITY module-init-tools-package "module-init-tools-&module-init-tools-version;.tar.bz2">
+<!ENTITY module-init-tools-directory "module-init-tools-&module-init-tools-version;">
 
 <!ENTITY nALFS-md5 "">
 <!ENTITY nALFS-version "1.2.4">

Modified: profiles/LFS/branches/6.0/runit
===================================================================
--- profiles/LFS/branches/6.0/runit	2004-10-27 03:13:17 UTC (rev 1570)
+++ profiles/LFS/branches/6.0/runit	2004-10-27 03:32:26 UTC (rev 1571)
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 if [ $(id -u) -ne 0 ]; then
-   echo "Attention: this profile should be run as root."
+   echo "Attention: this profile should be run as root"
    exit 3
 fi
 
 if [ ! -e config ]; then
-  echo "Attention: You must create a config directory (or link)."
+  echo "Attention: You must create a config directory (or link)"
 fi
 
 umask 022




More information about the alfs-log mailing list