cvs commit: ALFS/profiles/LFS/config_tarball keymap-ch6.xml keymap-ch8.xml kernel.xml keymap.xml

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Thu Apr 15 19:19:45 PDT 2004


kpfleming    04/04/15 20:19:45

  Modified:    profiles/LFS README system.ent
               profiles/LFS/chapter06 kernel.xml
               profiles/LFS/config_seperate kernel.xml
               profiles/LFS/config_tarball kernel.xml
  Added:       profiles/LFS/config_seperate keymap-ch6.xml keymap-ch8.xml
               profiles/LFS/config_tarball keymap-ch6.xml keymap-ch8.xml
  Removed:     profiles/LFS/config_seperate keymap.xml
               profiles/LFS/config_tarball keymap.xml
  Log:
  break keymap handling into two parts (for chapters 6 and 8)
  move kernel source unpacking back into chapter 8
  
  Revision  Changes    Path
  1.9       +2 -1      ALFS/profiles/LFS/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/README,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- README	1 Feb 2004 19:54:52 -0000	1.8
  +++ README	16 Apr 2004 02:19:45 -0000	1.9
  @@ -30,7 +30,8 @@
      - 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.7       +2 -1      ALFS/profiles/LFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/system.ent,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- system.ent	2 Apr 2004 02:01:09 -0000	1.6
  +++ system.ent	16 Apr 2004 02:19:45 -0000	1.7
  @@ -63,7 +63,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-keymap SYSTEM	      "config/keymap-ch6.xml">
   <!ENTITY c6-less SYSTEM               "chapter06/less.xml">
   <!ENTITY c6-libtool SYSTEM            "chapter06/libtool.xml">
   <!ENTITY c6-m4 SYSTEM                 "chapter06/m4.xml">
  @@ -104,3 +104,4 @@
   <!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">
  
  
  
  1.6       +0 -15     ALFS/profiles/LFS/chapter06/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/kernel.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- kernel.xml	6 Apr 2004 15:26:27 -0000	1.5
  +++ kernel.xml	16 Apr 2004 02:19:45 -0000	1.6
  @@ -1,19 +1,4 @@
   <package name="linux-headers" version="&linux-version;">
  -	<!-- Unpacking of the kernel source was moved here from the
  -kernel install section, so compiling the keymap into the kernel can be
  -done. -->
  -	<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 kernel headers.">
   		<copy>
   			<option>archive</option>
  
  
  
  1.5       +15 -0     ALFS/profiles/LFS/config_seperate/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/config_seperate/kernel.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- kernel.xml	6 Apr 2004 15:26:27 -0000	1.4
  +++ kernel.xml	16 Apr 2004 02:19:45 -0000	1.5
  @@ -1,4 +1,17 @@
   <package name="linux" 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>
  @@ -12,6 +25,8 @@
   			<source>&kernel-config;</source>
   			<destination>.config</destination>
   		</copy>
  +
  +		&c8-keymap;
   
   		<make>
   			<param>oldconfig</param>
  
  
  
  1.1                  ALFS/profiles/LFS/config_seperate/keymap-ch6.xml
  
  Index: keymap-ch6.xml
  ===================================================================
  <!-- Uncomment the following section if you use a non-US keyboard
   and set the keymap entity in the general.ent also contained in this
   directory to the proper keymap file for your keyboard -->
  
  <!--
  	<link>
  		<option>force</option>
  		<target>&keymap;</target>
  		<name>/usr/share/kbd/keymaps/defkeymap.map.gz</name>
  	</link>
  -->
  
  
  
  1.1                  ALFS/profiles/LFS/config_seperate/keymap-ch8.xml
  
  Index: keymap-ch8.xml
  ===================================================================
  <!-- uncomment the following section if you wish to have your default keymap
  compiled into the kernel -->
  
  <!--
  	<execute command="loadkeys">
  		<param>-m</param>
  		<param>/usr/share/kbd/keymaps/defkeymap.map.gz</param>
  		<param> > drivers/char/defkeymap.c</param>
  	</execute>
  -->
  
  
  
  
  1.3       +15 -0     ALFS/profiles/LFS/config_tarball/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/config_tarball/kernel.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- kernel.xml	15 Jan 2004 18:55:37 -0000	1.2
  +++ kernel.xml	16 Apr 2004 02:19:45 -0000	1.3
  @@ -1,4 +1,17 @@
   <package name="linux" 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>
  @@ -12,6 +25,8 @@
   			<source>&kernel-config;</source>
   			<destination>.config</destination>
   		</copy>
  +
  +		&c8-keymap;
   
   		<make>
   			<param>oldconfig</param>
  
  
  
  1.1                  ALFS/profiles/LFS/config_tarball/keymap-ch6.xml
  
  Index: keymap-ch6.xml
  ===================================================================
  <!-- Uncomment the following section if you use a non-US keyboard
   and set the keymap entity in the general.ent also contained in this
   directory to the proper keymap file for your keyboard -->
  
  <!--
  	<link>
  		<option>force</option>
  		<target>&keymap;</target>
  		<name>/usr/share/kbd/keymaps/defkeymap.map.gz</name>
  	</link>
  -->
  
  
  
  1.1                  ALFS/profiles/LFS/config_tarball/keymap-ch8.xml
  
  Index: keymap-ch8.xml
  ===================================================================
  <!-- uncomment the following section if you wish to have your default keymap
  compiled into the kernel -->
  
  <!--
  	<execute command="loadkeys">
  		<param>-m</param>
  		<param>/usr/share/kbd/keymaps/defkeymap.map.gz</param>
  		<param> > drivers/char/defkeymap.c</param>
  	</execute>
  -->
  
  
  
  



More information about the alfs-log mailing list