cvs commit: ALFS/profiles/LFS/chapter06 iana-etc.xml mktemp.xml strip.xml adjustingtoolchain.xml coreutils.xml creatingdirs.xml findutils.xml glibc.xml grub.xml inetutils.xml kernel.xml makedev.xml ncurses.xml perl.xml proc.xml shadow.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon May 3 16:02:22 PDT 2004


thomasp     04/05/03 17:02:22

  Modified:    profiles/LFS/chapter06 Tag: LFS-5_1-branch
                        adjustingtoolchain.xml coreutils.xml
                        creatingdirs.xml findutils.xml glibc.xml grub.xml
                        inetutils.xml kernel.xml makedev.xml ncurses.xml
                        perl.xml proc.xml shadow.xml
  Added:       profiles/LFS/chapter06 Tag: LFS-5_1-branch iana-etc.xml
                        mktemp.xml strip.xml
  Log:
  backport changes from HEAD to 5.1 branch
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.1   +2 -2      ALFS/profiles/LFS/chapter06/adjustingtoolchain.xml
  
  Index: adjustingtoolchain.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/adjustingtoolchain.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- adjustingtoolchain.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ adjustingtoolchain.xml	3 May 2004 23:02:22 -0000	1.1.4.1
  @@ -17,8 +17,8 @@
   	<stage name="Amending GCC specs file.">
   		<search_replace>
   			<file>/tools/lib/gcc-lib/&gcc_target;/&gcc-version;/specs</file>
  -			<find> /tools/lib/ld-linux.so.2</find>
  -			<replace> /lib/ld-linux.so.2</replace>
  +			<find> /tools/lib/&glibc-loader;</find>
  +			<replace> /lib/&glibc-loader;</replace>
   		</search_replace>
   	</stage>
   
  
  
  
  1.4.2.1   +3 -10     ALFS/profiles/LFS/chapter06/coreutils.xml
  
  Index: coreutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/coreutils.xml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- coreutils.xml	21 Jan 2004 21:58:04 -0000	1.4
  +++ coreutils.xml	3 May 2004 23:02:22 -0000	1.4.2.1
  @@ -7,7 +7,6 @@
   		</unpack>
   
   		<copy>
  -			<source>&packages_dir;/&coreutils-posixver-patch;</source>
   			<source>&packages_dir;/&coreutils-uname-patch;</source>
   			<source>&packages_dir;/&coreutils-hostname-patch;</source>
   			<destination>&build_dir;</destination>
  @@ -22,12 +21,6 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&coreutils-posixver-patch;</param>
  -		</patch>
  -
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
   			<param>-i ../&coreutils-uname-patch;</param>
   		</patch>
   
  @@ -38,15 +31,16 @@
   		</patch>
   
   		<configure>
  +			<prefix>DEFAULT_POSIX2_VERSION=199209</prefix>
   			<param>--prefix=/usr</param>
   		</configure>
   
   		<make />
  -
  +<!--
   		<make>
   			<param>install-root</param>
   		</make>
  -<!--
  +
   		<textdump mode="append">
   			<file>/etc/group</file>
   			<content>
  @@ -136,7 +130,6 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&coreutils-directory;</remove>
  -		<remove>&build_dir;/&coreutils-posixver-patch;</remove>
   		<remove>&build_dir;/&coreutils-uname-patch;</remove>
   		<remove>&build_dir;/&coreutils-hostname-patch;</remove>
   	</stage>
  
  
  
  1.3.2.1   +3 -2      ALFS/profiles/LFS/chapter06/creatingdirs.xml
  
  Index: creatingdirs.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/creatingdirs.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- creatingdirs.xml	20 Dec 2003 20:27:02 -0000	1.3
  +++ creatingdirs.xml	3 May 2004 23:02:22 -0000	1.3.2.1
  @@ -9,10 +9,13 @@
   		<name>etc/opt</name>
   		<name>home</name>
   		<name>lib</name>
  +		<name>media/cdrom</name>
  +		<name>media/floppy</name>
   		<name>mnt</name>
   		<name>proc</name>
   		<name>root</name>
   		<name>sbin</name>
  +		<name>srv</name>
   		<name>tmp</name>
   		<name>usr/local</name>
   		<name>var</name>
  @@ -23,7 +26,6 @@
   		<option>parents</option>
   
   		<name>bin</name>
  -		<name>etc</name>
   		<name>include</name>
   		<name>lib</name>
   		<name>sbin</name>
  @@ -66,7 +68,6 @@
   
   	<mkdir base="/usr/local">
   		<option>parents</option>
  -
   		<name>bin</name>
   		<name>etc</name>
   		<name>include</name>
  
  
  
  1.3.2.1   +1 -0      ALFS/profiles/LFS/chapter06/findutils.xml
  
  Index: findutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/findutils.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- findutils.xml	16 Dec 2003 01:26:49 -0000	1.3
  +++ findutils.xml	3 May 2004 23:02:22 -0000	1.3.2.1
  @@ -15,6 +15,7 @@
   		<configure>
   			<param>--prefix=/usr</param>
   			<param>--libexecdir=/usr/lib/locate</param>
  +			<param>--localstatedir=/var/lib/misc</param>
   		</configure>
   
   		<make />
  
  
  
  1.6.2.1   +1 -0      ALFS/profiles/LFS/chapter06/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/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 23:02:22 -0000	1.6.2.1
  @@ -55,6 +55,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.3.2.1   +0 -6      ALFS/profiles/LFS/chapter06/grub.xml
  
  Index: grub.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/grub.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- grub.xml	20 Dec 2003 22:40:02 -0000	1.3
  +++ grub.xml	3 May 2004 23:02:22 -0000	1.3.2.1
  @@ -16,12 +16,6 @@
   			<base>&build_dir;/&grub-directory;</base>
   		</stageinfo>
   
  -		<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>
   		</configure>
  
  
  
  1.3.2.1   +1 -0      ALFS/profiles/LFS/chapter06/inetutils.xml
  
  Index: inetutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/inetutils.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- inetutils.xml	20 Dec 2003 21:59:48 -0000	1.3
  +++ inetutils.xml	3 May 2004 23:02:22 -0000	1.3.2.1
  @@ -48,5 +48,6 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&inetutils-directory;</remove>
  +		<remove>&build_dir;/&inetutils-no-man-pages-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.2.4.1   +5 -48     ALFS/profiles/LFS/chapter06/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/kernel.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- kernel.xml	9 Dec 2003 17:21:55 -0000	1.2
  +++ kernel.xml	3 May 2004 23:02:22 -0000	1.2.4.1
  @@ -1,53 +1,10 @@
   <package name="linux-headers" version="&linux-version;">
  -	<stage name="Unpacking a package.">
  -		<unpack>
  -			<digest>&linux-md5;</digest>
  -			<archive>&packages_dir;/&linux-package;</archive>
  -			<destination>&linux-src-location;</destination>
  -		</unpack>
  -
  -		<ownership user="0" group="0">
  -			<option>recursive</option>
  -			<name>&linux-src-location;/&linux-directory;</name>
  -		</ownership>
  -	</stage>
  -
  -	<stage name="Installing a package.">
  -		<stageinfo>
  -			<base>&linux-src-location;/&linux-directory;</base>
  -		</stageinfo>
  -
  -		<make>
  -			<param>mrproper</param>
  -		</make>
  -		
  -		<make>
  -			<param>include/linux/version.h</param>
  -		</make>
  -		
  -		<make>
  -			<param>symlinks</param>
  -		</make>
  -		
  -		<mkdir>
  -			<option>parents</option>
  -			<name>/usr/include/asm</name>
  -		</mkdir>
  -
  +	<stage name="Installing kernel headers.">
   		<copy>
  -			<source>include/asm/*</source>
  -			<destination>/usr/include/asm</destination>
  -		</copy>
  -
  -		<copy>
  -			<option>recursive</option>
  -			<source>include/asm-generic</source>
  -			<destination>/usr/include</destination>
  -		</copy>
  -
  -		<copy>
  -			<option>recursive</option>
  -			<source>include/linux</source>
  +			<option>archive</option>
  +			<source>/tools/include/asm</source>
  +			<source>/tools/include/asm-generic</source>
  +			<source>/tools/include/linux</source>
   			<destination>/usr/include</destination>
   		</copy>
   		
  
  
  
  1.1.4.1   +8 -10     ALFS/profiles/LFS/chapter06/makedev.xml
  
  Index: makedev.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/makedev.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- makedev.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ makedev.xml	3 May 2004 23:02:22 -0000	1.1.4.1
  @@ -1,28 +1,26 @@
  -<package name="MAKEDEV" version="&MAKEDEV-version;">
  +<package name="make_devices" version="&make_devices-version;">
   	<stage name="Unpacking a package.">
   		<unpack>
  -			<digest>&MAKEDEV-md5;</digest>
  -			<archive>&packages_dir;/&MAKEDEV-package;</archive>
  +			<digest>&make_devices-md5;</digest>
  +			<archive>&packages_dir;/&make_devices-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
   	</stage>
   
   	<stage name="Installing a package.">
   		<copy base="&build_dir;">
  -			<source>&MAKEDEV-file;</source>
  -			<destination>/dev/MAKEDEV</destination>
  +			<source>&make_devices-file;</source>
  +			<destination>/dev/make_devices</destination>
   		</copy>
   
   		<permissions base="/dev" mode="754">
  -			<name>MAKEDEV</name>
  +			<name>/dev/make_devices</name>
   		</permissions>
   
  -		<execute base="/dev" command="./MAKEDEV">
  -			<param>-v generic-nopty</param>
  -		</execute>
  +		<execute base="/dev" command="./make_devices" />
   	</stage>
   
   	<stage name="Clean-up.">
  -		<remove>&build_dir;/&MAKEDEV-file;</remove>
  +		<remove>&build_dir;/&make_devices-file;</remove>
   	</stage>
   </package>
  
  
  
  1.5.2.1   +1 -12     ALFS/profiles/LFS/chapter06/ncurses.xml
  
  Index: ncurses.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/ncurses.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ncurses.xml	11 Jan 2004 02:13:27 -0000	1.5
  +++ ncurses.xml	3 May 2004 23:02:22 -0000	1.5.2.1
  @@ -6,10 +6,6 @@
   			<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 +13,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=/usr</param>
   			<param>--with-shared</param>
  @@ -36,7 +26,7 @@
   		</make>
   
   		<permissions mode="755">
  -			<name>/usr/lib/*.5.3</name>
  +			<name>/usr/lib/*.&ncurses-version;</name>
   		</permissions>
   
   		<permissions mode="644">
  @@ -63,6 +53,5 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&ncurses-directory;</remove>
  -		<remove>&build_dir;/&ncurses-etip-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.4.2.1   +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.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- perl.xml	20 Dec 2003 22:40:02 -0000	1.4
  +++ perl.xml	3 May 2004 23:02:22 -0000	1.4.2.1
  @@ -22,7 +22,7 @@
   <!--
   		<textdump>
   			<file>/etc/hosts</file>
  -			<content>=127.0.0.1 $(hostname) localhost</content>
  +			<content>=127.0.0.1 &hostname; localhost</content>
   		</textdump>
   
   		<make>
  
  
  
  1.1.4.1   +10 -3     ALFS/profiles/LFS/chapter06/proc.xml
  
  Index: proc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/proc.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- proc.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ proc.xml	3 May 2004 23:02:22 -0000	1.1.4.1
  @@ -1,13 +1,20 @@
  -<stage name="Mounting proc and devpts file systems">
  +<stage name="Creating directories and mounting file systems">
  +
  +	<mkdir base="&LFS;">
  +		<option>parents</option>
  +		<name>proc</name>
  +		<name>dev/pts</name>
  +	</mkdir>
  +
   	<execute command="mount">
   		<param>proc</param>
  -		<param>/proc</param>
  +		<param>&LFS;/proc</param>
   		<param>-t proc</param>
   	</execute>
   
   	<execute command="mount">
   		<param>devpts</param>
  -		<param>/dev/pts</param>
  +		<param>&LFS;/dev/pts</param>
   		<param>-t devpts</param>
   	</execute>
   </stage>
  
  
  
  1.8.2.1   +2 -2      ALFS/profiles/LFS/chapter06/shadow.xml
  
  Index: shadow.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/shadow.xml,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- shadow.xml	3 Feb 2004 06:00:10 -0000	1.8
  +++ shadow.xml	3 May 2004 23:02:22 -0000	1.8.2.1
  @@ -93,8 +93,8 @@
   	</stage>
   
   	<stage name="Configuring a package.">
  -		<execute command="/usr/sbin/pwconv" />
  -		<execute command="/usr/sbin/grpconv" />
  +		<execute command="pwconv" />
  +		<execute command="grpconv" />
   	</stage>
   
   	<execute command="echo">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      ALFS/profiles/LFS/chapter06/iana-etc.xml
  
  Index: iana-etc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/iana-etc.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      ALFS/profiles/LFS/chapter06/mktemp.xml
  
  Index: mktemp.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/mktemp.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.2.2.1   +0 -0      ALFS/profiles/LFS/chapter06/strip.xml
  
  Index: strip.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/strip.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  
  
  



More information about the alfs-log mailing list