r1519 - in profiles/LFS/branches/syntax-3.2: . chapter07 chapter09 config_separate config_tarball

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Aug 29 18:57:48 PDT 2004


Author: thomasp
Date: 2004-08-29 19:57:46 -0600 (Sun, 29 Aug 2004)
New Revision: 1519

Modified:
   profiles/LFS/branches/syntax-3.2/
   profiles/LFS/branches/syntax-3.2/LFS.xml
   profiles/LFS/branches/syntax-3.2/chapter07/bootscripts.xml
   profiles/LFS/branches/syntax-3.2/chapter09/libxml2.xml
   profiles/LFS/branches/syntax-3.2/chapter09/nALFS.xml
   profiles/LFS/branches/syntax-3.2/config_separate/kernel.xml
   profiles/LFS/branches/syntax-3.2/config_tarball/kernel.xml
Log:
and the rest


Property changes on: profiles/LFS/branches/syntax-3.2
___________________________________________________________________
Name: svn:externals
   - DTD svn://svn.linuxfromscratch.org/ALFS/DTD/branches/3.1

   + DTD svn://svn.linuxfromscratch.org/ALFS/DTD/trunk


Modified: profiles/LFS/branches/syntax-3.2/LFS.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/LFS.xml	2004-08-30 01:44:14 UTC (rev 1518)
+++ profiles/LFS/branches/syntax-3.2/LFS.xml	2004-08-30 01:57:46 UTC (rev 1519)
@@ -22,7 +22,7 @@
 ]>
 
 
-<alfs version="3.1" xmlns:xi="http://www.w3.org/2001/XInclude">
+<alfs version="3.2" xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <stage name="Chapter 5 - Constructing a temporary system">
 
@@ -79,7 +79,6 @@
 		<xi:include href="chapter05/udev.xml" />
 		<xi:include href="chapter05/strip.xml" />
 	</stage>
-
 </stage>
 
 <stage name="Chapter 6 - Installing basic system software">
@@ -217,7 +216,9 @@
 	<xi:include href="chapter09/libxml2.xml" />
 	<xi:include href="chapter09/nALFS.xml" />
 
-	<remove>/tools</remove>
+	<remove>
+		<file>/tools</file>
+	</remove>
 
 	<textdump>
 		<file>/etc/lfs-release</file>
@@ -225,8 +226,11 @@
 	</textdump>
 </stage>
 
+
 <stage name="Finishing Up">
-	<remove>/tools</remove>
+	<remove>
+		<file>/tools</file>
+	</remove>
 
 	<execute command="umount">
 		<param>&LFS;/dev/pts</param>

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

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

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

Modified: profiles/LFS/branches/syntax-3.2/config_separate/kernel.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/config_separate/kernel.xml	2004-08-30 01:44:14 UTC (rev 1518)
+++ profiles/LFS/branches/syntax-3.2/config_separate/kernel.xml	2004-08-30 01:57:46 UTC (rev 1519)
@@ -11,10 +11,9 @@
 
 <package name="linux" version="&linux-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&linux-src-location;">
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
-			<destination>&linux-src-location;</destination>
 		</unpack>
 
 		<ownership user="0" group="0">

Modified: profiles/LFS/branches/syntax-3.2/config_tarball/kernel.xml
===================================================================
--- profiles/LFS/branches/syntax-3.2/config_tarball/kernel.xml	2004-08-30 01:44:14 UTC (rev 1518)
+++ profiles/LFS/branches/syntax-3.2/config_tarball/kernel.xml	2004-08-30 01:57:46 UTC (rev 1519)
@@ -11,10 +11,9 @@
 
 <package name="linux" version="&linux-version;">
 	<stage name="Unpacking.">
-		<unpack>
+		<unpack base="&linux-src-location;">
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
-			<destination>&linux-src-location;</destination>
 		</unpack>
 
 		<ownership user="0" group="0">




More information about the alfs-log mailing list