cvs commit: ALFS/profiles/LFS/chapter06 adjustingtoolchain.xml configure.xml patch.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Jan 13 18:29:50 PST 2004


thomasp     04/01/13 19:29:50

  Modified:    profiles/LFS Tag: LFS-5_0-branch README runit system.ent
               profiles/LFS/chapter05 Tag: LFS-5_0-branch expect.xml
                        glibc.xml lockingglibc.xml tcl.xml
               profiles/LFS/chapter06 Tag: LFS-5_0-branch
                        adjustingtoolchain.xml configure.xml patch.xml
  Log:
  fixed some things that were fixed on HEAD and also should have been put here on the 5.x branch as well, moved default keymap stuff to the config_sample directory, so it becomes the users choice as to wether to make the defkeymap.map.gz symlink and/or compile the keymap into the kernel
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +4 -1      ALFS/profiles/LFS/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/README,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- README	9 Dec 2003 16:56:32 -0000	1.2
  +++ README	14 Jan 2004 02:29:50 -0000	1.2.2.1
  @@ -19,6 +19,7 @@
     - the file kernel.xml contains the profile for building the kernel
     - the file grub.xml contains the commands for configuring grub - 
         these are commented out by default
  +  - the file keymap.xml is used to set up the default keymap
   
   - create a symbolic link named "config" to the configuration
     you want to use
  @@ -29,4 +30,6 @@
   	needs to be changed to read
   	<!ENTITY % package_entities SYSTEM "package-5.0tb.ent">
   
  -- execute ./runit as root
  +- execute sh ./runit as root. Please note that if you have installed nALFS
  +  into a non-standard location (/usr/local/bin) then you may need to edit
  +  runit to point to your local copy.
  
  
  
  1.1.2.1   +1 -1      ALFS/profiles/LFS/runit
  
  Index: runit
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/runit,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- runit	6 Dec 2003 03:24:25 -0000	1.1
  +++ runit	14 Jan 2004 02:29:50 -0000	1.1.2.1
  @@ -6,7 +6,7 @@
   fi
   
   if [ ! -e config ]; then
  -  echo Attention: You must create a config directory (or link).
  +  echo "Attention: You must create a config directory (or link)."
   fi
   
   umask 022
  
  
  
  1.1.2.1   +1 -0      ALFS/profiles/LFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/system.ent,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- system.ent	6 Dec 2003 03:24:25 -0000	1.1
  +++ system.ent	14 Jan 2004 02:29:50 -0000	1.1.2.1
  @@ -62,6 +62,7 @@
   <!ENTITY c6-inetutils SYSTEM          "chapter06/inetutils.xml">
   <!ENTITY c6-kbd SYSTEM                "chapter06/kbd.xml">
   <!ENTITY c6-kernel SYSTEM             "chapter06/kernel.xml">
  +<!ENTITY c6-keymap SYSTEM	      "config/keymap.xml">
   <!ENTITY c6-less SYSTEM               "chapter06/less.xml">
   <!ENTITY c6-lfs-utils SYSTEM          "chapter06/lfs-utils.xml">
   <!ENTITY c6-libtool SYSTEM            "chapter06/libtool.xml">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +1 -0      ALFS/profiles/LFS/chapter05/expect.xml
  
  Index: expect.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/expect.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- expect.xml	9 Dec 2003 16:49:49 -0000	1.2
  +++ expect.xml	14 Jan 2004 02:29:50 -0000	1.2.2.1
  @@ -38,6 +38,7 @@
   -->
   
   		<make>
  +			<param>SCRIPTS=""</param>
   			<param>install</param>
   		</make>
   	</stage>
  
  
  
  1.2.2.1   +3 -1      ALFS/profiles/LFS/chapter05/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/glibc.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- glibc.xml	9 Dec 2003 16:49:49 -0000	1.2
  +++ glibc.xml	14 Jan 2004 02:29:50 -0000	1.2.2.1
  @@ -36,7 +36,9 @@
   			<name>/tools/etc</name>
   		</mkdir>
   
  -		<execute command="touch /tools/etc/ld.so.conf" />
  +		<execute command="touch">
  +			<param>/tools/etc/ld.so.conf</param>
  +		</execute>
   
   		<patch base="&build_dir;/&glibc-directory;">
   			<param>-N</param>
  
  
  
  1.1.2.1   +1 -1      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.2.1
  diff -u -r1.1 -r1.1.2.1
  --- lockingglibc.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ lockingglibc.xml	14 Jan 2004 02:29:50 -0000	1.1.2.1
  @@ -14,7 +14,7 @@
   	<remove>&build_dir;/binutils-build</remove>
   
   	<search_replace>
  -		<file>/tools/lib/gcc-lib/&gcc_target;/&gcc-version;/specs</file>
  +		<file>/tools/lib/gcc-lib/*/&gcc-version;/specs</file>
   		<find> /lib/ld-linux.so.2</find>
   		<replace> /tools/lib/ld-linux.so.2</replace>
   	</search_replace>
  
  
  
  1.3.2.1   +4 -1      ALFS/profiles/LFS/chapter05/tcl.xml
  
  Index: tcl.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/tcl.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- tcl.xml	9 Dec 2003 17:01:41 -0000	1.3
  +++ tcl.xml	14 Jan 2004 02:29:50 -0000	1.3.2.1
  @@ -19,7 +19,10 @@
   		<make />
   
   <!--
  -		<execute command="TZ=UTC make test" />
  +		<make>
  +			<prefix>TZ=UTC</prefix>
  +			<param>test</param>
  +		</make>
   -->
   
   		<make>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -1      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.2.1
  diff -u -r1.1 -r1.1.2.1
  --- adjustingtoolchain.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ adjustingtoolchain.xml	14 Jan 2004 02:29:50 -0000	1.1.2.1
  @@ -16,7 +16,7 @@
   
   	<stage name="Amending GCC specs file.">
   		<search_replace>
  -			<file>/tools/lib/gcc-lib/&gcc_target;/&gcc-version;/specs</file>
  +			<file>/tools/lib/gcc-lib/*/&gcc-version;/specs</file>
   			<find> /tools/lib/ld-linux.so.2</find>
   			<replace> /lib/ld-linux.so.2</replace>
   		</search_replace>
  
  
  
  1.2.2.1   +1 -10     ALFS/profiles/LFS/chapter06/configure.xml
  
  Index: configure.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/configure.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- configure.xml	9 Dec 2003 17:21:55 -0000	1.2
  +++ configure.xml	14 Jan 2004 02:29:50 -0000	1.2.2.1
  @@ -1,15 +1,6 @@
   <stage name="Configuring system components">
  -	<link>
  -		<option>force</option>
  -		<target>&keymap;</target>
  -		<name>/usr/share/kbd/keymaps/defkeymap.map.gz</name>
  -	</link>
   
  -	<execute command="loadkeys">
  -		<param>-m</param>
  -		<param>/usr/share/kbd/keymaps/defkeymap.map.gz</param>
  -		<param>> &linux-src-location;/&linux-directory;/drivers/char/defkeymap.c</param>
  -	</execute>
  +&c6-keymap;
   
   	<execute command="echo">
   		<param>root:&password;</param>
  
  
  
  1.3.2.1   +0 -6      ALFS/profiles/LFS/chapter06/patch.xml
  
  Index: patch.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/patch.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- patch.xml	9 Dec 2003 17:21:55 -0000	1.3
  +++ patch.xml	14 Jan 2004 02:29:50 -0000	1.3.2.1
  @@ -19,12 +19,6 @@
   
   		<make />
   
  -<!--
  -		<make>
  -			<param>check</param>
  -		</make>
  --->
  -
   		<make>
   			<param>install</param>
   		</make>
  
  
  



More information about the alfs-log mailing list