r1544 - in profiles/LFS/branches/testing-CD: chapter05 chapter06 config

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Thu Sep 23 12:15:22 PDT 2004


Author: jhuntwork
Date: 2004-09-23 13:15:21 -0600 (Thu, 23 Sep 2004)
New Revision: 1544

Modified:
   profiles/LFS/branches/testing-CD/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/testing-CD/chapter05/gcc-pass1.xml
   profiles/LFS/branches/testing-CD/chapter05/gcc-pass2.xml
   profiles/LFS/branches/testing-CD/chapter06/gcc.xml
   profiles/LFS/branches/testing-CD/config/package.ent
Log:
* gcc separates used instead of tarball
* util-linux-sfdisk-patch upgraded


Modified: profiles/LFS/branches/testing-CD/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/testing-CD/chapter05/creatingtoolsdir.xml	2004-09-23 19:14:21 UTC (rev 1543)
+++ profiles/LFS/branches/testing-CD/chapter05/creatingtoolsdir.xml	2004-09-23 19:15:21 UTC (rev 1544)
@@ -77,10 +77,10 @@
 			<source>&flex-package;</source>
 			<source>&flex-debian-fixes-patch;</source>
 			<source>&gawk-package;</source>
-			<source>&gcc-package;</source>
-<!--			<source>&gcc-core-package;</source> -->
-<!--			<source>&gcc-gpp-package;</source> -->
-<!--			<source>&gcc-testsuite-package;</source> -->
+<!--			<source>&gcc-package;</source> -->
+			<source>&gcc-core-package;</source>
+			<source>&gcc-gpp-package;</source>
+			<source>&gcc-testsuite-package;</source>
 			<source>&gcc-linkonce-patch;</source>
 			<source>&gcc-no-fixincludes-patch;</source>
 			<source>&gcc-specs-patch;</source>

Modified: profiles/LFS/branches/testing-CD/chapter05/gcc-pass1.xml
===================================================================
--- profiles/LFS/branches/testing-CD/chapter05/gcc-pass1.xml	2004-09-23 19:14:21 UTC (rev 1543)
+++ profiles/LFS/branches/testing-CD/chapter05/gcc-pass1.xml	2004-09-23 19:15:21 UTC (rev 1544)
@@ -12,7 +12,7 @@
 <package name="gcc-pass1" version="&gcc-version;">
 	<stage name="Unpacking.">
 		<unpack>
-			<archive>&packages_dir;/&gcc-package;</archive>
+			<archive>&packages_dir;/&gcc-core-package;</archive>
 			<destination>&build_dir;</destination>
 		</unpack>
 

Modified: profiles/LFS/branches/testing-CD/chapter05/gcc-pass2.xml
===================================================================
--- profiles/LFS/branches/testing-CD/chapter05/gcc-pass2.xml	2004-09-23 19:14:21 UTC (rev 1543)
+++ profiles/LFS/branches/testing-CD/chapter05/gcc-pass2.xml	2004-09-23 19:15:21 UTC (rev 1544)
@@ -12,9 +12,14 @@
 <package name="gcc-pass2" version="&gcc-version;">
 	<stage name="Unpacking.">
 		<unpack>
-			<archive>&packages_dir;/&gcc-package;</archive>
+			<archive>&packages_dir;/&gcc-core-package;</archive>
 			<destination>&build_dir;</destination>
 		</unpack>
+		<unpack>
+			<digest>&gcc-gpp-md5;</digest>
+			<archive>&packages_dir;/&gcc-gpp-package;</archive>
+			<destination>&build_dir;</destination>
+		</unpack>
 
 		<mkdir base="&build_dir;">
 			<option>parents</option>

Modified: profiles/LFS/branches/testing-CD/chapter06/gcc.xml
===================================================================
--- profiles/LFS/branches/testing-CD/chapter06/gcc.xml	2004-09-23 19:14:21 UTC (rev 1543)
+++ profiles/LFS/branches/testing-CD/chapter06/gcc.xml	2004-09-23 19:15:21 UTC (rev 1544)
@@ -12,9 +12,17 @@
 <package name="gcc" version="&gcc-version;">
 	<stage name="Unpacking.">
 		<unpack>
-			<archive>&packages_dir;/&gcc-package;</archive>
+			<archive>&packages_dir;/&gcc-core-package;</archive>
 			<destination>&build_dir;</destination>
 		</unpack>
+		<unpack>
+			<archive>&packages_dir;/&gcc-gpp-package;</archive>
+			<destination>&build_dir;</destination>
+		</unpack>
+		<unpack>
+			<archive>&packages_dir;/&gcc-testsuite-package;</archive>
+			<destination>&build_dir;</destination>
+		</unpack>
 
 		<mkdir base="&build_dir;">
 			<option>parents</option>

Modified: profiles/LFS/branches/testing-CD/config/package.ent
===================================================================
--- profiles/LFS/branches/testing-CD/config/package.ent	2004-09-23 19:14:21 UTC (rev 1543)
+++ profiles/LFS/branches/testing-CD/config/package.ent	2004-09-23 19:15:21 UTC (rev 1544)
@@ -347,8 +347,7 @@
 <!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
 <!ENTITY util-linux-directory "util-linux-&util-linux-version;">
 
-<!ENTITY util-linux-sfdisk-patch-md5 "e9dedbb70a28804f2fd6c565a9dda206">
-<!ENTITY util-linux-sfdisk-patch "util-linux-&util-linux-version;-sfdisk-1.patch">
+<!ENTITY util-linux-sfdisk-patch "util-linux-&util-linux-version;-sfdisk-2.patch">
 
 <!ENTITY vim-md5 "821fda8f14d674346b87e3ef9cb96389">
 <!ENTITY vim-version "6.3">




More information about the alfs-log mailing list