r1518 - profiles/LFS/branches/syntax-3.2/chapter06

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Aug 29 18:44:15 PDT 2004


Author: thomasp
Date: 2004-08-29 19:44:14 -0600 (Sun, 29 Aug 2004)
New Revision: 1518

Modified:
   profiles/LFS/branches/syntax-3.2/chapter06/adjustingtoolchain.xml
   profiles/LFS/branches/syntax-3.2/chapter06/autoconf.xml
   profiles/LFS/branches/syntax-3.2/chapter06/automake.xml
   profiles/LFS/branches/syntax-3.2/chapter06/bash.xml
   profiles/LFS/branches/syntax-3.2/chapter06/binutils.xml
   profiles/LFS/branches/syntax-3.2/chapter06/bison.xml
   profiles/LFS/branches/syntax-3.2/chapter06/bzip2.xml
   profiles/LFS/branches/syntax-3.2/chapter06/coreutils.xml
   profiles/LFS/branches/syntax-3.2/chapter06/diffutils.xml
   profiles/LFS/branches/syntax-3.2/chapter06/e2fsprogs.xml
   profiles/LFS/branches/syntax-3.2/chapter06/file.xml
   profiles/LFS/branches/syntax-3.2/chapter06/findutils.xml
   profiles/LFS/branches/syntax-3.2/chapter06/flex.xml
   profiles/LFS/branches/syntax-3.2/chapter06/gawk.xml
   profiles/LFS/branches/syntax-3.2/chapter06/gcc.xml
   profiles/LFS/branches/syntax-3.2/chapter06/gettext.xml
   profiles/LFS/branches/syntax-3.2/chapter06/glibc.xml
   profiles/LFS/branches/syntax-3.2/chapter06/grep.xml
   profiles/LFS/branches/syntax-3.2/chapter06/groff.xml
   profiles/LFS/branches/syntax-3.2/chapter06/grub.xml
   profiles/LFS/branches/syntax-3.2/chapter06/gzip.xml
   profiles/LFS/branches/syntax-3.2/chapter06/iana-etc.xml
   profiles/LFS/branches/syntax-3.2/chapter06/inetutils.xml
   profiles/LFS/branches/syntax-3.2/chapter06/iproute2.xml
   profiles/LFS/branches/syntax-3.2/chapter06/kbd.xml
   profiles/LFS/branches/syntax-3.2/chapter06/less.xml
   profiles/LFS/branches/syntax-3.2/chapter06/libc-headers.xml
   profiles/LFS/branches/syntax-3.2/chapter06/libtool.xml
   profiles/LFS/branches/syntax-3.2/chapter06/m4.xml
   profiles/LFS/branches/syntax-3.2/chapter06/make.xml
   profiles/LFS/branches/syntax-3.2/chapter06/man-pages.xml
   profiles/LFS/branches/syntax-3.2/chapter06/man.xml
   profiles/LFS/branches/syntax-3.2/chapter06/mktemp.xml
   profiles/LFS/branches/syntax-3.2/chapter06/module-tools.xml
   profiles/LFS/branches/syntax-3.2/chapter06/ncurses.xml
   profiles/LFS/branches/syntax-3.2/chapter06/patch.xml
   profiles/LFS/branches/syntax-3.2/chapter06/perl.xml
   profiles/LFS/branches/syntax-3.2/chapter06/procps.xml
   profiles/LFS/branches/syntax-3.2/chapter06/psmisc.xml
   profiles/LFS/branches/syntax-3.2/chapter06/readline.xml
   profiles/LFS/branches/syntax-3.2/chapter06/sed.xml
   profiles/LFS/branches/syntax-3.2/chapter06/shadow.xml
   profiles/LFS/branches/syntax-3.2/chapter06/sysklogd.xml
   profiles/LFS/branches/syntax-3.2/chapter06/sysvinit.xml
   profiles/LFS/branches/syntax-3.2/chapter06/tar.xml
   profiles/LFS/branches/syntax-3.2/chapter06/texinfo.xml
   profiles/LFS/branches/syntax-3.2/chapter06/udev.xml
   profiles/LFS/branches/syntax-3.2/chapter06/util-linux.xml
   profiles/LFS/branches/syntax-3.2/chapter06/vim.xml
   profiles/LFS/branches/syntax-3.2/chapter06/zlib.xml
