cvs commit: ALFS/profiles/LFS/chapter06 kernel.xml proc.xml

jamie at linuxfromscratch.org jamie at linuxfromscratch.org
Tue Feb 10 12:26:51 PST 2004


jamie       04/02/10 13:26:51

  Modified:    profiles/LFS LFS.xml
               profiles/LFS/chapter05 kernel-headers.xml perl.xml
               profiles/LFS/chapter06 kernel.xml proc.xml
  Log:
  Moved the mounting of proc and devpts to before chrooting.
  util-Linux removed.
  arch script added to perl install.
  Simplified the final install of the kernel headers.
  
  Revision  Changes    Path
  1.5       +5 -3      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.5
  diff -u -r1.4 -r1.5
  --- LFS.xml	3 Feb 2004 06:00:10 -0000	1.4
  +++ LFS.xml	10 Feb 2004 20:26:51 -0000	1.5
  @@ -77,12 +77,15 @@
   		&c5-tar;
   		&c5-texinfo;
   		&c5-bash;
  -		&c5-util-linux;
   		&c5-perl;
   	</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>
  @@ -95,10 +98,9 @@
   				<variable name="CXXFLAGS">&gcc_optimizations;</variable>
   			</environment>
   		</stageinfo>
  -	
  +
   		&c6-changingowner;
   		&c6-creatingdirs;
  -		&c6-proc;
   		&c6-createfiles;
   		&c6-pwdgroup;
   		&c6-makedev;
  
  
  
  1.2       +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.2
  diff -u -r1.1 -r1.2
  --- kernel-headers.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ kernel-headers.xml	10 Feb 2004 20:26:51 -0000	1.2
  @@ -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.3       +6 -0      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.3
  diff -u -r1.2 -r1.3
  --- perl.xml	14 Dec 2003 23:31:01 -0000	1.2
  +++ perl.xml	10 Feb 2004 20:26:51 -0000	1.3
  @@ -23,6 +23,12 @@
   			<param>-i ../&perl-libc-1-patch;</param>
   		</patch>
   
  +		<execute command="echo "uname -m" > /tools/bin/arch" />
  +
  +		<permissions mode="755">
  +			<name>/tools/bin/arch</name>
  +		</permissions>
  +
   		<configure command="./configure.gnu">
   			<param>--prefix=/tools</param>
   			<param>-Dstatic_ext='IO Fcntl'</param>
  
  
  
  1.3       +4 -38     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.3
  diff -u -r1.2 -r1.3
  --- kernel.xml	9 Dec 2003 17:21:55 -0000	1.2
  +++ kernel.xml	10 Feb 2004 20:26:51 -0000	1.3
  @@ -1,53 +1,19 @@
   <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>
  +			<source>/tools/include/asm/*</source>
   			<destination>/usr/include/asm</destination>
   		</copy>
   
   		<copy>
   			<option>recursive</option>
  -			<source>include/asm-generic</source>
  +			<source>/tools/include/asm-generic</source>
   			<destination>/usr/include</destination>
   		</copy>
   
   		<copy>
   			<option>recursive</option>
  -			<source>include/linux</source>
  +			<source>/tools/include/linux</source>
   			<destination>/usr/include</destination>
   		</copy>
   		
  
  
  
  1.2       +8 -1      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.2
  diff -u -r1.1 -r1.2
  --- proc.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ proc.xml	10 Feb 2004 20:26:51 -0000	1.2
  @@ -1,4 +1,11 @@
  -<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>
  
  
  



More information about the alfs-log mailing list