aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2006-12-01 18:57:06 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2006-12-01 18:57:06 +0000
commit1e5c044d67313265e701cbcaab878d96609b83ac (patch)
treef403b4e63e2cc94712cccb919996513cc3d0f3be
parent948bdb9f27a3d232ff0fcf345b12a9289c1a1f49 (diff)
Fix ICA breakage in E2fsprogs
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7875 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml13
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/e2fsprogs.xml5
-rw-r--r--general.ent4
4 files changed, 21 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index cf26bdb57..081aa58ba 100644
--- a/chapter01/changelog.xml
+++ b/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>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 8d759a775..8cdfec221 100644
--- a/chapter06/chapter06.xml
+++ b/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"/>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index ed8beb67e..960a32bb6 100644
--- a/chapter06/e2fsprogs.xml
+++ b/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>
diff --git a/general.ent b/general.ent
index ef92d4bf1..c4e0a8657 100644
--- a/general.ent
+++ b/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}]" -->