cvs commit: ALFS/profiles/BLFS/chapter08 ispell.xml libfam.xml libusb.xml readline.xml slang.xml

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Jul 3 18:55:38 PDT 2004


kpfleming    04/07/03 19:55:38

  Modified:    profiles/BLFS/chapter08 ispell.xml libfam.xml libusb.xml
                        readline.xml slang.xml
  Log:
  use ALFS elements properly
  move group creation into separate stage
  use ldconfig entity consistently
  
  Revision  Changes    Path
  1.3       +10 -1     ALFS/profiles/BLFS/chapter08/ispell.xml
  
  Index: ispell.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/ispell.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ispell.xml	3 Jul 2004 15:33:51 -0000	1.2
  +++ ispell.xml	4 Jul 2004 01:55:38 -0000	1.3
  @@ -13,7 +13,16 @@
   			<base>&build_dir;/&ispell-directory;</base>
   		</stageinfo>
   
  -		<execute command='sed -e "s:/usr/local:/usr:g" local.h.linux > local.h' />
  +		<search_replace>
  +			<file>local.h.linux</file>
  +			<find>/usr/local</find>
  +			<replace>/usr</replace>
  +		</search_replace>
  +
  +		<copy>
  +			<source>local.h.linux</source>
  +			<destination>local.h</destination>
  +		</copy>
   
   		<make />
   
  
  
  
  1.8       +4 -1      ALFS/profiles/BLFS/chapter08/libfam.xml
  
  Index: libfam.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/libfam.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- libfam.xml	3 Jul 2004 20:45:30 -0000	1.7
  +++ libfam.xml	4 Jul 2004 01:55:38 -0000	1.8
  @@ -31,7 +31,10 @@
   			<param>-i &packages_dir;/&libfam-patch;</param>
   		</patch>
   
  -		<execute command="autoreconf -f -i" />
  +		<execute command="autoreconf">
  +			<param>-f</param>
  +			<param>-i</param>
  +		</execute>
   
   		<configure>
   			<param>--prefix=/usr</param>
  
  
  
  1.3       +7 -6      ALFS/profiles/BLFS/chapter08/libusb.xml
  
  Index: libusb.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/libusb.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- libusb.xml	3 Jul 2004 15:33:51 -0000	1.2
  +++ libusb.xml	4 Jul 2004 01:55:38 -0000	1.3
  @@ -18,6 +18,13 @@
   		</unpack>
   	</stage>
   
  +	<stage name="Creating group">
  +		<execute command="groupadd">
  +			<param>-f</param>
  +			<param>-g 15</param>
  +			<param>usb</param>
  +		</execute>
  +	</stage>
   
   	<stage name="Installing">
   		<stageinfo>
  @@ -34,12 +41,6 @@
   		<make>
   			<param>install</param>
   		</make>
  -
  -		<execute command="grep -q ^usb /etc/group">
  -			<param>|| groupadd</param>
  -			<param>-g 15</param>
  -			<param>usb</param>
  -		</execute>
   	</stage>
   
   	<stage name="Installing bootscript and configuration">
  
  
  
  1.5       +1 -1      ALFS/profiles/BLFS/chapter08/readline.xml
  
  Index: readline.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/readline.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- readline.xml	3 Jul 2004 15:33:51 -0000	1.4
  +++ readline.xml	4 Jul 2004 01:55:38 -0000	1.5
  @@ -24,7 +24,7 @@
   			<param>install</param>
   		</make>
   
  -		<execute command="/sbin/ldconfig" />
  +		&ldconfig;
   	</stage>
   
   	<stage name="Cleanup">
  
  
  
  1.5       +1 -1      ALFS/profiles/BLFS/chapter08/slang.xml
  
  Index: slang.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/slang.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- slang.xml	3 Jul 2004 15:33:51 -0000	1.4
  +++ slang.xml	4 Jul 2004 01:55:38 -0000	1.5
  @@ -38,7 +38,7 @@
   		        <name>/usr/lib/libslang.so.&slang-version;</name>
   		</permissions>
   
  -		<execute command="/sbin/ldconfig" />
  +		&ldconfig;
   	</stage>
   
   	<stage name="Cleanup">
  
  
  



More information about the alfs-log mailing list