cvs commit: ALFS/profiles/LFS/chapter05 coreutils.xml creatingtoolsdir.xml glibc.xml kernel-headers.xml lockingglibc.xml ncurses.xml perl.xml util-linux.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon May 3 15:53:00 PDT 2004


thomasp     04/05/03 16:53:00

  Modified:    profiles/LFS/chapter05 Tag: LFS-5_1-branch coreutils.xml
                        creatingtoolsdir.xml glibc.xml kernel-headers.xml
                        lockingglibc.xml ncurses.xml perl.xml
                        util-linux.xml
  Log:
  backport changes from HEAD to 5.1 branch
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +1 -13     ALFS/profiles/LFS/chapter05/coreutils.xml
  
  Index: coreutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/coreutils.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- coreutils.xml	21 Jan 2004 21:58:04 -0000	1.3
  +++ coreutils.xml	3 May 2004 22:52:59 -0000	1.3.2.1
  @@ -5,12 +5,6 @@
   			<archive>&packages_dir;/&coreutils-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&coreutils-posixver-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -18,13 +12,8 @@
   			<base>&build_dir;/&coreutils-directory;</base>
   		</stageinfo>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&coreutils-posixver-patch;</param>
  -		</patch>
  -
   		<configure>
  +			<prefix>DEFAULT_POSIX2_VERSION=199209</prefix>
   			<param>--prefix=/tools</param>
   		</configure>
   
  @@ -44,6 +33,5 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&coreutils-directory;</remove>
  -		<remove>&build_dir;/&coreutils-posixver-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.2.4.1   +85 -5     ALFS/profiles/LFS/chapter05/creatingtoolsdir.xml
  
  Index: creatingtoolsdir.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/creatingtoolsdir.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- creatingtoolsdir.xml	9 Dec 2003 17:01:41 -0000	1.2
  +++ creatingtoolsdir.xml	3 May 2004 22:52:59 -0000	1.2.4.1
  @@ -39,9 +39,89 @@
   	</execute>
   	
   	-->
  -	
  -	<copy>
  -		<source>&orig_packages_dir;/*</source>
  -		<destination>&LFS;&packages_dir;</destination>
  -	</copy>
  +
  +	<stage name="Copying package and patch files">
  +		<stageinfo>
  +			<base>&orig_packages_dir;</base>
  +		</stageinfo>
  +
  +		<copy>
  +			<source>&autoconf-package;</source>
  +			<source>&automake-package;</source>
  +			<source>&bash-package;</source>
  +			<source>&bash-patch;</source>
  +			<source>&binutils-package;</source>
  +			<source>&bison-package;</source>
  +			<source>&bison-attribute-patch;</source>
  +			<source>&bzip2-package;</source>
  +			<source>&coreutils-package;</source>
  +			<source>&coreutils-hostname-patch;</source>
  +			<source>&coreutils-uname-patch;</source>
  +			<source>&dejagnu-package;</source>
  +			<source>&diffutils-package;</source>
  +			<source>&e2fsprogs-package;</source>
  +			<source>&ed-package;</source>
  +			<source>&ed-mkstemp-patch;</source>
  +			<source>&expect-package;</source>
  +			<source>&expect-spawn-patch;</source>
  +			<source>&file-package;</source>
  +			<source>&findutils-package;</source>
  +			<source>&flex-package;</source>
  +			<source>&gawk-package;</source>
  +			<source>&gcc-2953-package;</source>
  +			<source>&gcc-2953-patch;</source>
  +			<source>&gcc-2953-patch-no-fixinc;</source>
  +			<source>&gcc-2953-returntype-fix-patch;</source>
  +			<source>&gcc-core-package;</source>
  +			<source>&gcc-gpp-package;</source>
  +			<source>&gcc-testsuite-package;</source>
  +			<source>&gcc-no-fixincludes-patch;</source>
  +			<source>&gcc-specs-patch;</source>
  +			<source>&gettext-package;</source>
  +			<source>&glibc-package;</source>
  +			<source>&grep-package;</source>
  +			<source>&groff-package;</source>
  +			<source>&grub-package;</source>
  +			<source>&gzip-package;</source>
  +			<source>&iana-etc-package;</source>
  +			<source>&inetutils-package;</source>
  +			<source>&inetutils-no-man-pages-patch;</source>
  +			<source>&kbd-package;</source>
  +			<source>&kbd-more-programs-patch;</source>
  +			<source>&less-package;</source>
  +			<source>&lfs-bootscripts-package;</source>
  +			<source>&libtool-package;</source>
  +			<source>&linux-package;</source>
  +			<source>&kernel-config;</source>
  +			<source>&m4-package;</source>
  +			<source>&make-package;</source>
  +			<source>&make_devices-package;</source>
  +			<source>&man-package;</source>
  +			<source>&man-80cols-patch;</source>
  +			<source>&man-pages-package;</source>
  +			<source>&mktemp-package;</source>
  +			<source>&mktemp-tempfile-patch;</source>
  +			<source>&modutils-package;</source>
  +			<source>&ncurses-package;</source>
  +			<source>&net-tools-package;</source>
  +			<source>&net-tools-miitool-gcc33;</source>
  +			<source>&patch-package;</source>
  +			<source>&perl-package;</source>
  +			<source>&perl-libc-1-patch;</source>
  +			<source>&procinfo-package;</source>
  +			<source>&procps-package;</source>
  +			<source>&psmisc-package;</source>
  +			<source>&sed-package;</source>
  +			<source>&shadow-package;</source>
  +			<source>&sysklogd-package;</source>
  +			<source>&sysvinit-package;</source>
  +			<source>&tar-package;</source>
  +			<source>&tcl-package;</source>
  +			<source>&texinfo-package;</source>
  +			<source>&util-linux-package;</source>
  +			<source>&vim-package;</source>
  +			<source>&zlib-package;</source>
  +			<destination>&LFS;&packages_dir;</destination>
  +		</copy>
  +	</stage>
   </stage>
  
  
  
  1.6.2.1   +1 -0      ALFS/profiles/LFS/chapter05/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/glibc.xml,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- glibc.xml	21 Jan 2004 21:58:04 -0000	1.6
  +++ glibc.xml	3 May 2004 22:52:59 -0000	1.6.2.1
  @@ -62,6 +62,7 @@
   		<execute command="localedef -i en_PH -f ISO-8859-1 en_PH" />
   		<execute command="localedef -i en_US -f ISO-8859-1 en_US" />
   		<execute command="localedef -i es_MX -f ISO-8859-1 es_MX" />
  +		<execute command="localedef -i fa_IR -f UTF-8 fa_IR" />
   		<execute command="localedef -i fr_FR -f ISO-8859-1 fr_FR" />
   		<execute command="localedef -i fr_FR at euro -f ISO-8859-15 fr_FR at euro" />
   		<execute command="localedef -i it_IT -f ISO-8859-1 it_IT" />
  
  
  
  1.1.4.1   +0 -6      ALFS/profiles/LFS/chapter05/kernel-headers.xml
  
  Index: kernel-headers.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/kernel-headers.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- kernel-headers.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ kernel-headers.xml	3 May 2004 22:52:59 -0000	1.1.4.1
  @@ -45,11 +45,5 @@
   			<source>include/linux</source>
   			<destination>/tools/include</destination>
   		</copy>
  -
  -		<execute command="touch /tools/include/linux/autoconf.h" />
  -	</stage>
  -
  -	<stage name="Clean-up.">
  -		<remove>&build_dir;/&linux-directory;</remove>
   	</stage>
   </package>
  
  
  
  1.1.4.1   +2 -2      ALFS/profiles/LFS/chapter05/lockingglibc.xml
  
  Index: lockingglibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/lockingglibc.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- lockingglibc.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ lockingglibc.xml	3 May 2004 22:52:59 -0000	1.1.4.1
  @@ -15,8 +15,8 @@
   
   	<search_replace>
   		<file>/tools/lib/gcc-lib/&gcc_target;/&gcc-version;/specs</file>
  -		<find> /lib/ld-linux.so.2</find>
  -		<replace> /tools/lib/ld-linux.so.2</replace>
  +		<find> /lib/&glibc-loader;</find>
  +		<replace> /tools/lib/&glibc-loader;</replace>
   	</search_replace>
   
   	<remove>/tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</remove>
  
  
  
  1.4.2.1   +0 -12     ALFS/profiles/LFS/chapter05/ncurses.xml
  
  Index: ncurses.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/ncurses.xml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- ncurses.xml	16 Dec 2003 01:26:49 -0000	1.4
  +++ ncurses.xml	3 May 2004 22:52:59 -0000	1.4.2.1
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&ncurses-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&ncurses-etip-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -17,12 +12,6 @@
   			<base>&build_dir;/&ncurses-directory;</base>
   		</stageinfo>
   
  -                <patch>
  -                        <param>-N</param>
  -                        <param>-p1</param>
  -                        <param>-i ../&ncurses-etip-patch;</param>
  -                </patch>
  -
                   <configure>
   			<param>--prefix=/tools</param>
   			<param>--with-shared</param>
  @@ -40,6 +29,5 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&ncurses-directory;</remove>
  -		<remove>&build_dir;/&ncurses-etip-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.2.2.1   +12 -1     ALFS/profiles/LFS/chapter05/perl.xml
  
  Index: perl.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/perl.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- perl.xml	14 Dec 2003 23:31:01 -0000	1.2
  +++ perl.xml	3 May 2004 22:52:59 -0000	1.2.2.1
  @@ -23,9 +23,20 @@
   			<param>-i ../&perl-libc-1-patch;</param>
   		</patch>
   
  +		<textdump>
  +			<file>/tools/bin/arch</file>
  +			<content>
  +				=uname -m
  +			</content>
  +		</textdump>
  +
  +		<permissions mode="755">
  +			<name>/tools/bin/arch</name>
  +		</permissions>
  +
   		<configure command="./configure.gnu">
   			<param>--prefix=/tools</param>
  -			<param>-Dstatic_ext='IO Fcntl'</param>
  +			<param>-Dstatic_ext='IO Fcntl POSIX'</param>
   		</configure>
   
   		<make>
  
  
  
  1.2.2.1   +0 -6      ALFS/profiles/LFS/chapter05/util-linux.xml
  
  Index: util-linux.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/util-linux.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- util-linux.xml	8 Jan 2004 02:00:15 -0000	1.2
  +++ util-linux.xml	3 May 2004 22:52:59 -0000	1.2.2.1
  @@ -35,15 +35,9 @@
   			<param>more</param>
   		</make>
   
  -		<make>
  -			<param>-C sys-utils</param>
  -			<param>arch</param>
  -		</make>
  -
   		<copy>
   			<source>mount/{,u}mount</source>
   			<source>text-utils/more</source>
  -			<source>sys-utils/arch</source>
   			<destination>/tools/bin</destination>
   		</copy>
   	</stage>
  
  
  



More information about the alfs-log mailing list