Переглянути джерело

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
Manuel Canales Esparcia 20 роки тому
батько
коміт
218232badf
4 змінених файлів з 4 додано та 12 видалено
  1. 2 1
      chapter01/changelog.xml
  2. 0 7
      chapter03/patches.xml
  3. 2 2
      chapter06/iproute2.xml
  4. 0 2
      patches.ent

+ 2 - 1
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 

+ 0 - 7
chapter03/patches.xml

@@ -133,13 +133,6 @@ 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-remove_db-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 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>

+ 0 - 2
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">