Fix ICA breakage in E2fsprogs

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7875 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter01/changelog.xml

@@ -36,6 +36,19 @@
     </listitem>
 -->
 
+    <listitem> 
+      <para>2006-11-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Fix an ICA breakage in E2fsprogs. Sed needs to be
+          built before E2fsprogs and a hardcoded reference to
+          <filename>/bin/rm</filename> needs to be changed to point to
+          <filename>/tools/bin/rm</filename> instead. Thanks to Greg Schafer for
+          the report and fix.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+ 
     <listitem>
       <para>2006-11-25</para>
       <itemizedlist>

chapter06/chapter06.xml

@@ -24,6 +24,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="db.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iana-etc.xml"/>
@@ -31,7 +32,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>

chapter06/e2fsprogs.xml

@@ -37,6 +37,11 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
+    <para>Fix a hardcoded path to <filename>/bin/rm</filename> in E2fsprogs'
+    testsuite:</para>
+
+    <screen><userinput>sed -i -e 's@/bin/rm@/tools&amp;@' lib/blkid/test_probe.in</userinput></screen>
+
     <para>It is recommended that E2fsprogs be built in a subdirectory of
     the source tree: </para>
 

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20061125">
-<!ENTITY releasedate "November 25, 2006">
+<!ENTITY version "SVN-20061201">
+<!ENTITY releasedate "December 1, 2006">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->