diff options
| author | Jim Gifford <jim@linuxfromscratch.org> | 2005-04-06 23:29:35 +0000 |
|---|---|---|
| committer | Jim Gifford <jim@linuxfromscratch.org> | 2005-04-06 23:29:35 +0000 |
| commit | 401da4c65edf45e3c43119d9e48516e3fb75d80f (patch) | |
| tree | 4e025f8f848a660644c32255e75ee5805854ef22 | |
| parent | 37c20632211b15d091b342be7d186e9e8713a4ce (diff) | |
Removed IPRoute2 patch, replaced with sed
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4885 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 3 | ||||
| -rw-r--r-- | chapter03/patches.xml | 7 | ||||
| -rw-r--r-- | chapter06/iproute2.xml | 4 | ||||
| -rw-r--r-- | general.ent | 1 |
4 files changed, 5 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0d5d47e9b..16fd983bf 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -73,6 +73,7 @@ first a summary, then a detailed log.</para> <listitem><para>Removed:</para> <itemizedlist> <listitem><para>bash-3.0-display_wrap-1.patch</para></listitem> +<listitem><para>iproute2-2.6.11-050330-remove_db-1.patch</para></listitem> <listitem><para>man-1.5o1-80cols-1.patch</para></listitem> <listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem> <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem> @@ -82,6 +83,8 @@ first a summary, then a detailed log.</para> </itemizedlist> </listitem> +<listitem><para>April 6, 2005 [jim]: Removed Iproute2 patch for a sed (Ryan Oliver).</para></listitem> + <listitem><para>April 6, 2005 [matt]: Move e2fsprogs sed command to before entering the build directory (Steffen R. Knollmann).</para></listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index ddd4ae3d3..a4f22142b 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -93,13 +93,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-&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> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index dc7e5f7fc..aa5c03e70 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 sed 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/s@arpd@@g' misc/Makefile</userinput></screen> <para>Prepare IPRoute2 for compilation:</para> <screen><userinput>./configure </userinput></screen> diff --git a/general.ent b/general.ent index b00951065..de1bdeee7 100644 --- a/general.ent +++ b/general.ent @@ -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"> |