aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Canales Esparcia <manuel@linuxfromscratch.org>2005-10-23 10:41:08 +0000
committerManuel Canales Esparcia <manuel@linuxfromscratch.org>2005-10-23 10:41:08 +0000
commit218232badf8b7e8dfc355c0e35d26383ddc92c1a (patch)
tree717be86bf37c16336f38f290e21ee4e1e291e6b6
parent241bb14b23e31c010193eeb541df10a1bd901fd9 (diff)
Replaced a patch for IPRoute2 by a sed command.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter03/patches.xml7
-rw-r--r--chapter06/iproute2.xml4
-rw-r--r--patches.ent2
4 files changed, 4 insertions, 12 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a8b3b2054..e4f9f1bc8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,7 +44,8 @@ First a summary, then a detailed log.</para>
<listitem><para>October 23, 2005 [manuel]: Added Bash documentation
installation. Added notes about libiconv and Cracklib. Fixed the installation
-of Sed documentation.</para></listitem>
+of Sed documentation. Replaced a patch for IPRoute2 by a sed
+command.</para></listitem>
<listitem><para>October 19, 2005 [manuel]: Updated the acknowledgements to
current trunk version. Ported some redaction changes in preface and chapter01
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2cbc489d1..94fab5d04 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -134,13 +134,6 @@ needed to build an LFS system:</para>
</varlistentry>
<varlistentry>
-<term>IPRoute2 Disable DB Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&iproute2-remove_db-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
<term>Mktemp Tempfile Patch - 3 KB:</term>
<listitem>
<para><ulink url="&patches-root;&mktemp-tempfile-patch;"/></para>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 51a4b2528..c1312d10f 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -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/server/databases.html#db"/>.
</para>
- <screen><userinput>patch -Np1 -i ../&iproute2-remove_db-patch;</userinput></screen>
+ <screen><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
<para>Prepare IPRoute2 for compilation:</para>
<screen><userinput>./configure </userinput></screen>
diff --git a/patches.ent b/patches.ent
index 24c93d60e..0c8874280 100644
--- a/patches.ent
+++ b/patches.ent
@@ -28,8 +28,6 @@
<!ENTITY inetutils-kernel_headers-patch "inetutils-&inetutils-version;-kernel_headers-1.patch">
<!ENTITY inetutils-man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-1.patch">
-<!ENTITY iproute2-remove_db-patch "iproute2-&iproute2-patch-version;-remove_db-1.patch">
-
<!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-2.patch">
<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">