cvs commit: ALFS/profiles/BLFS/chapter22 bind.xml dhcp.xml openssh.xml samba.xml

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


kpfleming    04/07/03 21:24:47

  Modified:    profiles/BLFS/chapter22 bind.xml dhcp.xml openssh.xml
                        samba.xml
  Log:
  split patching into new stage
  use ALFS elements properly
  split chroot configuration for bind into new stage
  
  Revision  Changes    Path
  1.5       +20 -7     ALFS/profiles/BLFS/chapter22/bind.xml
  
  Index: bind.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/bind.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- bind.xml	3 Jul 2004 16:12:14 -0000	1.4
  +++ bind.xml	4 Jul 2004 03:24:46 -0000	1.5
  @@ -42,30 +42,43 @@
   		<make>
   		        <param>install</param>
   		</make>
  +	</stage>
   
  -		<mkdir base="/home/named">
  +	<stage name="Configuring chroot environment">
  +		<stageinfo>
  +			<base>/home/named</base>
  +		</stageinfo>
  +
  +		<mkdir>
   			<option>parents</option>
   			<name>dev</name>
   			<name>etc/namedb/slave</name>
   			<name>var/run</name>
   		</mkdir>
   
  -		<execute command="mknod /home/named/dev/null c 1 3" />
  -		<execute command="mknod /home/named/dev/random c 1 8" />
  +		<execute command="mknod">
  +			<param>dev/null</param>
  +			<param>c 1 3</param>
  + 		</execute>
  +
  +		<execute command="mknod">
  +			<param>dev/random</param>
  +			<param>c 1 8</param>
  + 		</execute>
   		
   		<permissions mode="666">
  -			<name>/home/named/dev/null</name>
  -			<name>/home/named/dev/random</name>
  +			<name>dev/null</name>
  +			<name>dev/random</name>
   		</permissions>
   
   		<mkdir>
   			<option>parents</option>
  -			<name>/home/named/etc/namedb/pz</name>
  +			<name>etc/namedb/pz</name>
   		</mkdir>
   
   		<copy>
   			<source>/etc/localtime</source>
  -			<destination>/home/named/etc</destination>
  +			<destination>etc</destination>
   		</copy>
   	</stage>
   
  
  
  
  1.3       +3 -1      ALFS/profiles/BLFS/chapter22/dhcp.xml
  
  Index: dhcp.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/dhcp.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- dhcp.xml	3 Jul 2004 15:33:55 -0000	1.2
  +++ dhcp.xml	4 Jul 2004 03:24:46 -0000	1.3
  @@ -28,7 +28,9 @@
   			<param>install</param>
   		</make>
   
  -		<execute command="touch /var/state/dhcp/dhcpd.leases" />
  +		<execute command="touch">
  +			<param>/var/state/dhcp/dhcpd.leases</param>
  +		</execute>
   
   		<textdump>
   			<file>/etc/dhcpd.conf</file>
  
  
  
  1.5       +12 -6     ALFS/profiles/BLFS/chapter22/openssh.xml
  
  Index: openssh.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/openssh.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- openssh.xml	3 Jul 2004 16:12:14 -0000	1.4
  +++ openssh.xml	4 Jul 2004 03:24:46 -0000	1.5
  @@ -32,6 +32,18 @@
   		</execute>
   	</stage>
   
  +	<stage name="Patching">
  +		<stageinfo>
  +			<base>&build_dir;/&openssh-directory;</base>
  +		</stageinfo>
  +
  +		<search_replace>
  +			<file>configure</file>
  +			<find>-lcrypto</find>
  +			<replace>/usr/lib/libcrypto.a</replace>
  +		</search_replace>
  +	</stage>
  +
   	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&openssh-directory;</base>
  @@ -46,12 +58,6 @@
   		        <name>/var/empty</name>
                   </ownership>
   
  -		<search_replace>
  -			<file>configure</file>
  -			<find>-lcrypto</find>
  -			<replace>/usr/lib/libcrypto.a</replace>
  -		</search_replace>
  -
   		<configure>
   		        <param>--prefix=/usr</param>
   		        <param>--sysconfdir=/etc/ssh</param>
  
  
  
  1.4       +15 -3     ALFS/profiles/BLFS/chapter22/samba.xml
  
  Index: samba.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/samba.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- samba.xml	3 Jul 2004 15:33:55 -0000	1.3
  +++ samba.xml	4 Jul 2004 03:24:46 -0000	1.4
  @@ -12,8 +12,7 @@
   		</unpack>
   	</stage>
   
  -
  -	<stage name="Installing.">
  +	<stage name="Patching.">
   		<stageinfo>
   			<base>&build_dir;/&samba-directory;/source</base>
   		</stageinfo>
  @@ -23,6 +22,12 @@
   			<param>-p1</param>
   			<param>-i &packages_dir;/&samba-maintainer-patch;</param>
   		</patch>
  +	</stage>
  +
  +	<stage name="Installing.">
  +		<stageinfo>
  +			<base>&build_dir;/&samba-directory;/source</base>
  +		</stageinfo>
   
   		<mkdir>
   			<option>parents</option>
  @@ -44,7 +49,14 @@
   			<param>install</param>
   		</make>
   
  -		<execute command="install -m755 nsswitch/libnss_win{s,bind.so} /lib" />
  +		<copy>
  +			<source>nsswitch/libnss_win{s,bind.so}</source>
  +			<destination>/lib</destination>
  +		</copy>
  +
  +		<permissions mode="0755">
  +			<name>/lib/nsswitch/libnss_win{s,bind.so}</name>
  +		</permissions>
   
   		<link base="/lib">
   			<option>force</option>
  
  
  



More information about the alfs-log mailing list