cvs commit: ALFS/profiles/LFS/config_seperate package.ent

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Thu May 20 14:02:22 PDT 2004


kpfleming    04/05/20 15:02:22

  Modified:    profiles/LFS/chapter05 creatingtoolsdir.xml gcc-pass1.xml
                        gcc-pass2.xml
               profiles/LFS/chapter06 gcc.xml
               profiles/LFS/config_seperate package.ent
  Log:
  fix up gcc and glibc version tagging
  correct gcc unpacking
  
  Revision  Changes    Path
  1.11      +2 -0      ALFS/profiles/LFS/chapter05/creatingtoolsdir.xml
  
  Index: creatingtoolsdir.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/creatingtoolsdir.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- creatingtoolsdir.xml	20 May 2004 05:59:11 -0000	1.10
  +++ creatingtoolsdir.xml	20 May 2004 21:02:22 -0000	1.11
  @@ -90,6 +90,7 @@
   			<source>&less-package;</source>
   			<source>&lfs-bootscripts-package;</source>
   			<source>&libtool-package;</source>
  +			<source>&libxml2-package;</source>
   			<source>&linux-package;</source>
   			<source>&linux-libc-headers-package;</source>
   			<source>&kernel-config;</source>
  @@ -102,6 +103,7 @@
   			<source>&mktemp-tempfile-patch;</source>
   			<source>&module-tools-package;</source>
   			<source>&ncurses-package;</source>
  +			<source>&nALFS-package;</source>
   			<source>&net-tools-package;</source>
   			<source>&net-tools-gcc34-patch;</source>
   			<source>&net-tools-kernel-headers-patch;</source>
  
  
  
  1.5       +2 -2      ALFS/profiles/LFS/chapter05/gcc-pass1.xml
  
  Index: gcc-pass1.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/gcc-pass1.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gcc-pass1.xml	15 May 2004 22:51:29 -0000	1.4
  +++ gcc-pass1.xml	20 May 2004 21:02:22 -0000	1.5
  @@ -1,8 +1,8 @@
   <package name="gcc-pass1" version="&gcc-version;">
   	<stage name="Unpacking.">
   		<unpack>
  -			<digest>&gcc-core-md5;</digest>
  -			<archive>&packages_dir;/&gcc-core-package;</archive>
  +			<digest>&gcc-md5;</digest>
  +			<archive>&packages_dir;/&gcc-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
   
  
  
  
  1.7       +2 -14     ALFS/profiles/LFS/chapter05/gcc-pass2.xml
  
  Index: gcc-pass2.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/gcc-pass2.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- gcc-pass2.xml	18 May 2004 05:30:11 -0000	1.6
  +++ gcc-pass2.xml	20 May 2004 21:02:22 -0000	1.7
  @@ -1,20 +1,8 @@
   <package name="gcc-pass2" version="&gcc-version;">
   	<stage name="Unpacking.">
   		<unpack>
  -			<digest>&gcc-core-md5;</digest>
  -			<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>
  -
  -		<unpack>
  -			<digest>&gcc-testsuite-md5;</digest>
  -			<archive>&packages_dir;/&gcc-testsuite-package;</archive>
  +			<digest>&gcc-md5;</digest>
  +			<archive>&packages_dir;/&gcc-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
   
  
  
  
  1.8       +2 -14     ALFS/profiles/LFS/chapter06/gcc.xml
  
  Index: gcc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/gcc.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- gcc.xml	18 May 2004 05:30:11 -0000	1.7
  +++ gcc.xml	20 May 2004 21:02:22 -0000	1.8
  @@ -1,20 +1,8 @@
   <package name="gcc" version="&gcc-version;">
   	<stage name="Unpacking.">
   		<unpack>
  -			<digest>&gcc-core-md5;</digest>
  -			<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>
  -
  -		<unpack>
  -			<digest>&gcc-testsuite-md5;</digest>
  -			<archive>&packages_dir;/&gcc-testsuite-package;</archive>
  +			<digest>&gcc-md5;</digest>
  +			<archive>&packages_dir;/&gcc-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
   
  
  
  
  1.29      +10 -9     ALFS/profiles/LFS/config_seperate/package.ent
  
  Index: package.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/config_seperate/package.ent,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- package.ent	20 May 2004 05:59:11 -0000	1.28
  +++ package.ent	20 May 2004 21:02:22 -0000	1.29
  @@ -88,20 +88,21 @@
   <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
   <!ENTITY gawk-directory "gawk-&gawk-version;">
   
  -<!ENTITY gcc-version "3.4.1-20040517">
  -<!ENTITY gcc-directory "gcc-&gcc-version;">
  +<!ENTITY gcc-version "3.4.1">
  +<!ENTITY gcc-cvs-tag "-20040517">
  +<!ENTITY gcc-directory "gcc-&gcc-version;&gcc-cvs-tag;">
   
   <!ENTITY gcc-md5 "a01b2065e50312d9a51b47d52b742711">
  -<!ENTITY gcc-package "gcc-&gcc-version;.tar.bz2">
  +<!ENTITY gcc-package "gcc-&gcc-version;&gcc-cvs-tag;.tar.bz2">
   
   <!ENTITY gcc-core-md5 "6371ff0a37d5e1809f4f59d0045dcaa5">
  -<!ENTITY gcc-core-package "gcc-core-&gcc-version;.tar.bz2">
  +<!ENTITY gcc-core-package "gcc-core-&gcc-version;&gcc-cvs-tag;.tar.bz2">
   
   <!ENTITY gcc-gpp-md5 "4b66e4ce2e25d8c73b05ea97f27b2d8e">
  -<!ENTITY gcc-gpp-package "gcc-g++-&gcc-version;.tar.bz2">
  +<!ENTITY gcc-gpp-package "gcc-g++-&gcc-version;&gcc-cvs-tag;.tar.bz2">
     
   <!ENTITY gcc-testsuite-md5 "dcc17608ae1c801eac934f5955b1820c">
  -<!ENTITY gcc-testsuite-package "gcc-testsuite-&gcc-version;.tar.bz2">
  +<!ENTITY gcc-testsuite-package "gcc-testsuite-&gcc-version;&gcc-cvs-tag;.tar.bz2">
   
   <!ENTITY gcc-no-fixincludes-patch-md5 "78fa00bc9f7173b9658eeb86ce9291c9">
   <!ENTITY gcc-no-fixincludes-patch "gcc-&gcc-version;-no-fixincludes-1.patch">
  @@ -116,9 +117,9 @@
   
   <!ENTITY glibc-md5 "461a0e3918697865de347470577472f6">
   <!ENTITY glibc-version "2.3.4">
  -<!ENTITY glibc-cvs-version "-20040510">
  -<!ENTITY glibc-package "glibc-&glibc-version;&glibc-cvs-version;.tar.bz2">
  -<!ENTITY glibc-directory "glibc-&glibc-version;&glibc-cvs-version;">
  +<!ENTITY glibc-cvs-tag "-20040510">
  +<!ENTITY glibc-package "glibc-&glibc-version;&glibc-cvs-tag;.tar.bz2">
  +<!ENTITY glibc-directory "glibc-&glibc-version;&glibc-cvs-tag;">
   
   <!ENTITY grep-md5 "ddd99e2d5d4f4611357e31e97f080cf2">
   <!ENTITY grep-version "2.5.1">
  
  
  



More information about the alfs-log mailing list