cvs commit: ALFS/profiles/LFS/config_tarball general.ent

jamie at linuxfromscratch.org jamie at linuxfromscratch.org
Wed Feb 4 11:57:26 PST 2004


jamie       04/02/04 12:57:26

  Modified:    profiles/LFS/chapter05 glibc.xml
               profiles/LFS/chapter06 glibc.xml
               profiles/LFS/config_seperate general.ent
               profiles/LFS/config_tarball general.ent
  Log:
  Added support for changing the linker filename in general.ent to make it easier to build on non-x86 arch's.
  
  Revision  Changes    Path
  1.7       +1 -1      ALFS/profiles/LFS/chapter05/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/glibc.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- glibc.xml	21 Jan 2004 21:58:04 -0000	1.6
  +++ glibc.xml	4 Feb 2004 19:57:26 -0000	1.7
  @@ -44,7 +44,7 @@
   		</mkdir>
   
   		<execute command="touch">
  -			<param>/tools/etc/ld.so.conf</param>
  +			<param>/tools/etc/&ld-config-file;</param>
   		</execute>
   
   		<make>
  
  
  
  1.7       +4 -4      ALFS/profiles/LFS/chapter06/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/glibc.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- glibc.xml	21 Jan 2004 21:58:04 -0000	1.6
  +++ glibc.xml	4 Feb 2004 19:57:26 -0000	1.7
  @@ -37,7 +37,7 @@
   		</make>
   
   		<execute command="touch">
  -			<param>/etc/ld.so.conf</param>
  +			<param>/etc/&ld-config-file;</param>
   		</execute>
   
   		<make>
  @@ -104,14 +104,14 @@
   		</copy>
   
   		<textdump>
  -			<file>/etc/ld.so.conf</file>
  +			<file>/etc/&ld-config-file;</file>
   			<content>
  -				=# Begin /etc/ld.so.conf
  +				=# Begin /etc/&ld-config-file;
   				=
   				=/usr/local/lib
   				=/opt/lib
   				=
  -				=# End /etc/ld.so.conf
  +				=# End /etc/&ld-config-file;
   			</content>
   		</textdump>
   	</stage>
  
  
  
  1.6       +7 -0      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- general.ent	3 Feb 2004 18:00:47 -0000	1.5
  +++ general.ent	4 Feb 2004 19:57:26 -0000	1.6
  @@ -168,3 +168,10 @@
   	-->
   <!ENTITY grub-root "hd0,0">
   <!ENTITY grub-install-location "hd0">
  +
  +<!-- dynamic library file that your system uses, 
  +	e.g.
  +		x86 = ld.so.conf
  +		powerpc = ld.so.1
  +-->
  +<!ENTITY ld-config-file "ld.so.conf">
  
  
  
  1.2       +8 -1      ALFS/profiles/LFS/config_tarball/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/config_tarball/general.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- general.ent	15 Jan 2004 01:41:17 -0000	1.1
  +++ general.ent	4 Feb 2004 19:57:26 -0000	1.2
  @@ -132,7 +132,7 @@
   
   
   <!-- LFS book version -->
  -<!ENTITY LFS-version "CVS-20040109">
  +<!ENTITY LFS-version "CVS-2004-02-01">
   
   
   <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
  @@ -168,3 +168,10 @@
   	-->
   <!ENTITY grub-root "hd0,0">
   <!ENTITY grub-install-location "hd0">
  +
  +<!-- dynamic library file that your system uses, 
  +	e.g.
  +		x86 = ld.so.conf
  +		powerpc = ld.so.1
  +-->
  +<!ENTITY ld-config-file "ld.so.conf">
  
  
  



More information about the alfs-log mailing list