r1065 - in trunk/BOOK: final-system introduction/common

ken at linuxfromscratch.org ken at linuxfromscratch.org
Fri Jan 13 04:33:35 PST 2006


Author: ken
Date: 2006-01-13 05:33:33 -0700 (Fri, 13 Jan 2006)
New Revision: 1065

Modified:
   trunk/BOOK/final-system/alpha-chapter.xml
   trunk/BOOK/final-system/mips-chapter.xml
   trunk/BOOK/final-system/mips64-64-chapter.xml
   trunk/BOOK/final-system/mips64-chapter.xml
   trunk/BOOK/final-system/ppc-chapter.xml
   trunk/BOOK/final-system/sparc-chapter.xml
   trunk/BOOK/final-system/sparc64-64-chapter.xml
   trunk/BOOK/final-system/sparc64-chapter.xml
   trunk/BOOK/final-system/sparcv8-chapter.xml
   trunk/BOOK/final-system/x86-chapter.xml
   trunk/BOOK/final-system/x86_64-64-chapter.xml
   trunk/BOOK/final-system/x86_64-chapter.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
Move grep ahead of libtool to avoid hardcoding EGREP as /tools/bin in libtool, per LFS

Modified: trunk/BOOK/final-system/alpha-chapter.xml
===================================================================
--- trunk/BOOK/final-system/alpha-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/alpha-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/mips-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/mips-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/mips64-64-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/mips64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/mips64-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -59,6 +59,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
@@ -70,7 +71,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/ppc-chapter.xml
===================================================================
--- trunk/BOOK/final-system/ppc-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/ppc-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/sparc-chapter.xml
===================================================================
--- trunk/BOOK/final-system/sparc-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/sparc-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/sparc64-64-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/sparc64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/sparc64-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -51,6 +51,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
@@ -59,7 +60,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/sparcv8-chapter.xml
===================================================================
--- trunk/BOOK/final-system/sparcv8-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/sparcv8-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/x86-chapter.xml
===================================================================
--- trunk/BOOK/final-system/x86-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/x86-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/x86_64-64-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -43,12 +43,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/final-system/x86_64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-chapter.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/final-system/x86_64-chapter.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -51,6 +51,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
@@ -59,7 +60,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-01-13 07:56:18 UTC (rev 1064)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-01-13 12:33:33 UTC (rev 1065)
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>January 13, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Moved grep ahead of libtool to avoid /tools being hardcoded
+	  into the libtool script for EGREP.</para>
+	</listitem>
+      </itemizedlist>
+    </listitem>
+	
+    <listitem>
       <para>January 12, 2006</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list