瀏覽代碼

Reverted r4891

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@4895 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Manuel Canales Esparcia 20 年之前
父節點
當前提交
f684d855d0
共有 4 個文件被更改,包括 11 次插入4 次删除
  1. 1 2
      chapter01/changelog.xml
  2. 7 0
      chapter03/patches.xml
  3. 2 2
      chapter06/iproute2.xml
  4. 1 0
      general.ent

+ 1 - 2
chapter01/changelog.xml

@@ -82,8 +82,7 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
-<listitem><para>April 11, 2005 [manuel]: Mention bzip2's testsuite.
-Replaced IPRuote2 patch by a sed command.</para></listitem>
+<listitem><para>April 11, 2005 [manuel]: Mention bzip2's testsuite.</para></listitem>
 
 <listitem><para>April 6, 2005 [matt]: Move e2fsprogs sed command to
 before entering the build directory (Steffen R. Knollmann).</para></listitem>

+ 7 - 0
chapter03/patches.xml

@@ -92,6 +92,13 @@ needed to build an LFS system:</para>
 </listitem>
 </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>

+ 2 - 2
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 <command>sed</command> command below.  If 
+          Berkeley DB by applying the patch using the 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>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
+    <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-patch-version;-remove_db-1.patch</userinput></screen>
 
     <para>Prepare IPRoute2 for compilation:</para>
     <screen><userinput>./configure </userinput></screen>

+ 1 - 0
general.ent

@@ -46,6 +46,7 @@
 <!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">