cvs commit: LFS/BOOK/chapter06 net-tools.xml

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Mon Jun 7 12:42:59 PDT 2004


winkie      04/06/07 13:42:59

  Modified:    BOOK/chapter01 changelog.xml
               BOOK/chapter03 patches.xml
               BOOK/chapter06 net-tools.xml
  Log:
  
  
  Revision  Changes    Path
  1.792     +3 -1      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.791
  retrieving revision 1.792
  diff -u -r1.791 -r1.792
  --- changelog.xml	7 Jun 2004 19:16:20 -0000	1.791
  +++ changelog.xml	7 Jun 2004 19:42:58 -0000	1.792
  @@ -70,7 +70,6 @@
   <listitem><para>mktemp-1.5-add_tempfile-1.patch</para></listitem>
   <listitem><para>module-init-tools-3.0</para></listitem>
   <listitem><para>net-tools-1.60-gcc34-2.patch</para></listitem>
  -<listitem><para>net-tools-1.60-kernel_headers-1.patch</para></listitem>
   <listitem><para>readline-4.3</para></listitem>
   <listitem><para>readline-4.3-gnu_fixes-1.patch</para></listitem>
   <listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem>
  @@ -104,6 +103,9 @@
   </itemizedlist>
   </listitem>
   
  +<listitem><para>June 7, 2004 [winkie]: Dropped Net-tools patch for kernel
  +headers in favor of a simple sed.</para></listitem>
  +
   <listitem><para>June 7, 2004 [winkie]: Normalized <quote>sed</quote> usage
   throughout the book.</para></listitem>
   
  
  
  
  1.15      +0 -7      LFS/BOOK/chapter03/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/patches.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- patches.xml	7 Jun 2004 18:52:47 -0000	1.14
  +++ patches.xml	7 Jun 2004 19:42:59 -0000	1.15
  @@ -120,13 +120,6 @@
   </varlistentry>
   
   <varlistentry>
  -<term>Net-tools Kernel Headers Patch - 1 KB:</term>
  -<listitem>
  -<para><ulink url="&patches-root;net-tools-&net-tools-version;-kernel_headers-1.patch"/></para>
  -</listitem>
  -</varlistentry>
  -
  -<varlistentry>
   <term>Perl Libc Patch - 1 KB:</term>
   <listitem>
   <para><ulink url="&patches-root;perl-&perl-version;-libc-1.patch"/></para>
  
  
  
  1.8       +2 -3      LFS/BOOK/chapter06/net-tools.xml
  
  Index: net-tools.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/net-tools.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- net-tools.xml	7 Jun 2004 18:52:47 -0000	1.7
  +++ net-tools.xml	7 Jun 2004 19:42:59 -0000	1.8
  @@ -43,10 +43,9 @@
   
   <screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-gcc34-2.patch</userinput></screen>
   
  -<para>Net-tools has issues with the Linux 2.6 kernel series - fix these issues
  -by applying the following patch:</para>
  +<para>Fix an issue that arises when building against Linux 2.6:</para>
   
  -<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-kernel_headers-1.patch</userinput></screen>
  +<screen><userinput>sed -i 's at x25_address@struct &@' lib/x25_sr.c</userinput></screen>
   
   <para>Now prepare Net-tools for compilation (if you intend to accept the
   defaults, you can skip all the questions by running <userinput>yes "" |
  
  
  



More information about the lfs-book mailing list