Log:
chapter 6

Modified: profiles/LFS/branches/syntax-3.2/chapter06/adjustingtoolchain.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/adjustingtoolchain.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/adjustingtoolchain.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -22,8 +22,10 @@
 		</make>
 	</stage>
 
-	<remove>&build_dir;/&binutils-directory;</remove>
-	<remove>&build_dir;/binutils-build</remove>
+	<remove>
+		<file>&build_dir;/&binutils-directory;</file>
+		<file>&build_dir;/binutils-build</file>
+	</remove>
 
 	<stage name="Amending GCC specs file.">
 		<search_replace>

Modified: profiles/LFS/branches/syntax-3.2/chapter06/autoconf.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/autoconf.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/autoconf.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="autoconf" version="&autoconf-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&autoconf-md5;</digest>
 			<archive>&packages_dir;/&autoconf-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -41,7 +40,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&autoconf-directory;</remove>
+		<remove>
+			<file>&build_dir;/&autoconf-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/automake.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/automake.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/automake.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="automake" version="&automake-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&automake-md5;</digest>
 			<archive>&packages_dir;/&automake-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -42,7 +41,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&automake-directory;</remove>
+		<remove>
+			<file>&build_dir;/&automake-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/bash.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/bash.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/bash.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="bash" version="&bash-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&bash-md5;</digest>
 			<archive>&packages_dir;/&bash-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,10 +22,8 @@
 			<base>&build_dir;/&bash-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&bash-display-wrap-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&bash-display-wrap-patch;</file>
 		</patch>
 
 		<configure>
@@ -50,7 +47,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&bash-directory;</remove>
+		<remove>
+			<file>&build_dir;/&bash-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/binutils.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/binutils.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/binutils.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="binutils" version="&binutils-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&binutils-md5;</digest>
 			<archive>&packages_dir;/&binutils-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 
 		<mkdir base="&build_dir;">
@@ -65,8 +64,10 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&binutils-directory;</remove>
-		<remove>&build_dir;/binutils-build</remove>
+		<remove>
+			<file>&build_dir;/&binutils-directory;</file>
+			<file>&build_dir;/binutils-build</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/bison.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/bison.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/bison.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="bison" version="&bison-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&bison-md5;</digest>
 			<archive>&packages_dir;/&bison-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -41,7 +40,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&bison-directory;</remove>
+		<remove>
+			<file>&build_dir;/&bison-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/bzip2.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/bzip2.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/bzip2.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="bzip2" version="&bzip2-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&bzip2-md5;</digest>
 			<archive>&packages_dir;/&bzip2-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -54,9 +53,11 @@
 			<name>/usr/lib/libbz2.so</name>
 		</link>
 
-		<remove>/usr/bin/bunzip2</remove>
-		<remove>/usr/bin/bzcat</remove>
-		<remove>/usr/bin/bzip2</remove>
+		<remove>
+			<file>/usr/bin/bunzip2</file>
+			<file>/usr/bin/bzcat</file>
+			<file>/usr/bin/bzip2</file>
+		</remove>
 
 		<move base="/usr/bin">
 			<source>bzip2recover</source>
@@ -79,7 +80,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&bzip2-directory;</remove>
+		<remove>
+			<file>&build_dir;/&bzip2-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/coreutils.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/coreutils.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/coreutils.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="coreutils" version="&coreutils-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&coreutils-md5;</digest>
 			<archive>&packages_dir;/&coreutils-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,16 +22,12 @@
 			<base>&build_dir;/&coreutils-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&coreutils-uname-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&coreutils-uname-patch;</file>
 		</patch>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&coreutils-dupes-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&coreutils-dupes-patch;</file>
 		</patch>
 
 		<configure>
@@ -124,7 +119,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&coreutils-directory;</remove>
+		<remove>
+			<file>&build_dir;/&coreutils-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/diffutils.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/diffutils.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/diffutils.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="diffutils" version="&diffutils-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&diffutils-md5;</digest>
 			<archive>&packages_dir;/&diffutils-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -35,7 +34,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&diffutils-directory;</remove>
