r1733 - in profiles/LFS/trunk: . chapter05 config

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Wed Feb 9 07:43:53 PST 2005


Author: kpfleming
Date: 2005-02-09 08:43:52 -0700 (Wed, 09 Feb 2005)
New Revision: 1733

Added:
   profiles/LFS/trunk/skeleton/
Modified:
   profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
   profiles/LFS/trunk/config/general.ent
   profiles/LFS/trunk/runit
Log:
prepare to support skeleton config files



Modified: profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-02-09 15:33:04 UTC (rev 1732)
+++ profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-02-09 15:43:52 UTC (rev 1733)
@@ -3,9 +3,11 @@
 [
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
+<!ENTITY % profile_entities SYSTEM "../config/profile.ent">
 
 %general_entities;
 %package_entities;
+%profile_entities;
 ]>
 <alfs>
   <stage name="Creating the $LFS/tools Directory">
@@ -23,6 +25,7 @@
       <option>parents</option>
       <name>&LFS;&packages_dir;</name>
       <name>&LFS;&build_dir;</name>
+      <name>&LFS;&skeleton_dir;</name>
     </mkdir>
     <!--
       If you run a kernel that supports VFS bindings (2.4 or later),
@@ -136,5 +139,12 @@
         <destination>&LFS;&packages_dir;</destination>
       </copy>
     </stage>
+    <stage name="Copying skeleton configuration files">
+      <copy>
+        <option>recursive</option>
+        <source>&lfs-profile;/skeleton/*</source>
+	<destination>&LFS;&skeleton_dir;</destination>
+      </copy>
+    </stage>
   </stage>
 </alfs>

Modified: profiles/LFS/trunk/config/general.ent
===================================================================
--- profiles/LFS/trunk/config/general.ent	2005-02-09 15:33:04 UTC (rev 1732)
+++ profiles/LFS/trunk/config/general.ent	2005-02-09 15:43:52 UTC (rev 1733)
@@ -123,9 +123,9 @@
 <!-- LFS book version -->
 <!ENTITY LFS-version "SVN-unstable-4616">
 
-<!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
+<!-- THE FOLLOWING THREE ENTITY DECLARATIONS SHOULDN'T BE MODIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING
-      -->
+-->
 
 <!-- Directory (inside LFS) where all packages will be copied. -->
 <!ENTITY packages_dir "/tools/packages-&LFS-version;">
@@ -133,18 +133,22 @@
 <!-- Directory (inside LFS) where all packages will be compiled. -->
 <!ENTITY build_dir "/tools/build">
 
+<!-- Directory (inside LFS) where all skeleton config files will be copied. -->
+<!ENTITY skeleton_dir "/tools/skeleton-&LFS-version;">
+
 <!-- gcc optimizations flags (overridden in packages known
-    to behave badly with optimizations 
-    see http://www.linuxfromscratch.org/hints/downloads/files/optimization.txt for more info
-    IF YOU DON'T KNOW WHAT THIS IS FOR, DON'T CHANGE IT
-    -->
+     to behave badly with optimizations)
+     see http://www.linuxfromscratch.org/hints/downloads/files/optimization.txt
+     for more info
+     IF YOU DON'T KNOW WHAT THIS IS FOR, DON'T CHANGE IT
+-->
 <!ENTITY gcc_optimizations "">
 
-<!-- parallel build level (make flag -j). Default is unset. For faster build times,
-	you might try setting this flag to 2-3 times the number of processors in
-	your machine. So, for example, a single processor machine, you might set this
-	entity to "-j3"
-     -->
+<!-- parallel build level (make flag -j). Default is unset. For faster build
+     times, you might try setting this flag to 2-3 times the number of
+     processors in your machine. So, for example, a single processor machine,
+     you might set this entity to "-j3"
+-->
 <!ENTITY jlevel "">
 
 <!-- gcc target triplet (used for adjusting the toolchain) -->

Modified: profiles/LFS/trunk/runit
===================================================================
--- profiles/LFS/trunk/runit	2005-02-09 15:33:04 UTC (rev 1732)
+++ profiles/LFS/trunk/runit	2005-02-09 15:43:52 UTC (rev 1733)
@@ -9,5 +9,8 @@
   echo "Attention: You must create a config directory (or link)"
 fi
 
+CURRENTDIR=`pwd`
+echo "<!ENTITY lfs-profile '${CURRENTDIR}'>" > config/profile.ent
+
 umask 022
 /usr/local/bin/nALFS -l -L nalfs.log LFS.xml




More information about the alfs-log mailing list