r1508 - profiles/LFS/branches/syntax-3.2/chapter05

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Aug 23 16:35:11 PDT 2004


Author: thomasp
Date: 2004-08-23 17:35:09 -0600 (Mon, 23 Aug 2004)
New Revision: 1508

Modified:
   profiles/LFS/branches/syntax-3.2/chapter05/bash.xml
   profiles/LFS/branches/syntax-3.2/chapter05/binutils-pass1.xml
   profiles/LFS/branches/syntax-3.2/chapter05/binutils-pass2.xml
   profiles/LFS/branches/syntax-3.2/chapter05/bison.xml
   profiles/LFS/branches/syntax-3.2/chapter05/bzip2.xml
   profiles/LFS/branches/syntax-3.2/chapter05/coreutils.xml
   profiles/LFS/branches/syntax-3.2/chapter05/dejagnu.xml
   profiles/LFS/branches/syntax-3.2/chapter05/diffutils.xml
   profiles/LFS/branches/syntax-3.2/chapter05/expect.xml
   profiles/LFS/branches/syntax-3.2/chapter05/findutils.xml
   profiles/LFS/branches/syntax-3.2/chapter05/flex.xml
   profiles/LFS/branches/syntax-3.2/chapter05/gawk.xml
   profiles/LFS/branches/syntax-3.2/chapter05/gcc-pass1.xml
   profiles/LFS/branches/syntax-3.2/chapter05/gcc-pass2.xml
   profiles/LFS/branches/syntax-3.2/chapter05/gettext.xml
   profiles/LFS/branches/syntax-3.2/chapter05/glibc.xml
   profiles/LFS/branches/syntax-3.2/chapter05/grep.xml
   profiles/LFS/branches/syntax-3.2/chapter05/gzip.xml
   profiles/LFS/branches/syntax-3.2/chapter05/kernel-headers.xml
   profiles/LFS/branches/syntax-3.2/chapter05/libc-headers.xml
   profiles/LFS/branches/syntax-3.2/chapter05/lockingglibc.xml
   profiles/LFS/branches/syntax-3.2/chapter05/m4.xml
   profiles/LFS/branches/syntax-3.2/chapter05/make.xml
   profiles/LFS/branches/syntax-3.2/chapter05/ncurses.xml
   profiles/LFS/branches/syntax-3.2/chapter05/patch.xml
   profiles/LFS/branches/syntax-3.2/chapter05/perl.xml
   profiles/LFS/branches/syntax-3.2/chapter05/sed.xml
   profiles/LFS/branches/syntax-3.2/chapter05/strip.xml
   profiles/LFS/branches/syntax-3.2/chapter05/tar.xml
   profiles/LFS/branches/syntax-3.2/chapter05/tcl.xml
   profiles/LFS/branches/syntax-3.2/chapter05/texinfo.xml
   profiles/LFS/branches/syntax-3.2/chapter05/udev.xml
   profiles/LFS/branches/syntax-3.2/chapter05/util-linux.xml
Log:
chapter 5

Modified: profiles/LFS/branches/syntax-3.2/chapter05/bash.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/bash.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/bash.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -48,7 +48,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/chapter05/binutils-pass1.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/binutils-pass1.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/binutils-pass1.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <package name="binutils-pass1" 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;">

Modified: profiles/LFS/branches/syntax-3.2/chapter05/binutils-pass2.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/binutils-pass2.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/binutils-pass2.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <package name="binutils-pass2" 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;">

Modified: profiles/LFS/branches/syntax-3.2/chapter05/bison.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/bison.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/bison.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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 +41,9 @@
 	</stage>
 
 	<stage name="Cleanup">
-		<remove>&build_dir;/&bison-directory;</remove>
+		<remove>
+			<file>&build_dir;/&bison-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter05/bzip2.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/bzip2.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/bzip2.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -32,7 +32,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/chapter05/coreutils.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/coreutils.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/coreutils.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -43,7 +43,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/chapter05/dejagnu.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/dejagnu.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/dejagnu.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <package name="dejagnu" version="&dejagnu-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&dejagnu-md5;</digest>
 			<archive>&packages_dir;/&dejagnu-package;</archive>
-			<destination>&build_dir;</destination>
+			
 		</unpack>
 	</stage>
 
@@ -33,7 +33,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&dejagnu-directory;</remove>
+		<remove>
+			<file>&build_dir;/&dejagnu-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter05/diffutils.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/diffutils.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/diffutils.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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 +35,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/chapter05/expect.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/expect.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/expect.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <package name="expect" version="&expect-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&expect-md5;</digest>
 			<archive>&packages_dir;/&expect-package;</archive>
-			<destination>&build_dir;</destination>
+			
 		</unpack>
 	</stage>
 
@@ -23,10 +23,8 @@
 			<base>&build_dir;/&expect-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&expect-spawn-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&expect-spawn-patch;</file>
 		</patch>
 
 		<configure>
@@ -50,8 +48,10 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&tcl-directory;</remove>
-		<remove>&build_dir;/&expect-directory;</remove>
+		<remove>
+			<file>&build_dir;/&tcl-directory;</file>
+			<file>&build_dir;/&expect-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter05/findutils.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/findutils.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/findutils.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -41,7 +41,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/chapter05/flex.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/flex.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/flex.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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 +23,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">
@@ -51,7 +49,9 @@
 	</stage>
 
 	<stage name="Cleanup">