+		<remove>
+			<file>&build_dir;/&diffutils-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/e2fsprogs.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/e2fsprogs.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/e2fsprogs.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="e2fsprogs" version="&e2fsprogs-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&e2fsprogs-md5;</digest>
 			<archive>&packages_dir;/&e2fsprogs-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 
 		<mkdir base="&build_dir;">
@@ -52,8 +51,10 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&e2fsprogs-directory;</remove>
-		<remove>&build_dir;/e2fsprogs-build</remove>
+		<remove>
+			<file>&build_dir;/&e2fsprogs-directory;</file>
+			<file>&build_dir;/e2fsprogs-build</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/file.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/file.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/file.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="file" version="&file-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&file-md5;</digest>
 			<archive>&packages_dir;/&file-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -35,7 +34,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&file-directory;</remove>
+		<remove>
+			<file>&build_dir;/&file-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/findutils.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/findutils.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/findutils.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="findutils" version="&findutils-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&findutils-md5;</digest>
 			<archive>&packages_dir;/&findutils-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -43,7 +42,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&findutils-directory;</remove>
+		<remove>
+			<file>&build_dir;/&findutils-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/flex.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/flex.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/flex.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="flex" version="&flex-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&flex-md5;</digest>
 			<archive>&packages_dir;/&flex-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,10 +22,8 @@
 			<base>&build_dir;/&flex-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&flex-debian-fixes-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&flex-debian-fixes-patch;</file>
 		</patch>
 
 		<execute command="touch">
@@ -73,7 +70,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&flex-directory;</remove>
+		<remove>
+			<file>&build_dir;/&flex-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/gawk.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/gawk.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/gawk.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="gawk" version="&gawk-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&gawk-md5;</digest>
 			<archive>&packages_dir;/&gawk-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -42,7 +41,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&gawk-directory;</remove>
+		<remove>
+			<file>&build_dir;/&gawk-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/gcc.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/gcc.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/gcc.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="gcc" version="&gcc-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&gcc-md5;</digest>
 			<archive>&packages_dir;/&gcc-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 
 		<mkdir base="&build_dir;">
@@ -32,10 +31,8 @@
 			<base>&build_dir;/gcc-build</base>
 		</stageinfo>
 
-		<patch base="&build_dir;/&gcc-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc-no-fixincludes-patch;</param>
+		<patch path_strip="1" base="&build_dir;/&gcc-directory;">
+			<file>&packages_dir;/&gcc-no-fixincludes-patch;</file>
 		</patch>
 
 		<search_replace base="&build_dir;/&gcc-directory;">
@@ -82,8 +79,10 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&gcc-directory;</remove>
-		<remove>&build_dir;/gcc-build</remove>
+		<remove>
+			<file>&build_dir;/&gcc-directory;</file>
+			<file>&build_dir;/gcc-build</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/gettext.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/gettext.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/gettext.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="gettext" version="&gettext-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&gettext-md5;</digest>
 			<archive>&packages_dir;/&gettext-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -41,7 +40,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&gettext-directory;</remove>
+		<remove>
+			<file>&build_dir;/&gettext-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/glibc.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/glibc.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/glibc.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="glibc" version="&glibc-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&glibc-md5;</digest>
 			<archive>&packages_dir;/&glibc-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 
 		<mkdir base="&build_dir;">
@@ -107,7 +106,9 @@
 			</content>
 		</textdump>
 
-		<remove>/etc/localtime</remove>
+		<remove>
+			<file>/etc/localtime</file>
+		</remove>
 		<copy>
 			<option>force</option>
 			<source>&localtime;</source>
@@ -128,8 +129,10 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&glibc-directory;</remove>
-		<remove>&build_dir;/glibc-build</remove>
+		<remove>
+			<file>&build_dir;/&glibc-directory;</file>
+			<file>&build_dir;/glibc-build</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/grep.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/grep.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/grep.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="grep" version="&grep-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&grep-md5;</digest>
 			<archive>&packages_dir;/&grep-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -43,7 +42,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&grep-directory;</remove>
+		<remove>
+			<file>&build_dir;/&grep-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/groff.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/groff.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/groff.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="groff" version="&groff-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&groff-md5;</digest>
 			<archive>&packages_dir;/&groff-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -54,7 +53,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&groff-directory;</remove>
