r1662 - in profiles/LFS/branches/6.0: . chapter05 chapter06 config

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Dec 30 12:23:22 PST 2004


Author: thomasp
Date: 2004-12-30 13:23:20 -0700 (Thu, 30 Dec 2004)
New Revision: 1662

Modified:
   profiles/LFS/branches/6.0/LFS.xml
   profiles/LFS/branches/6.0/README
   profiles/LFS/branches/6.0/chapter05/addinguser.xml
   profiles/LFS/branches/6.0/chapter05/adjustingtoolchain.xml
   profiles/LFS/branches/6.0/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/6.0/chapter05/flex.xml
   profiles/LFS/branches/6.0/chapter05/strip.xml
   profiles/LFS/branches/6.0/chapter05/udev.xml
   profiles/LFS/branches/6.0/chapter06/basic-dev.xml
   profiles/LFS/branches/6.0/chapter06/strip.xml
   profiles/LFS/branches/6.0/config/general.ent
   profiles/LFS/branches/6.0/runit
Log:
applied clean-up patch from Daniel Baumann

Modified: profiles/LFS/branches/6.0/LFS.xml
===================================================================
--- profiles/LFS/branches/6.0/LFS.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/LFS.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -1,10 +1,10 @@
 <!--
 
-	LFS profile, version SVN
-	=================================
+	LFS profile, version 6.0
+	========================
 	by Dave Wheeler (davewheeler69 at hotmail.com)
 	updates by "Mark"
-        updates by Kevin P. Fleming (kpfleming at linuxfromscratch.org)
+	updates by Kevin P. Fleming (kpfleming at linuxfromscratch.org)
 	updates by Jamie Bennett (jamie at linuxfromscratch.org)
 	updates by Thomas Pegg (thomasp at linuxfromscratch.org)
 	Adapted from a profile by Vassili Dzuba (vassilidzuba at nerim.net)
@@ -113,7 +113,7 @@
 		<xi:include href="chapter06/coreutils.xml" />
 		<xi:include href="chapter06/zlib.xml" />
 		<xi:include href="chapter06/mktemp.xml" />
-		<xi:include href="chapter06/iana-etc.xml" />		
+		<xi:include href="chapter06/iana-etc.xml" />
 		<xi:include href="chapter06/findutils.xml" />
 		<xi:include href="chapter06/gawk.xml" />
 		<xi:include href="chapter06/ncurses.xml" />
@@ -200,17 +200,17 @@
 </stage>
 
 <stage name="Chapter 9 - The End">
-        <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>
+	<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>
 
 	<xi:include href="chapter09/libxml2.xml" />
 	<xi:include href="chapter09/nALFS.xml" />

Modified: profiles/LFS/branches/6.0/README
===================================================================
--- profiles/LFS/branches/6.0/README	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/README	2004-12-30 20:23:20 UTC (rev 1662)
@@ -1,5 +1,5 @@
 ==============================================
-        LFS-6.0 PROFILE
+	LFS-6.0 PROFILE
 ==============================================
 
 This profile must be used with nALFS 1.2.3 or later.
@@ -11,14 +11,14 @@
 To use the profile you should :-
 
 1) First it is recommended to make a backup copy of the config
-directory prior to making any modifications to the files within it.
+   directory prior to making any modifications to the files within it.
 
 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.)
+	    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 commands to generate the fstab file
    - the file kernel.xml contains the commands for building the kernel
    - the file grub.xml contains the commands for configuring the grub

Modified: profiles/LFS/branches/6.0/chapter05/addinguser.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/addinguser.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/chapter05/addinguser.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -9,7 +9,7 @@
 
 <stage name="Adding the LFS User">
 	<execute command="groupadd -f lfs" />
-	
+
 	<execute command="id -u &lfs-user; &> /dev/null || useradd -s /bin/bash -g lfs -m -k /dev/null &lfs-user;" />
 
 	<execute command="echo &lfs-user;:&lfs-password; | chpasswd" />

Modified: profiles/LFS/branches/6.0/chapter05/adjustingtoolchain.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/adjustingtoolchain.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/chapter05/adjustingtoolchain.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -35,7 +35,7 @@
 <!-- Test basic functions of toolchain with:
 	echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /tools';
 Output of last line s/b: [Requesting program interpreter: /tools/lib/ld-linux.so.2]
-If so:  
+If so:
 	rm dummy.c a.out
 Otherwise, STOP HERE & find & fix the problem
 -->

