cvs commit: ALFS/profiles/BLFS/chapter24 apache.xml php.xml proftpd.xml

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


kpfleming    04/07/03 21:41:41

  Modified:    profiles/BLFS/chapter24 apache.xml php.xml proftpd.xml
  Log:
  split patching into new stage
  move configuration steps into configuration stage
  
  Revision  Changes    Path
  1.6       +17 -11    ALFS/profiles/BLFS/chapter24/apache.xml
  
  Index: apache.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter24/apache.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apache.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ apache.xml	4 Jul 2004 03:41:41 -0000	1.6
  @@ -35,7 +35,7 @@
   		</execute>
   	</stage>
   
  -	<stage name="Installing">
  +	<stage name="Patching">
   		<stageinfo>
   			<base>&build_dir;/&apache-directory;</base>
   		</stageinfo>
  @@ -45,6 +45,12 @@
   			<param>-p1</param>
   			<param>-i &packages_dir;/&apache-patch;</param>
   		</patch>
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&apache-directory;</base>
  +		</stageinfo>
   
   		<configure>
   			<param>--enable-layout=LFS</param>
  @@ -56,6 +62,16 @@
   		<make>
   			<param>install</param>
   		</make>
  +	</stage>
  +
  +	<stage name="Installing bootscript and configuration">
  +		<stageinfo>
  +			<base>&build_dir;/&blfs-bootscripts-directory;</base>
  +		</stageinfo>
  +
  +		<make>
  +			<param>install-apache</param>
  +		</make>
   		
   		<search_replace base="/etc/apache">
   			<file>httpd.conf</file>
  @@ -70,16 +86,6 @@
   		</search_replace>
   	</stage>
   
  -	<stage name="Installing bootscript and configuration">
  -		<stageinfo>
  -			<base>&build_dir;/&blfs-bootscripts-directory;</base>
  -		</stageinfo>
  -
  -		<make>
  -			<param>install-apache</param>
  -		</make>
  -	</stage>
  -
   	<stage name="Cleanup">
   		<remove>&build_dir;/&apache-directory;</remove>
   		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
  
  
  
  1.4       +1 -1      ALFS/profiles/BLFS/chapter24/php.xml
  
  Index: php.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter24/php.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- php.xml	3 Jul 2004 15:33:55 -0000	1.3
  +++ php.xml	4 Jul 2004 03:41:41 -0000	1.4
  @@ -62,7 +62,7 @@
   	</stage>
   
   
  -	<stage name="Configuring a package.">
  +	<stage name="Configuring">
   
   	<!-- remove line if already inserted -->
   		<search_replace base="/etc/apache">
  
  
  
  1.4       +9 -11     ALFS/profiles/BLFS/chapter24/proftpd.xml
  
  Index: proftpd.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter24/proftpd.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- proftpd.xml	3 Jul 2004 16:12:15 -0000	1.3
  +++ proftpd.xml	4 Jul 2004 03:41:41 -0000	1.4
  @@ -47,7 +47,15 @@
   		</make>
   	</stage>
   
  -	<stage name="Configuring a package.">
  +	<stage name="Installing bootscript and configuration">
  +		<stageinfo>
  +			<base>&build_dir;/&blfs-bootscripts-directory;</base>
  +		</stageinfo>
  +
  +		<make>
  +			<param>install-proftpd</param>
  +		</make>
  +
   		<textdump base="/etc">
   			<file>proftpd.conf</file>
   			<content>
  @@ -105,16 +113,6 @@
   		</textdump>
   	</stage>
   
  -	<stage name="Installing bootscript and configuration">
  -		<stageinfo>
  -			<base>&build_dir;/&blfs-bootscripts-directory;</base>
  -		</stageinfo>
  -
  -		<make>
  -			<param>install-proftpd</param>
  -		</make>
  -	</stage>
  -
   	<stage name="Cleanup">
   		<remove>&build_dir;/&proftpd-directory;</remove>
   		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
  
  
  



More information about the alfs-log mailing list