-		<remove>&build_dir;/&flex-directory;</remove>
+		<remove>
+			<file>&build_dir;/&flex-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter05/gawk.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/gawk.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/gawk.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -41,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/chapter05/gcc-pass1.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/gcc-pass1.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/gcc-pass1.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <package name="gcc-pass1" 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;">
@@ -58,8 +58,10 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/gcc-build</remove>
-		<remove>&build_dir;/&gcc-directory;</remove>
+		<remove>
+			<file>&build_dir;/gcc-build</file>
+			<file>&build_dir;/&gcc-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter05/gcc-pass2.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/gcc-pass2.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/gcc-pass2.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <package name="gcc-pass2" 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;">
@@ -39,16 +39,12 @@
 suites for GCC and Binutils until you are able to resolve the issue.
 -->
 
-		<patch base="&build_dir;/&gcc-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc-no-fixincludes-patch;</param>
+		<patch base="&build_dir;/&gcc-directory;" path_strip="1">
+			<file>&packages_dir;/&gcc-no-fixincludes-patch;</file>
 		</patch>
 
-		<patch base="&build_dir;/&gcc-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&gcc-specs-patch;</param>
+		<patch base="&build_dir;/&gcc-directory;" path_strip="1">
+			<file>&packages_dir;/&gcc-specs-patch;</file>
 		</patch>
 
 		<configure command="../&gcc-directory;/configure">
@@ -79,8 +75,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/chapter05/gettext.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/gettext.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/gettext.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -43,7 +43,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/chapter05/glibc.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/glibc.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/glibc.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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;">
@@ -84,8 +84,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/chapter05/grep.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/grep.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/grep.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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 +43,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/chapter05/gzip.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/gzip.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/gzip.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -35,7 +35,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/chapter05/kernel-headers.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/kernel-headers.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/kernel-headers.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <package name="kernel-headers" version="&linux-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
-			<destination>&build_dir;</destination>
+			
 		</unpack>
 	</stage>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter05/libc-headers.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/libc-headers.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/libc-headers.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -37,7 +37,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/chapter05/lockingglibc.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/lockingglibc.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/lockingglibc.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -21,8 +21,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>
 
 	<search_replace>
 		<file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
@@ -30,7 +32,9 @@
 		<replace> /tools/lib/&glibc-loader;</replace>
 	</search_replace>
 
-	<remove>/tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</remove>
+	<remove>
+		<file>/tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</file>
+	</remove>
 
 <!-- Test basic functions of toolchain with:
 	echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /tools';

Modified: profiles/LFS/branches/syntax-3.2/chapter05/m4.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/m4.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/m4.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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 +41,9 @@
 	</stage>
 
 	<stage name="Cleanup">
-		<remove>&build_dir;/&m4-directory;</remove>
+		<remove>
+			<file>&build_dir;/&m4-directory;</file>
+		</remove>
 	</stage>
 </package>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter05/make.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/make.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/make.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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 +41,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/chapter05/ncurses.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/ncurses.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/ncurses.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -39,7 +39,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/chapter05/patch.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/patch.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/patch.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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 +36,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/chapter05/perl.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/perl.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/perl.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -23,10 +23,8 @@
 			<base>&build_dir;/&perl-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&perl-libc-1-patch;</param>
+		<patch path_strip="1">
+			<file>&packages_dir;/&perl-libc-1-patch;</file>
 		</patch>
 
 		<configure command="./configure.gnu">
@@ -58,7 +56,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/chapter05/sed.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/sed.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/sed.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -41,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/chapter05/strip.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/strip.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/strip.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -20,7 +20,9 @@
 		<param>/tools/{,s}bin/*</param>
 	</execute>
 
-	<remove>/tools/{doc,info,man}</remove>
+	<remove>
+			<file>/tools/{doc,info,man}</file>
+		</remove>
 
 </stage>
 -->

Modified: profiles/LFS/branches/syntax-3.2/chapter05/tar.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/tar.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/tar.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -41,7 +41,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/chapter05/tcl.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/tcl.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/tcl.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <package name="tcl" version="&tcl-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&build_dir;">
 			<digest>&tcl-md5;</digest>
 			<archive>&packages_dir;/&tcl-package;</archive>
-			<destination>&build_dir;</destination>
+			
 		</unpack>
 	</stage>
 

Modified: profiles/LFS/branches/syntax-3.2/chapter05/texinfo.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/texinfo.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/texinfo.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -41,7 +41,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/chapter05/udev.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/udev.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/udev.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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>
 
@@ -60,7 +60,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/chapter05/util-linux.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/chapter05/util-linux.xml	2004-08-23 01:45:24 UTC (rev 1507)
+++ profiles/LFS/branches/syntax-3.2/chapter05/util-linux.xml	2004-08-23 23:35:09 UTC (rev 1508)
@@ -11,10 +11,10 @@
 
 <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 +23,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>
@@ -60,7 +58,9 @@
 	</stage>
 
 	<stage name="Cleaning up.">
-		<remove>&build_dir;/&util-linux-directory;</remove>
+		<remove>
+			<file>&build_dir;/&util-linux-directory;</file>
+		</remove>
 	</stage>
 </package>
 




More information about the alfs-log mailing list