r1967 - in profiles/LFS/trunk: . chapter05

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Jul 31 12:28:46 PDT 2005


Author: thomasp
Date: 2005-07-31 13:28:45 -0600 (Sun, 31 Jul 2005)
New Revision: 1967

Modified:
   profiles/LFS/trunk/LFS.xml
   profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
Log:
* Merge missing changes from 6.1 branch for optional packages section.


Modified: profiles/LFS/trunk/LFS.xml
===================================================================
--- profiles/LFS/trunk/LFS.xml	2005-07-31 19:25:18 UTC (rev 1966)
+++ profiles/LFS/trunk/LFS.xml	2005-07-31 19:28:45 UTC (rev 1967)
@@ -65,8 +65,6 @@
       <xi:include href="chapter05/texinfo.xml" />
       <xi:include href="chapter05/bash.xml" />
       <xi:include href="chapter05/m4.xml" />
-      <xi:include href="chapter05/bison.xml" />
-      <xi:include href="chapter05/flex.xml" />
       <xi:include href="chapter05/util-linux.xml" />
       <xi:include href="chapter05/perl.xml" />
       <xi:include href="chapter05/strip.xml" />
@@ -184,8 +182,14 @@
     <xi:include href="chapter08/kernel.xml" />
     <xi:include href="chapter08/grub.xml" />
   </stage>
-  <stage name="Chapter 9 - Optional Packages">
+  <stage name="Optional Packages Prep">
     <stageinfo>
+      <root>/</root>
+    </stageinfo>
+    <xi:include href="chapter09/optional-prep.xml" />
+  </stage>
+  <stage name="Optional Packages">
+    <stageinfo>
       <root>&LFS;</root>
       <environment>
         <variable name="HOME">/root</variable>
@@ -196,11 +200,10 @@
         <variable name="CXXFLAGS">&gcc_optimizations;</variable>
       </environment>
     </stageinfo>
-    <xi:include href="chapter09/optional-prep.xml" />
     <xi:include href="chapter09/libxml2.xml" />
     <xi:include href="chapter09/nALFS.xml" />
   </stage>
-  <stage name="Finishing up (inside chroot)">
+  <stage name="Chapter 9 - The End">
     <stageinfo>
       <root>&LFS;</root>
     </stageinfo>
@@ -210,7 +213,7 @@
       <content>=&LFS-version;</content>
     </textdump>
   </stage>
-  <stage name="Finishing Up (outside chroot)">
+  <stage name="Finishing Up">
     <remove>/tools</remove>
     <execute command="pkill udevd" />
     <execute command="umount">

Modified: profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-07-31 19:25:18 UTC (rev 1966)
+++ profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-07-31 19:28:45 UTC (rev 1967)
@@ -132,7 +132,6 @@
         <source>&vim-lang-package;</source>
         <source>&vim-security-patch;</source>
         <source>&zlib-package;</source>
-	<source>&zlib-security-fix-patch;</source>
         <destination>&LFS;&packages_dir;</destination>
       </copy>
     </stage>




More information about the alfs-log mailing list