Author: manuel
Date: 2005-04-11 11:34:12 -0600 (Mon, 11 Apr 2005)
New Revision: 4891
Modified:
branches/6.1/BOOK/chapter01/changelog.xml
branches/6.1/BOOK/chapter03/patches.xml
branches/6.1/BOOK/chapter06/iproute2.xml
branches/6.1/BOOK/general.ent
Log:
Ported r4885 and r4888 from trunk: Replaced IPRuote2 patch by a sed command
Modified: branches/6.1/BOOK/chapter01/changelog.xml
===================================================================
--- branches/6.1/BOOK/chapter01/changelog.xml 2005-04-11 17:22:52 UTC (rev
4890)
+++ branches/6.1/BOOK/chapter01/changelog.xml 2005-04-11 17:34:12 UTC (rev
4891)
@@ -82,7 +82,8 @@
</itemizedlist>
</listitem>
-<listitem><para>April 11, 2005 [manuel]: Mention bzip2's
testsuite.</para></listitem>
+<listitem><para>April 11, 2005 [manuel]: Mention bzip2's testsuite.
+Replaced IPRuote2 patch by a sed command.</para></listitem>
<listitem><para>April 6, 2005 [matt]: Move e2fsprogs sed command to
before entering the build directory (Steffen R. Knollmann).</para></listitem>
Modified: branches/6.1/BOOK/chapter03/patches.xml
===================================================================
--- branches/6.1/BOOK/chapter03/patches.xml 2005-04-11 17:22:52 UTC (rev
4890)
+++ branches/6.1/BOOK/chapter03/patches.xml 2005-04-11 17:34:12 UTC (rev
4891)
@@ -93,13 +93,6 @@
</varlistentry>
<varlistentry>
-<term>IPRoute2 Disable DB Patch - 1 KB:</term>
-<listitem>
-<para><ulink
url="&patches-root;iproute2-&iproute2-patch-version;-remove_db-1.patch"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
<term>Mktemp Tempfile Patch - 3 KB:</term>
<listitem>
<para><ulink
url="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
Modified: branches/6.1/BOOK/chapter06/iproute2.xml
===================================================================
--- branches/6.1/BOOK/chapter06/iproute2.xml 2005-04-11 17:22:52 UTC (rev
4890)
+++ branches/6.1/BOOK/chapter06/iproute2.xml 2005-04-11 17:34:12 UTC (rev
4891)
@@ -34,13 +34,13 @@
<para>The <command>arpd</command> binary included in this package is
dependent on Berkeley DB. Because <command>arpd</command> is not a
very
common requirement on a base Linux system, remove the dependency on
- Berkeley DB by applying the patch using the command below. If
+ Berkeley DB by applying the <command>sed</command> command below.
If
the <command>arpd</command> binary is needed, instructions for
compiling Berkeley DB can be found in the BLFS Book at <ulink
url="&blfs-root;view/svn/content/databases.html#db"/>.
</para>
- <screen><userinput>patch -Np1 -i
../iproute2-&iproute2-patch-version;-remove_db-1.patch</userinput></screen>
+ <screen><userinput>sed -i '/^TARGETS/[EMAIL PROTECTED]@@g'
misc/Makefile</userinput></screen>
<para>Prepare IPRoute2 for compilation:</para>
<screen><userinput>./configure </userinput></screen>
Modified: branches/6.1/BOOK/general.ent
===================================================================
--- branches/6.1/BOOK/general.ent 2005-04-11 17:22:52 UTC (rev 4890)
+++ branches/6.1/BOOK/general.ent 2005-04-11 17:34:12 UTC (rev 4891)
@@ -46,7 +46,6 @@
<!ENTITY iana-etc-version "1.04">
<!ENTITY inetutils-version "1.4.2">
<!ENTITY iproute2-version "2.6.11-050330">
-<!ENTITY iproute2-patch-version "2.6.11_050330">
<!ENTITY kbd-version "1.12">
<!ENTITY less-version "382">
<!ENTITY lfs-bootscripts-version "3.2.0">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
