cvs commit: ALFS/profiles/LFS/chapter06 grub.xml man.xml perl.xml

jamie at linuxfromscratch.org jamie at linuxfromscratch.org
Sat Dec 20 14:40:02 PST 2003


jamie       03/12/20 15:40:02

  Modified:    profiles/LFS package.ent
               profiles/LFS/chapter06 grub.xml man.xml perl.xml
  Log:
  Rolled back the following patches to sed substitutions:
  Grub Gcc33 Patch
  Man Manpath Patch and Man Pager Patch. Closes Bug 461.
  Fixed perl error in configure.
  
  Revision  Changes    Path
  1.11      +0 -9      ALFS/profiles/LFS/package.ent
  
  Index: package.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/package.ent,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- package.ent	20 Dec 2003 22:09:26 -0000	1.10
  +++ package.ent	20 Dec 2003 22:40:01 -0000	1.11
  @@ -162,9 +162,6 @@
   <!ENTITY grub-package "grub-&grub-version;.tar.gz">
   <!ENTITY grub-directory "grub-&grub-version;">
   
  -<!ENTITY grub-gcc-patch-md5 "ffdb54d51d981a1417164675689d7900">
  -<!ENTITY grub-gcc-patch "grub-&grub-version;-gcc33-1.patch">
  -
   <!ENTITY gzip-md5 "3d6c191dfd2bf307014b421c12dc8469">
   <!ENTITY gzip-version "1.3.5">
   <!ENTITY gzip-package "gzip-&gzip-version;.tar.gz">
  @@ -234,12 +231,6 @@
   
   <!ENTITY man-80cols-patch-md5 "4cee1076e1205f4093e611a87f6ba7b2">
   <!ENTITY man-80cols-patch "man-&man-version;-80cols.patch">
  -
  -<!ENTITY man-manpath-patch-md5 "63234a8832b65eff44d7d6995fabbabb">
  -<!ENTITY man-manpath-patch "man-&man-version;-manpath.patch">
  -
  -<!ENTITY man-pager-patch-md5 "767e17b3ba79043a617b27fa4b888dae">
  -<!ENTITY man-pagerpatch "man-&man-version;-pager.patch">
   
   <!ENTITY man-pages-md5 "c2008b298e34008a1b84595415f09fce">
   <!ENTITY man-pages-version "1.64">
  
  
  
  1.3       +5 -11     ALFS/profiles/LFS/chapter06/grub.xml
  
  Index: grub.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/grub.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- grub.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ grub.xml	20 Dec 2003 22:40:02 -0000	1.3
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&grub-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&grub-gcc-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -21,11 +16,11 @@
   			<base>&build_dir;/&grub-directory;</base>
   		</stageinfo>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&grub-gcc-patch;</param>
  -		</patch>
  +		<search_replace base="&build_dir;/&grub-directory;">
  +			<file>stage2/fsys_reiserfs.c</file>
  +			<find>2 long</find>
  +			<replace>2</replace>
  +		</search_replace>
   
   		<configure>
   			<param>--prefix=/usr</param>
  @@ -51,6 +46,5 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&grub-directory;</remove>
  -		<remove>&build_dir;/&grub-gcc-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.3       +12 -16    ALFS/profiles/LFS/chapter06/man.xml
  
  Index: man.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/man.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- man.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ man.xml	20 Dec 2003 22:40:02 -0000	1.3
  @@ -7,8 +7,6 @@
   		</unpack>
   
   		<copy>
  -			<source>&packages_dir;/&man-manpath-patch;</source>
  -			<source>&packages_dir;/&man-pagerpatch;</source>
   			<source>&packages_dir;/&man-80cols-patch;</source>
   			<destination>&build_dir;</destination>
   		</copy>
  @@ -22,21 +20,21 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&man-manpath-patch;</param>
  -		</patch>
  -
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&man-pagerpatch;</param>
  -		</patch>
  -
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
   			<param>-i ../&man-80cols-patch;</param>
   		</patch>
   
  +		<search_replace base="&build_dir;/&man-directory;">
  +			<file>configure</file>
  +			<find>-is</find>
  +			<replace>-isR</replace>
  +		</search_replace>
  +
  +		<search_replace base="&build_dir;/&man-directory;">
  +			<file>src/man.conf.in</file>
  +   			<find>MANPATH&#x09;/usr/man</find>
  +			<replace>#MANPATH /usr/man</replace>
  +		</search_replace>
  +
   		<configure>
   			<param>-default</param>
   			<param>-confdir=/etc</param>
  @@ -51,8 +49,6 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&man-directory;</remove>
  -		<remove>&build_dir;/&man-manpath-patch;</remove>
  -		<remove>&build_dir;/&man-pagerpatch;</remove>
   		<remove>&build_dir;/&man-80cols-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.4       +1 -1      ALFS/profiles/LFS/chapter06/perl.xml
  
  Index: perl.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/perl.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- perl.xml	20 Dec 2003 20:04:46 -0000	1.3
  +++ perl.xml	20 Dec 2003 22:40:02 -0000	1.4
  @@ -14,7 +14,7 @@
   
   		<configure command="./configure.gnu">
   			<param>--prefix=/usr</param>
  -			<param>-Dpager="/sites/www.linuxfromscratch.org/bin/less -isR"</param>
  +			<param>-Dpager="/bin/less -isR"</param>
   		</configure>
   
   		<make />
  
  
  



More information about the alfs-log mailing list