+		<remove>
+			<file>&build_dir;/&groff-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/grub.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/grub.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/grub.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="grub" version="&grub-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&grub-md5;</digest>
 			<archive>&packages_dir;/&grub-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -50,7 +49,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&grub-directory;</remove>
+		<remove>
+			<file>&build_dir;/&grub-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/gzip.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/gzip.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/gzip.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="gzip" version="&gzip-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&gzip-md5;</digest>
 			<archive>&packages_dir;/&gzip-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -44,8 +43,10 @@
 			<destination>/bin</destination>
 		</move>
 
-		<remove>/usr/bin/gunzip</remove>
-		<remove>/usr/bin/zcat</remove>
+		<remove>
+			<file>/usr/bin/gunzip</file>
+			<file>/usr/bin/zcat</file>
+		</remove>
 
 		<link>
 			<option>force</option>
@@ -67,7 +68,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&gzip-directory;</remove>
+		<remove>
+			<file>&build_dir;/&gzip-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/iana-etc.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/iana-etc.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/iana-etc.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="iana-etc" version="&iana-etc-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&iana-etc-md5;</digest>
 			<archive>&packages_dir;/&iana-etc-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -31,7 +30,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&iana-etc-directory;</remove>
+		<remove>
+			<file>&build_dir;/&iana-etc-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/inetutils.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/inetutils.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/inetutils.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="inetutils" version="&inetutils-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&inetutils-md5;</digest>
 			<archive>&packages_dir;/&inetutils-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,16 +22,12 @@
 			<base>&build_dir;/&inetutils-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&inetutils-no-man-pages-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&inetutils-no-man-pages-patch;</file>
 		</patch>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&inetutils-kernel-headers-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&inetutils-kernel-headers-patch;</file>
 		</patch>
 
 		<configure>
@@ -59,7 +54,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&inetutils-directory;</remove>
+		<remove>
+			<file>&build_dir;/&inetutils-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/iproute2.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/iproute2.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/iproute2.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="iproute2" version="&iproute2-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&iproute2-md5;</digest>
 			<archive>&packages_dir;/&iproute2-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,10 +22,8 @@
 			<base>&build_dir;/&iproute2-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&iproute2-remove-db-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&iproute2-remove-db-patch;</file>
 		</patch>
 
 		<configure />
@@ -42,7 +39,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&iproute2-directory;</remove>
+		<remove>
+			<file>&build_dir;/&iproute2-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/kbd.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/kbd.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/kbd.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="kbd" version="&kbd-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&kbd-md5;</digest>
 			<archive>&packages_dir;/&kbd-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -36,7 +35,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&kbd-directory;</remove>
+		<remove>
+			<file>&build_dir;/&kbd-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/less.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/less.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/less.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="less" version="&less-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&less-md5;</digest>
 			<archive>&packages_dir;/&less-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -37,7 +36,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&less-directory;</remove>
+		<remove>
+			<file>&build_dir;/&less-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/libc-headers.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/libc-headers.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/libc-headers.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="libc-headers" version="&linux-libc-headers-version;">
 	<stage name="Unpacking">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&linux-libc-headers-md5;</digest>
 			<archive>&packages_dir;/&linux-libc-headers-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -55,7 +54,9 @@
 	</stage>
 
 	<stage name="Cleanup">
-		<remove>&build_dir;/&linux-libc-headers-directory;</remove>
+		<remove>
+			<file>&build_dir;/&linux-libc-headers-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/libtool.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/libtool.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/libtool.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="libtool" version="&libtool-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&libtool-md5;</digest>
 			<archive>&packages_dir;/&libtool-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -41,7 +40,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&libtool-directory;</remove>
+		<remove>
+			<file>&build_dir;/&libtool-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/m4.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/m4.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/m4.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="m4" version="&m4-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&m4-md5;</digest>
 			<archive>&packages_dir;/&m4-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -41,7 +40,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&m4-directory;</remove>
+		<remove>
+			<file>&build_dir;/&m4-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/make.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/make.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/make.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="make" version="&make-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&make-md5;</digest>
 			<archive>&packages_dir;/&make-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -41,7 +40,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&make-directory;</remove>
