cvs commit: ALFS/profiles/BLFS/config_standard config.ent packages.ent

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Jul 3 19:54:41 PDT 2004


kpfleming    04/07/03 20:54:41

  Modified:    profiles/BLFS/chapter14 dhclient.xml dhcpcd.xml
               profiles/BLFS/config_standard config.ent packages.ent
  Log:
  minor cleanups
  split patching into new stage
  move dhcpcd/dhclient standard parameters into config.ent
  
  Revision  Changes    Path
  1.4       +1 -1      ALFS/profiles/BLFS/chapter14/dhclient.xml
  
  Index: dhclient.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter14/dhclient.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dhclient.xml	3 Jul 2004 15:33:53 -0000	1.3
  +++ dhclient.xml	4 Jul 2004 02:54:41 -0000	1.4
  @@ -44,7 +44,7 @@
   			<content>
   			=ONBOOT=yes
   			=DHCP_START="&dhclient-start-params;"
  -			=DHCP_STOP="-r &dhclient-stop-params;"
  +			=DHCP_STOP="&dhclient-stop-params;"
   			=SERVICE=dhclient"
   			</content>
   		</textdump>
  
  
  
  1.7       +10 -4     ALFS/profiles/BLFS/chapter14/dhcpcd.xml
  
  Index: dhcpcd.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter14/dhcpcd.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dhcpcd.xml	3 Jul 2004 20:45:31 -0000	1.6
  +++ dhcpcd.xml	4 Jul 2004 02:54:41 -0000	1.7
  @@ -12,7 +12,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  +	<stage name="Patching">
   		<stageinfo>
   			<base>&build_dir;/&dhcpcd-directory;</base>
   		</stageinfo>
  @@ -22,6 +22,12 @@
   			<param>-p1</param>
   			<param>-i &packages_dir;/&dhcpcd-patch;</param>
   		</patch>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&dhcpcd-directory;</base>
  +		</stageinfo>
   
   		<configure>
   			<param>--prefix=""</param>
  @@ -36,7 +42,7 @@
   		</make>
   	</stage>
   
  -	<stage name="Install dhcpcd service script">
  +	<stage name="Installing dhcpcd service script">
   		<stageinfo>
   			<base>&build_dir;/&blfs-bootscripts-directory;</base>
   		</stageinfo>
  @@ -46,13 +52,13 @@
   		</make>
   	</stage>
   
  -	<stage name="Configure dhcpcd">
  +	<stage name="Configuring dhcpcd">
   		<textdump>
   			<file>/etc/sysconfig/network-devices/ifconfig.eth0</file>
   			<content>
   			=ONBOOT=yes
   			=DHCP_START="&dhcpcd-start-params;"
  -			=DHCP_STOP="-k &dhcpcd-stop-params;"
  +			=DHCP_STOP="&dhcpcd-stop-params;"
   			=SERVICE=dhcpcd
   			</content>
   		</textdump>
  
  
  
  1.6       +2 -2      ALFS/profiles/BLFS/config_standard/config.ent
  
  Index: config.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/config_standard/config.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- config.ent	22 Jun 2004 23:03:44 -0000	1.5
  +++ config.ent	4 Jul 2004 02:54:41 -0000	1.6
  @@ -20,12 +20,12 @@
   <!-- configuration for dhclient -->
   <!-- These two entities should be set to appropriate values to start and stop dhclient -->
   <!ENTITY dhclient-start-params "">
  -<!ENTITY dhclient-stop-params "">
  +<!ENTITY dhclient-stop-params "-r">
   
   <!-- configuration for dhcpcd -->
   <!-- These two entities should be set to appropriate values to start and stop dhcpcd -->
   <!ENTITY dhcpcd-start-params "">
  -<!ENTITY dhcpcd-stop-params "">
  +<!ENTITY dhcpcd-stop-params "-k">
   
   <!-- where to put kde -->
   <!ENTITY kde-prefix "/usr">
  
  
  
  1.17      +2 -0      ALFS/profiles/BLFS/config_standard/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/config_standard/packages.ent,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- packages.ent	23 Jun 2004 00:44:50 -0000	1.16
  +++ packages.ent	4 Jul 2004 02:54:41 -0000	1.17
  @@ -410,10 +410,12 @@
   <!ENTITY gcc-full-patch1    "gcc-&gcc-full-version;-no_fixincludes-1.patch">
   
   <!ENTITY tcl-version   "8.4.6">
  +<!ENTITY tcl-major-minor "8.4">
   <!ENTITY tcl-package   "tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-directory "tcl&tcl-version;">
   
   <!ENTITY tk-version   "8.4.6">
  +<!ENTITY tk-major-minor "8.4">
   <!ENTITY tk-package   "tk&tk-version;-src.tar.gz">
   <!ENTITY tk-directory "tk&tk-version;">
   
  
  
  



More information about the alfs-log mailing list