cvs commit: ALFS/profiles/LFS/config_tarball keymap.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon May 3 16:10:12 PDT 2004


thomasp     04/05/03 17:10:12

  Modified:    profiles/LFS Tag: LFS-5_1-branch LFS.xml README system.ent
  Removed:     profiles/LFS/chapter06 Tag: LFS-5_1-branch bootscripts.xml
                        lfs-utils.xml
               profiles/LFS/config_seperate Tag: LFS-5_1-branch keymap.xml
               profiles/LFS/config_tarball Tag: LFS-5_1-branch keymap.xml
  Log:
  backport changes from HEAD to 5.1 branch
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +23 -33    ALFS/profiles/LFS/LFS.xml
  
  Index: LFS.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/LFS.xml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- LFS.xml	3 Feb 2004 06:00:10 -0000	1.4
  +++ LFS.xml	3 May 2004 23:10:11 -0000	1.4.2.1
  @@ -77,28 +77,32 @@
   		&c5-tar;
   		&c5-texinfo;
   		&c5-bash;
  -		&c5-util-linux;
   		&c5-perl;
  +		&c5-util-linux;
  +		&c5-strip;
   	</stage>
   </stage>
   
   <stage name="Chapter 6 - Installing basic system software">
  +	<stage name="Creating directories and mounting the proc and devpts file systems">
  +		&c6-proc;
  +	</stage>
  +
   	<stage name="Chroot with /tools">
   		<stageinfo>
   			<root>&LFS;</root>
   			<environment>
   				<variable name="HOME">/root</variable>
  -				<variable name="TERM">$TERM</variable>
  +				<variable name="TERM">&TERM;</variable>
   				<variable name="PS1">'\u:\w\$ '</variable>
   				<variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin</variable>
   				<variable name="CFLAGS">&gcc_optimizations;</variable>
   				<variable name="CXXFLAGS">&gcc_optimizations;</variable>
   			</environment>
   		</stageinfo>
  -	
  +
   		&c6-changingowner;
   		&c6-creatingdirs;
  -		&c6-proc;
   		&c6-createfiles;
   		&c6-pwdgroup;
   		&c6-makedev;
  @@ -110,7 +114,8 @@
   		&c6-gcc;
   		&c6-coreutils;
   		&c6-zlib;
  -		&c6-lfs-utils;
  +		&c6-mktemp;
  +		&c6-iana-etc;		
   		&c6-findutils;
   		&c6-gawk;
   		&c6-ncurses;
  @@ -152,22 +157,7 @@
   		&c6-tar;
   		&c6-util-linux;
   		&c6-gcc-2953;
  -	</stage>
  -
  -	<stage name="Revised chroot (no /tools).">
  -		<stageinfo>
  -			<root>&LFS;</root>
  -			<environment>
  -				<variable name="HOME">/root</variable>
  -				<variable name="TERM">$TERM</variable>
  -				<variable name="PS1">'\u:\w\$ '</variable>
  -				<variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin</variable>
  -				<variable name="CFLAGS">&gcc_optimizations;</variable>
  -				<variable name="CXXFLAGS">&gcc_optimizations;</variable>
  -			</environment>
  -		</stageinfo>
  -		
  -		&c6-bootscripts;
  +		&c6-strip;
   	</stage>
   </stage>
   
  @@ -176,7 +166,7 @@
   		<root>&LFS;</root>
   		<environment>
   			<variable name="HOME">/root</variable>
  -			<variable name="TERM">$TERM</variable>
  +			<variable name="TERM">&TERM;</variable>
   			<variable name="PS1">'\u:\w\$ '</variable>
   			<variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin</variable>
   			<variable name="CFLAGS">&gcc_optimizations;</variable>
  @@ -184,6 +174,7 @@
   		</environment>
   	</stageinfo>
   
  +	&c7-bootscripts;
   	&c7-setclock;
   	&c7-hostname;
   	&c7-hosts;
  @@ -195,7 +186,7 @@
   		<root>&LFS;</root>
   		<environment>
   			<variable name="HOME">/root</variable>
  -			<variable name="TERM">$TERM</variable>
  +			<variable name="TERM">&TERM;</variable>
   			<variable name="PS1">'\u:\w\$ '</variable>
   			<variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin</variable>
   			<variable name="CFLAGS">&gcc_optimizations;</variable>
  @@ -213,7 +204,7 @@
                   <root>&LFS;</root>
                   <environment>
                           <variable name="HOME">/root</variable>
  -                        <variable name="TERM">$TERM</variable>
  +                        <variable name="TERM">&TERM;</variable>
                           <variable name="PS1">'\u:\w\$ '</variable>
                           <variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin</variable>
                           <variable name="CFLAGS">&gcc_optimizations;</variable>
  @@ -221,14 +212,6 @@
                   </environment>
           </stageinfo>
   
  -	<stage name="Stripping debug symbols">
  -		<execute command="/tools/bin/find">
  -			<param>/{,usr/,usr/local/}{bin,sbin,lib}</param>
  -			<param>-type f</param>
  -			<param>-exec /tools/bin/strip --strip-debug '{}' ';'</param>	
  -		</execute>
  -	</stage>
  -
   	<remove>/tools</remove>
   
   	<textdump>
  @@ -237,6 +220,13 @@
   	</textdump>
   </stage>
   
  -<remove>/tools</remove>
  +<stage name="Finishing Up">
  +	<remove>/tools</remove>
  +
  +	<execute command="umount">
  +		<param>&LFS;/proc</param>
  +		<param>&LFS;/dev/pts</param>
  +	</execute>
  +</stage>
   
   </alfs>
  
  
  
  1.8.2.2   +7 -2      ALFS/profiles/LFS/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/README,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- README	3 Feb 2004 06:17:13 -0000	1.8.2.1
  +++ README	3 May 2004 23:10:11 -0000	1.8.2.2
  @@ -1,5 +1,5 @@
   ==============================================
  -        LFS-5.1-pre1 PROFILE
  +        LFS-5.1-pre2 PROFILE
   ==============================================
   
   This profile must be used with nALFS 1.1.8 or later.
  @@ -25,12 +25,17 @@
     
   2) customize the files in the new configuration directory
      - the file general.ent contains a bunch of entity declarations
  +     (Note: this file contains an entity called TERM that should be
  +            set to the same value as the TERM environment variable on
  +            your build system. It defaults to "linux", the most common
  +            value for a GNU/Linux system.)
      - the file fstab.xml contains the command to generate the fstab file
      - the file kernel.xml contains the profile for building the kernel
      - the file grub.xml contains the commands for configuring the grub 
        bootloader although the steps to do this are commented out by 
        default
  -   - the file keymap.xml is used to set up the default keymap
  +   - the files keymap-ch6.xml and keymap-ch8.xml are used to set up
  +     the default keymap
   
   3) execute sh ./runit as root. Please note that if you have installed 
      nALFS into a location other than /usr/local/bin you will need to edit
  
  
  
  1.2.2.1   +14 -10    ALFS/profiles/LFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/system.ent,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- system.ent	14 Jan 2004 02:21:40 -0000	1.2
  +++ system.ent	3 May 2004 23:10:11 -0000	1.2.2.1
  @@ -25,6 +25,7 @@
   <!ENTITY c5-perl               SYSTEM "chapter05/perl.xml">
   <!ENTITY c5-sed                SYSTEM "chapter05/sed.xml">
   <!ENTITY c5-settingenvironment SYSTEM "chapter05/settingenvironment.xml">
  +<!ENTITY c5-strip 	       SYSTEM "chapter05/strip.xml">
   <!ENTITY c5-tar                SYSTEM "chapter05/tar.xml">
   <!ENTITY c5-tcl                SYSTEM "chapter05/tcl.xml">
   <!ENTITY c5-texinfo            SYSTEM "chapter05/texinfo.xml">
  @@ -37,7 +38,6 @@
   <!ENTITY c6-bash SYSTEM               "chapter06/bash.xml">
   <!ENTITY c6-binutils SYSTEM           "chapter06/binutils.xml">
   <!ENTITY c6-bison SYSTEM              "chapter06/bison.xml">
  -<!ENTITY c6-bootscripts SYSTEM        "chapter06/bootscripts.xml">
   <!ENTITY c6-bzip2 SYSTEM              "chapter06/bzip2.xml">
   <!ENTITY c6-changingowner SYSTEM      "chapter06/changingowner.xml">
   <!ENTITY c6-configure SYSTEM          "chapter06/configure.xml">
  @@ -59,18 +59,19 @@
   <!ENTITY c6-groff SYSTEM              "chapter06/groff.xml">
   <!ENTITY c6-grub SYSTEM               "chapter06/grub.xml">
   <!ENTITY c6-gzip SYSTEM               "chapter06/gzip.xml">
  +<!ENTITY c6-iana-etc SYSTEM           "chapter06/iana-etc.xml">
   <!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-keymap SYSTEM	      "config/keymap-ch6.xml">
   <!ENTITY c6-less SYSTEM               "chapter06/less.xml">
  -<!ENTITY c6-lfs-utils SYSTEM          "chapter06/lfs-utils.xml">
   <!ENTITY c6-libtool SYSTEM            "chapter06/libtool.xml">
   <!ENTITY c6-m4 SYSTEM                 "chapter06/m4.xml">
   <!ENTITY c6-makedev SYSTEM            "chapter06/makedev.xml">
   <!ENTITY c6-make SYSTEM               "chapter06/make.xml">
   <!ENTITY c6-man-pages SYSTEM          "chapter06/man-pages.xml">
   <!ENTITY c6-man SYSTEM                "chapter06/man.xml">
  +<!ENTITY c6-mktemp SYSTEM             "chapter06/mktemp.xml">
   <!ENTITY c6-modutils SYSTEM           "chapter06/modutils.xml">
   <!ENTITY c6-ncurses SYSTEM            "chapter06/ncurses.xml">
   <!ENTITY c6-net-tools SYSTEM          "chapter06/net-tools.xml">
  @@ -83,6 +84,7 @@
   <!ENTITY c6-pwdgroup SYSTEM           "chapter06/pwdgroup.xml">
   <!ENTITY c6-sed SYSTEM                "chapter06/sed.xml">
   <!ENTITY c6-shadow SYSTEM             "chapter06/shadow.xml">
  +<!ENTITY c6-strip SYSTEM	      "chapter06/strip.xml">
   <!ENTITY c6-sysklogd SYSTEM           "chapter06/sysklogd.xml">
   <!ENTITY c6-sysvinit SYSTEM           "chapter06/sysvinit.xml">
   <!ENTITY c6-tar SYSTEM                "chapter06/tar.xml">
  @@ -92,12 +94,14 @@
   <!ENTITY c6-zlib SYSTEM               "chapter06/zlib.xml">
   
   <!-- Chapter 7 -->
  -<!ENTITY c7-setclock SYSTEM "chapter07/setclock.xml">
  -<!ENTITY c7-hostname SYSTEM "chapter07/hostname.xml">
  -<!ENTITY c7-hosts SYSTEM "chapter07/hosts.xml">
  -<!ENTITY c7-network SYSTEM "chapter07/network.xml">
  +<!ENTITY c7-bootscripts SYSTEM        "chapter07/bootscripts.xml">
  +<!ENTITY c7-setclock SYSTEM 	      "chapter07/setclock.xml">
  +<!ENTITY c7-hostname SYSTEM           "chapter07/hostname.xml">
  +<!ENTITY c7-hosts SYSTEM              "chapter07/hosts.xml">
  +<!ENTITY c7-network SYSTEM            "chapter07/network.xml">
   
   <!-- Chapter 8 -->
  -<!ENTITY c8-fstab SYSTEM "config/fstab.xml">
  -<!ENTITY c8-kernel SYSTEM "config/kernel.xml">
  -<!ENTITY c8-grub SYSTEM "config/grub.xml">
  +<!ENTITY c8-fstab SYSTEM              "config/fstab.xml">
  +<!ENTITY c8-kernel SYSTEM             "config/kernel.xml">
  +<!ENTITY c8-grub SYSTEM               "config/grub.xml">
  +<!ENTITY c8-keymap SYSTEM	      "config/keymap-ch8.xml">
  
  
  



More information about the alfs-log mailing list