+		<remove>
+			<file>&build_dir;/&make-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/man-pages.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/man-pages.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/man-pages.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="man-pages" version="&man-pages-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&man-pages-md5;</digest>
 			<archive>&packages_dir;/&man-pages-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -29,7 +28,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&man-pages-directory;</remove>
+		<remove>
+			<file>&build_dir;/&man-pages-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/man.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/man.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/man.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="man" version="&man-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&man-md5;</digest>
 			<archive>&packages_dir;/&man-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,10 +22,8 @@
 			<base>&build_dir;/&man-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&man-80cols-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&man-80cols-patch;</file>
 		</patch>
 
 		<search_replace base="&build_dir;/&man-directory;">
@@ -53,7 +50,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&man-directory;</remove>
+		<remove>
+			<file>&build_dir;/&man-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/mktemp.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/mktemp.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/mktemp.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="mktemp" version="&mktemp-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&mktemp-md5;</digest>
 			<archive>&packages_dir;/&mktemp-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,10 +22,8 @@
 			<base>&build_dir;/&mktemp-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&mktemp-tempfile-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&mktemp-tempfile-patch;</file>
 		</patch>
 
 		<configure>
@@ -46,7 +43,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&mktemp-directory;</remove>
+		<remove>
+			<file>&build_dir;/&mktemp-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/module-tools.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/module-tools.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/module-tools.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="module-init-tools" version="&module-tools-version;">
 	<stage name="Unpacking">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&module-tools-md5;</digest>
 			<archive>&packages_dir;/&module-tools-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -40,7 +39,9 @@
 	</stage>
 
 	<stage name="Cleanup">
-		<remove>&build_dir;/&module-tools-directory;</remove>
+		<remove>
+			<file>&build_dir;/&module-tools-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/ncurses.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/ncurses.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/ncurses.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="ncurses" version="&ncurses-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&ncurses-md5;</digest>
 			<archive>&packages_dir;/&ncurses-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 
 	</stage>
@@ -63,7 +62,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&ncurses-directory;</remove>
+		<remove>
+			<file>&build_dir;/&ncurses-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/patch.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/patch.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/patch.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="patch" version="&patch-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&patch-md5;</digest>
 			<archive>&packages_dir;/&patch-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -36,7 +35,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&patch-directory;</remove>
+		<remove>
+			<file>&build_dir;/&patch-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/perl.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/perl.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/perl.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="perl" version="&perl-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&perl-md5;</digest>
 			<archive>&packages_dir;/&perl-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -47,7 +46,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&perl-directory;</remove>
+		<remove>
+			<file>&build_dir;/&perl-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/procps.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/procps.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/procps.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="procps" version="&procps-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&procps-md5;</digest>
 			<archive>&packages_dir;/&procps-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 
 	</stage>
@@ -30,11 +29,15 @@
 			<param>install</param>
 		</make>
 
-		<remove>/lib/libproc.so</remove>
+		<remove>
+			<file>/lib/libproc.so</file>
+		</remove>
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&procps-directory;</remove>
+		<remove>
+			<file>&build_dir;/&procps-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/psmisc.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/psmisc.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/psmisc.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="psmisc" version="&psmisc-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&psmisc-md5;</digest>
 			<archive>&packages_dir;/&psmisc-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -53,7 +52,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&psmisc-directory;</remove>
+		<remove>
+			<file>&build_dir;/&psmisc-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/readline.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/readline.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/readline.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="readline" version="&readline-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&readline-md5;</digest>
 			<archive>&packages_dir;/&readline-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,10 +22,8 @@
 			<base>&build_dir;/&readline-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&readline-display-wrap-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&readline-display-wrap-patch;</file>
 		</patch>
 
 		<configure>
@@ -65,7 +62,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&readline-directory;</remove>
+		<remove>
+			<file>&build_dir;/&readline-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/sed.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/sed.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/sed.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="sed" version="&sed-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&sed-md5;</digest>
 			<archive>&packages_dir;/&sed-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -42,7 +41,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&sed-directory;</remove>
+		<remove>
+			<file>&build_dir;/&sed-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/shadow.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/shadow.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/shadow.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="shadow" version="&shadow-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&shadow-md5;</digest>
 			<archive>&packages_dir;/&shadow-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -107,7 +106,9 @@
 			<name>/etc/default</name>
 		</mkdir>
 