Modified: profiles/LFS/branches/6.0/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/creatingtoolsdir.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/chapter05/creatingtoolsdir.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -14,41 +14,41 @@
 		<option>parents</option>
 		<name>&LFS;/tools</name>
 	</mkdir>
-	
+
 	<link>
 		<option>force</option>
 		<target>&LFS;/tools</target>
 		<name>/</name>
 	</link>
-	
+
 	<!-- From this point forward isn't in the book, it's only here for nALFS to use -->
 	<mkdir base="&LFS;">
 		<option>parents</option>
 		<name>&LFS;&packages_dir;</name>
 		<name>&LFS;&build_dir;</name>
 	</mkdir>
-	
+
 	<!--
-	        If you run a kernel that supports VFS bindings (2.4 or later),
-	        you can uncomment this command instead of using the <copy>.
-	        Don't forget to also uncomment the unmounting command from
+		If you run a kernel that supports VFS bindings (2.4 or later),
+		you can uncomment this command instead of using the <copy>.
+		Don't forget to also uncomment the unmounting command from
 		the end of the profile.
-	
-	        Warning: if you use the mount option, and if the execution
-	        of your profile fails, be careful to unmount the package
-	        directory before you delete the content the target partition!
-	
-	        Note: a space has been inserted between the two dashes in the
+
+		Warning: if you use the mount option, and if the execution
+		of your profile fails, be careful to unmount the package
+		directory before you delete the content the target partition!
+
+		Note: a space has been inserted between the two dashes in the
 		bind parameter to avoid the double dash being deteted as the
 		end of the comment. You need to remove it if you use this
-                command.
-	
+		command.
+
 	<execute command="mount">
 		<param>- -bind</param>
 		<param>&orig_packages_dir;</param>
 		<param>&LFS;&packages_dir;</param>
 	</execute>
-	
+
 	-->
 
 	<stage name="Copying package and patch files">
@@ -145,4 +145,5 @@
 		</copy>
 	</stage>
 </stage>
+
 </alfs>

Modified: profiles/LFS/branches/6.0/chapter05/flex.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/flex.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/chapter05/flex.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -30,7 +30,7 @@
 		</patch>
 
 		<execute command="touch">
-		  <param>doc/flex.1</param>
+			<param>doc/flex.1</param>
 		</execute>
 
 		<configure>

Modified: profiles/LFS/branches/6.0/chapter05/strip.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/strip.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/chapter05/strip.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -2,7 +2,7 @@
 <!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" []>
 
 <alfs>
-<!--	
+<!--
  ************************ 
  * OPTIONAL BUT USEFULL *
  ************************
@@ -21,7 +21,7 @@
 	</execute>
 
 	<remove>/tools/{doc,info,man}</remove>
-
 </stage>
 -->
+
 </alfs>

Modified: profiles/LFS/branches/6.0/chapter05/udev.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter05/udev.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/chapter05/udev.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -56,7 +56,7 @@
         		<option>force</option>
         		<source>&udev-rules-file;</source>
         		<destination>/tools/etc/udev/rules.d/00-lfs.rules</destination>
-		</copy>				
+		</copy>
 	</stage>
 
 	<stage name="Cleanup">

Modified: profiles/LFS/branches/6.0/chapter06/basic-dev.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/basic-dev.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/chapter06/basic-dev.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -4,73 +4,73 @@
 <alfs>
 
 <stage name="Populating /dev">
-  <stage name="Creating Initial Device Nodes">
-    <execute command="mknod">
-	<param>-m 600</param>
-	<param>/dev/console</param>
-	<param>c 5 1</param>
-    </execute>
+	<stage name="Creating Initial Device Nodes">
+		<execute command="mknod">
+			<param>-m 600</param>
+			<param>/dev/console</param>
+			<param>c 5 1</param>
+		</execute>
 
-    <execute command="mknod">
-  	<param>-m 666</param>
-	<param>/dev/null</param>
-	<param>c 1 3</param>
-    </execute>
-  </stage>
+		<execute command="mknod">
+			<param>-m 666</param>
+			<param>/dev/null</param>
+			<param>c 1 3</param>
+		</execute>
+	</stage>
 
-  <stage name="Mounting ramfs and Populating /dev">
-    <execute command="mount">
-      <param>-n</param>
-      <param>-t ramfs</param>
-      <param>none</param>
-      <param>/dev</param>
-    </execute>
+	<stage name="Mounting ramfs and Populating /dev">
+		<execute command="mount">
+			<param>-n</param>
+			<param>-t ramfs</param>
+			<param>none</param>
+			<param>/dev</param>
+		</execute>
 
