cvs commit: ALFS/profiles/LFS/config_seperate general.ent kernel.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon May 3 14:46:27 PDT 2004


thomasp     04/05/03 15:46:27

  Modified:    profiles/LFS/chapter05 creatingtoolsdir.xml
               profiles/LFS/config_seperate general.ent kernel.xml
  Log:
  ensure that all packages and patches are copied from their original location to the runtime packages dir
  
  Revision  Changes    Path
  1.3       +85 -5     ALFS/profiles/LFS/chapter05/creatingtoolsdir.xml
  
  Index: creatingtoolsdir.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/creatingtoolsdir.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- creatingtoolsdir.xml	9 Dec 2003 17:01:41 -0000	1.2
  +++ creatingtoolsdir.xml	3 May 2004 21:46:27 -0000	1.3
  @@ -39,9 +39,89 @@
   	</execute>
   	
   	-->
  -	
  -	<copy>
  -		<source>&orig_packages_dir;/*</source>
  -		<destination>&LFS;&packages_dir;</destination>
  -	</copy>
  +
  +	<stage name="Copying package and patch files">
  +		<stageinfo>
  +			<base>&orig_packages_dir;</base>
  +		</stageinfo>
  +
  +		<copy>
  +			<source>&autoconf-package;</source>
  +			<source>&automake-package;</source>
  +			<source>&bash-package;</source>
  +			<source>&bash-patch;</source>
  +			<source>&binutils-package;</source>
  +			<source>&bison-package;</source>
  +			<source>&bison-attribute-patch;</source>
  +			<source>&bzip2-package;</source>
  +			<source>&coreutils-package;</source>
  +			<source>&coreutils-hostname-patch;</source>
  +			<source>&coreutils-uname-patch;</source>
  +			<source>&dejagnu-package;</source>
  +			<source>&diffutils-package;</source>
  +			<source>&e2fsprogs-package;</source>
  +			<source>&ed-package;</source>
  +			<source>&ed-mkstemp-patch;</source>
  +			<source>&expect-package;</source>
  +			<source>&expect-spawn-patch;</source>
  +			<source>&file-package;</source>
  +			<source>&findutils-package;</source>
  +			<source>&flex-package;</source>
  +			<source>&gawk-package;</source>
  +			<source>&gcc-2953-package;</source>
  +			<source>&gcc-2953-patch;</source>
  +			<source>&gcc-2953-patch-no-fixinc;</source>
  +			<source>&gcc-2953-returntype-fix-patch;</source>
  +			<source>&gcc-core-package;</source>
  +			<source>&gcc-gpp-package;</source>
  +			<source>&gcc-testsuite-package;</source>
  +			<source>&gcc-no-fixincludes-patch;</source>
  +			<source>&gcc-specs-patch;</source>
  +			<source>&gettext-package;</source>
  +			<source>&glibc-package;</source>
  +			<source>&grep-package;</source>
  +			<source>&groff-package;</source>
  +			<source>&grub-package;</source>
  +			<source>&gzip-package;</source>
  +			<source>&iana-etc-package;</source>
  +			<source>&inetutils-package;</source>
  +			<source>&inetutils-no-man-pages-patch;</source>
  +			<source>&kbd-package;</source>
  +			<source>&kbd-more-programs-patch;</source>
  +			<source>&less-package;</source>
  +			<source>&lfs-bootscripts-package;</source>
  +			<source>&libtool-package;</source>
  +			<source>&linux-package;</source>
  +			<source>&kernel-config;</source>
  +			<source>&m4-package;</source>
  +			<source>&make-package;</source>
  +			<source>&make_devices-package;</source>
  +			<source>&man-package;</source>
  +			<source>&man-80cols-patch;</source>
  +			<source>&man-pages-package;</source>
  +			<source>&mktemp-package;</source>
  +			<source>&mktemp-tempfile-patch;</source>
  +			<source>&modutils-package;</source>
  +			<source>&ncurses-package;</source>
  +			<source>&net-tools-package;</source>
  +			<source>&net-tools-miitool-gcc33;</source>
  +			<source>&patch-package;</source>
  +			<source>&perl-package;</source>
  +			<source>&perl-libc-1-patch;</source>
  +			<source>&procinfo-package;</source>
  +			<source>&procps-package;</source>
  +			<source>&psmisc-package;</source>
  +			<source>&sed-package;</source>
  +			<source>&shadow-package;</source>
  +			<source>&sysklogd-package;</source>
  +			<source>&sysvinit-package;</source>
  +			<source>&tar-package;</source>
  +			<source>&tcl-package;</source>
  +			<source>&texinfo-package;</source>
  +			<source>&util-linux-package;</source>
  +			<source>&vim-package;</source>
  +			<source>&zlib-package;</source>
  +			<destination>&LFS;&packages_dir;</destination>
  +		</copy>
  +	</stage>
   </stage>
  
  
  
  1.16      +2 -2      ALFS/profiles/LFS/config_seperate/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/config_seperate/general.ent,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- general.ent	3 May 2004 21:18:10 -0000	1.15
  +++ general.ent	3 May 2004 21:46:27 -0000	1.16
  @@ -132,7 +132,7 @@
   
   
   <!-- LFS book version -->
  -<!ENTITY LFS-version "CVS-2004-05-02">
  +<!ENTITY LFS-version "CVS-2004-05-03">
   
   
   <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
  @@ -160,7 +160,7 @@
   	This file should be in a state that running `make oldconfig` will run straight through, as
   	that's what the profile in chapter 8 does with this entity.
       -->
  -<!ENTITY kernel-config "&packages_dir;/linux-config">
  +<!ENTITY kernel-config "linux-config">
   
   <!-- grub settings (these need to be in grub's notation) 
   	NOTE:  The grub configuration profile is completely commented out.  You should edit
  
  
  
  1.6       +1 -1      ALFS/profiles/LFS/config_seperate/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/config_seperate/kernel.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- kernel.xml	16 Apr 2004 02:19:45 -0000	1.5
  +++ kernel.xml	3 May 2004 21:46:27 -0000	1.6
  @@ -22,7 +22,7 @@
   		</make>
   
   		<copy>
  -			<source>&kernel-config;</source>
  +			<source>&packages_dir;/&kernel-config;</source>
   			<destination>.config</destination>
   		</copy>
   
  
  
  



More information about the alfs-log mailing list