-		<remove>/bin/groups</remove>
+		<remove>
+			<file>/bin/groups</file>
+		</remove>
 	</stage>
 
 	<stage name="Configuring.">
@@ -122,7 +123,9 @@
 
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&shadow-directory;</remove>
+		<remove>
+			<file>&build_dir;/&shadow-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/sysklogd.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/sysklogd.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/sysklogd.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="sysklogd" version="&sysklogd-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&sysklogd-md5;</digest>
 			<archive>&packages_dir;/&sysklogd-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,16 +22,12 @@
 			<base>&build_dir;/&sysklogd-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&sysklogd-kernel-headers-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&sysklogd-kernel-headers-patch;</file>
 		</patch>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&sysklogd-signal-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&sysklogd-signal-patch;</file>
 		</patch>
 
 		<make />
@@ -60,7 +55,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&sysklogd-directory;</remove>
+		<remove>
+			<file>&build_dir;/&sysklogd-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/sysvinit.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/sysvinit.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/sysvinit.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="sysvinit" version="&sysvinit-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&sysvinit-md5;</digest>
 			<archive>&packages_dir;/&sysvinit-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,10 +22,8 @@
 			<base>&build_dir;/&sysvinit-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&sysvinit-proclen-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&sysvinit-proclen-patch;</file>
 		</patch>
 
 		<search_replace>
@@ -79,7 +76,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&sysvinit-directory;</remove>
+		<remove>
+			<file>&build_dir;/&sysvinit-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/tar.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/tar.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/tar.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="tar" version="&tar-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&tar-md5;</digest>
 			<archive>&packages_dir;/&tar-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -43,7 +42,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&tar-directory;</remove>
+		<remove>
+			<file>&build_dir;/&tar-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/texinfo.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/texinfo.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/texinfo.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="texinfo" version="&texinfo-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&texinfo-md5;</digest>
 			<archive>&packages_dir;/&texinfo-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -46,7 +45,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&texinfo-directory;</remove>
+		<remove>
+			<file>&build_dir;/&texinfo-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/udev.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/udev.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/udev.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="udev" version="&udev-version;">
 	<stage name="Unpacking">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&udev-md5;</digest>
 			<archive>&packages_dir;/&udev-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -46,7 +45,9 @@
 	</stage>
 
 	<stage name="Cleanup">
-		<remove>&build_dir;/&udev-directory;</remove>
+		<remove>
+			<file>&build_dir;/&udev-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/util-linux.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/util-linux.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/util-linux.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="util-linux" version="&util-linux-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&util-linux-md5;</digest>
 			<archive>&packages_dir;/&util-linux-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -23,10 +22,8 @@
 			<base>&build_dir;/&util-linux-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&util-linux-kernel-headers-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&util-linux-kernel-headers-patch;</file>
 		</patch>
 
 		<search_replace>
@@ -55,7 +52,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&util-linux-directory;</remove>
+		<remove>
+			<file>&build_dir;/&util-linux-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/vim.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/vim.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/vim.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,15 +11,13 @@
 
 <package name="vim" version="&vim-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&vim-md5;</digest>
 			<archive>&packages_dir;/&vim-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&vim-lang-md5;</digest>
 			<archive>&packages_dir;/&vim-lang-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -79,7 +77,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&vim-directory;</remove>
+		<remove>
+			<file>&build_dir;/&vim-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter06/zlib.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter06/zlib.xml	2004-08-28 20:00:51 UTC (rev 1517)
+++ profiles/LFS/branches/syntax-3.2/chapter06/zlib.xml	2004-08-30 01:44:14 UTC (rev 1518)
@@ -11,10 +11,9 @@
 
 <package name="zlib" version="&zlib-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&zlib-md5;</digest>
 			<archive>&packages_dir;/&zlib-package;</archive>
-			<destination>&build_dir;</destination>
 		</unpack>
 	</stage>
 
@@ -77,7 +76,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&zlib-directory;</remove>
+		<remove>
+			<file>&build_dir;/&zlib-directory;</file>
+		</remove>
 	</stage>
 </package>
 




More information about the alfs-log mailing list