-    <execute command="/tools/sbin/udevstart" />
+		<execute command="/tools/sbin/udevstart" />
 
-    <link>
-      <target>/proc/self/fd</target>
-      <name>/dev/fd</name>
-    </link>
+		<link>
+			<target>/proc/self/fd</target>
+			<name>/dev/fd</name>
+		</link>
 
-    <link>
-      <target>/proc/self/fd/0</target>
-      <name>/dev/stdin</name>
-    </link>
+		<link>
+			<target>/proc/self/fd/0</target>
+			<name>/dev/stdin</name>
+		</link>
 
-    <link>
-      <target>/proc/self/fd/1</target>
-      <name>/dev/stdout</name>
-    </link>
+		<link>
+			<target>/proc/self/fd/1</target>
+			<name>/dev/stdout</name>
+		</link>
 
-    <link>
-      <target>/proc/self/fd/2</target>
-      <name>/dev/stderr</name>
-    </link>
+		<link>
+			<target>/proc/self/fd/2</target>
+			<name>/dev/stderr</name>
+		</link>
 
-    <link>
-      <target>/proc/kcore</target>
-      <name>/dev/core</name>
-    </link>
+		<link>
+			<target>/proc/kcore</target>
+			<name>/dev/core</name>
+		</link>
 
-    <mkdir>
-      <name>/dev/shm</name>
-      <name>/dev/pts</name>
-    </mkdir>
+		<mkdir>
+			<name>/dev/shm</name>
+			<name>/dev/pts</name>
+		</mkdir>
 
-    <execute command="mount">
-      <param>-t devpts</param>
-      <param>-o gid=4,mode=620</param>
-      <param>none</param>
-      <param>/dev/pts</param>
-    </execute>
+		<execute command="mount">
+			<param>-t devpts</param>
+			<param>-o gid=4,mode=620</param>
+			<param>none</param>
+			<param>/dev/pts</param>
+		</execute>
 
-    <execute command="mount">
-      <param>-t tmpfs</param>
-      <param>none</param>
-      <param>/dev/shm</param>
-    </execute>
-  </stage>
+		<execute command="mount">
+			<param>-t tmpfs</param>
+			<param>none</param>
+			<param>/dev/shm</param>
+		</execute>
+	</stage>
 </stage>
 
 </alfs>

Modified: profiles/LFS/branches/6.0/chapter06/strip.xml
===================================================================
--- profiles/LFS/branches/6.0/chapter06/strip.xml	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/chapter06/strip.xml	2004-12-30 20:23:20 UTC (rev 1662)
@@ -4,7 +4,6 @@
 <alfs>
 
 <!-- 
-	
  ************************ 
  * OPTIONAL BUT USEFULL *
  ************************
@@ -15,8 +14,9 @@
 	<execute command="/tools/bin/find">
 		<param>/{,usr/,usr/local/}{bin,lib,sbin}</param>
 		<param>-type f</param>
-		<param>-exec /tools/bin/strip - -strip-debug '{}' ';'</param>	
+		<param>-exec /tools/bin/strip - -strip-debug '{}' ';'</param>
 	</execute>
-</stage> -->
+</stage>
+-->
 
 </alfs>

Modified: profiles/LFS/branches/6.0/config/general.ent
===================================================================
--- profiles/LFS/branches/6.0/config/general.ent	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/config/general.ent	2004-12-30 20:23:20 UTC (rev 1662)
@@ -2,7 +2,7 @@
      This file contains various entities that must be customized 
      for the build to work on your machine.
 
-     For the build to be successfull, you should :
+     For the build to be successfull, you should:
      - run nALFS as root
      - check that your umask is 022
 
@@ -22,7 +22,7 @@
      are before running the script. The content of this directory
      will be copied in a subdirectory of &LFS; at the beginning of
      the build.
-     IMPORTANT : be carefull about the original packages dir; if you 
+     IMPORTANT: be carefull about the original packages dir; if you 
                  enter the wrong directory, nALFS will try to download
                  all the packages in it !!!
      -->

Modified: profiles/LFS/branches/6.0/runit
===================================================================
--- profiles/LFS/branches/6.0/runit	2004-12-17 21:22:06 UTC (rev 1661)
+++ profiles/LFS/branches/6.0/runit	2004-12-30 20:23:20 UTC (rev 1662)
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 if [ $(id -u) -ne 0 ]; then
-   echo "Attention: this profile should be run as root"
-   exit 3
+	echo "Attention: this profile should be run as root"
+	exit 3
 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




More information about the alfs-log mailing list