cvs commit: LFS/BOOK/chapter06 bash.xml coreutils.xml flex.xml gcc.xml inetutils.xml mktemp.xml net-tools.xml readline.xml sysklogd.xml util-linux.xml

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Mon Jun 7 11:52:47 PDT 2004


winkie      04/06/07 12:52:47

  Modified:    BOOK/chapter01 changelog.xml
               BOOK/chapter03 patches.xml
               BOOK/chapter05 bash.xml flex.xml gcc-pass2.xml
                        util-linux.xml
               BOOK/chapter06 bash.xml coreutils.xml flex.xml gcc.xml
                        inetutils.xml mktemp.xml net-tools.xml readline.xml
                        sysklogd.xml util-linux.xml
  Log:
  Updated patch names to the new naming scheme used by the patches project
  
  Revision  Changes    Path
  1.789     +14 -10    LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.788
  retrieving revision 1.789
  diff -u -r1.788 -r1.789
  --- changelog.xml	7 Jun 2004 14:32:37 -0000	1.788
  +++ changelog.xml	7 Jun 2004 18:52:46 -0000	1.789
  @@ -56,27 +56,28 @@
   
   <listitem><para>Added:</para>
   <itemizedlist>
  -<listitem><para>coreutils-5.2.1-dupes-1.patch</para></listitem>
  -<listitem><para>flex-2.5.31-debian-fixes-2.patch</para></listitem>
  +<listitem><para>coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch</para></listitem>
  +<listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem>
   <listitem><para>hotplug-2004_04_01</para></listitem>
  -<listitem><para>hotplug-2004_04_01-bogus-deps-1.patch</para></listitem>
  +<listitem><para>hotplug-2004_04_01-bogus_deps-1.patch</para></listitem>
   <listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem>
   <listitem><para>hotplug-2004_04_01-isapnp-2.patch</para></listitem>
   <listitem><para>iana-etc-1.00</para></listitem>
  -<listitem><para>inetutils-1.4.2-kernel-headers-1.patch</para></listitem>
  -<listitem><para>inetutils-1.4.2-no-server-man-pages-1.patch</para></listitem>
  +<listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
  +<listitem><para>inetutils-1.4.2-no_server_man_pages-1.patch</para></listitem>
   <listitem><para>linux-libc-headers-2.6.5.2</para></listitem>
   <listitem><para>mktemp-1.5</para></listitem>
  -<listitem><para>mktemp-1.5-add-tempfile-1.patch</para></listitem>
  +<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>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>
  +<listitem><para>readline-4.3-gnu_fixes-1.patch</para></listitem>
  +<listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem>
  +<listitem><para>sysklogd-1.4.1-signal-1.patch</para></listitem>
   <listitem><para>udev-025</para></listitem>
   <listitem><para>udev-025-config-2.patch</para></listitem>
  -<listitem><para>util-linux-2.12a-kernel-headers-1.patch</para></listitem>
  +<listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
   </itemizedlist>
   </listitem>
    
  @@ -103,6 +104,9 @@
   </itemizedlist>
   </listitem>
   
  +<listitem><para>June 7, 2004 [winkie]: Updated patch names to match those used
  +by the patches project.</para></listitem>
  +
   <listitem><para>June 7, 2004 [winkie]: Globally changed <quote>DejaGnu</quote>
   to <quote>DejaGNU</quote>.</para></listitem>
   
  
  
  
  1.14      +13 -13    LFS/BOOK/chapter03/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/patches.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- patches.xml	20 May 2004 16:21:42 -0000	1.13
  +++ patches.xml	7 Jun 2004 18:52:47 -0000	1.14
  @@ -17,14 +17,14 @@
   <varlistentry>
   <term>Bash GNU Fixes Patch - 7 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;bash-&bash-version;-gnu-fixes-2.patch"/></para>
  +<para><ulink url="&patches-root;bash-&bash-version;-gnu_fixes-2.patch"/></para>
   </listitem>
   </varlistentry>
   
   <varlistentry>
  -<term>Coreutils Dupes Patch - 16 KB:</term>
  +<term>Coreutils Suppress Hostname, Uptime, Kill, Su Patch - 16 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;coreutils-&coreutils-version;-dupes-1.patch"/></para>
  +<para><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_hostname_uptime_kill_su-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  @@ -45,14 +45,14 @@
   <varlistentry>
   <term>Flex Brokenness Patch - 8 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;flex-&flex-version;-debian-fixes-2.patch"/></para>
  +<para><ulink url="&patches-root;flex-&flex-version;-debian_fixes-2.patch"/></para>
   </listitem>
   </varlistentry>
   
   <varlistentry>
   <term>GCC No-Fixincludes Patch - 1 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;gcc-&gcc-short-version;-no-fixincludes-1.patch"/></para>
  +<para><ulink url="&patches-root;gcc-&gcc-short-version;-no_fixincludes-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  @@ -66,7 +66,7 @@
   <varlistentry>
   <term>Hotplug Bogus Dependencies Patch- 1 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus-deps-1.patch"/></para>
  +<para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus_deps-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  @@ -87,14 +87,14 @@
   <varlistentry>
   <term>Inetutils Kernel Headers Patch - 1 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;inetutils-&inetutils-version;-kernel-headers-1.patch"/></para>
  +<para><ulink url="&patches-root;inetutils-&inetutils-version;-kernel_headers-1.patch"/></para>
   </listitem>
   </varlistentry>
   
   <varlistentry>
   <term>Inetutils No-Server-Man-Pages Patch - 4 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;inetutils-&inetutils-version;-no-server-man-pages-1.patch"/></para>
  +<para><ulink url="&patches-root;inetutils-&inetutils-version;-no_server_man_pages-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  @@ -108,7 +108,7 @@
   <varlistentry>
   <term>Mktemp Tempfile Patch - 3 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;mktemp-&mktemp-version;-add-tempfile-1.patch"/></para>
  +<para><ulink url="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  @@ -122,7 +122,7 @@
   <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>
  +<para><ulink url="&patches-root;net-tools-&net-tools-version;-kernel_headers-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  @@ -136,14 +136,14 @@
   <varlistentry>
   <term>Readline GNU Fixes Patch - 5 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;readline-&readline-version;-gnu-fixes-1.patch"/></para>
  +<para><ulink url="&patches-root;readline-&readline-version;-gnu_fixes-1.patch"/></para>
   </listitem>
   </varlistentry>
   
   <varlistentry>
   <term>Sysklogd Kernel Headers Patch - 3 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;sysklogd-&sysklogd-version;-kernel-headers-1.patch"/></para>
  +<para><ulink url="&patches-root;sysklogd-&sysklogd-version;-kernel_headers-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  @@ -163,7 +163,7 @@
   <varlistentry>
   <term>Util-Linux Kernel Headers Patch - 3 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;util-linux-&util-linux-version;-kernel-headers-1.patch"/></para>
  +<para><ulink url="&patches-root;util-linux-&util-linux-version;-kernel_headers-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  
  
  
  1.27      +1 -1      LFS/BOOK/chapter05/bash.xml
  
  Index: bash.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bash.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- bash.xml	16 May 2004 00:06:08 -0000	1.26
  +++ bash.xml	7 Jun 2004 18:52:47 -0000	1.27
  @@ -30,7 +30,7 @@
   <para>Bash contains several known bugs. Fix these with the following
   patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu_fixes-2.patch</userinput></screen>
   
   <para>Now prepare Bash for compilation:</para>
   
  
  
  
  1.5       +1 -1      LFS/BOOK/chapter05/flex.xml
  
  Index: flex.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/flex.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- flex.xml	16 May 2004 16:07:36 -0000	1.4
  +++ flex.xml	7 Jun 2004 18:52:47 -0000	1.5
  @@ -29,7 +29,7 @@
   
   <para>Flex contains several known bugs. Fix these with the following patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian-fixes-2.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian_fixes-2.patch</userinput></screen>
   
   <para>The GNU autotools detects that the Flex source code has been modified by
   the patch, and tries to update the man pages to include those changes, but this
  
  
  
  1.35      +1 -1      LFS/BOOK/chapter05/gcc-pass2.xml
  
  Index: gcc-pass2.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gcc-pass2.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- gcc-pass2.xml	7 Jun 2004 14:32:37 -0000	1.34
  +++ gcc-pass2.xml	7 Jun 2004 18:52:47 -0000	1.35
  @@ -52,7 +52,7 @@
   
   <para>First correct a problem and make an essential adjustment:</para>
   
  -<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.patch
  +<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no_fixincludes-1.patch
   patch -Np1 -i ../gcc-&gcc-short-version;-specs-1.patch</userinput></screen>
   
   <para>The first patch disables the GCC <command>fixincludes</command> script. We
  
  
  
  1.7       +1 -1      LFS/BOOK/chapter05/util-linux.xml
  
  Index: util-linux.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/util-linux.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- util-linux.xml	30 May 2004 13:41:03 -0000	1.6
  +++ util-linux.xml	7 Jun 2004 18:52:47 -0000	1.7
  @@ -30,7 +30,7 @@
   <para>Util-linux has issues with the Linux 2.6 kernel series - fix these issues
   by applying the following patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel_headers-1.patch</userinput></screen>
   
   <para>Util-linux doesn't use the freshly installed headers and libraries
   from the <filename class="directory">/tools</filename> directory.  This is fixed by altering the configure
  
  
  
  1.27      +1 -1      LFS/BOOK/chapter06/bash.xml
  
  Index: bash.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bash.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- bash.xml	24 May 2004 21:37:21 -0000	1.26
  +++ bash.xml	7 Jun 2004 18:52:47 -0000	1.27
  @@ -32,7 +32,7 @@
   way it is expected at times. Fix this behavior with the following
   patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu_fixes-2.patch</userinput></screen>
   
   <para>Now prepare Bash for compilation:</para>
   
  
  
  
  1.27      +1 -1      LFS/BOOK/chapter06/coreutils.xml
  
  Index: coreutils.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/coreutils.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- coreutils.xml	24 May 2004 21:37:21 -0000	1.26
  +++ coreutils.xml	7 Jun 2004 18:52:47 -0000	1.27
  @@ -39,7 +39,7 @@
   <para>Prevent Coreutils from installing binaries that will be later be installed
   by other programs:</para>
   
  -<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-dupes-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-suppress_hostname_uptime_kill_su-1.patch</userinput></screen>
   
   <para>Now prepare Coreutils for compilation:</para>
   
  
  
  
  1.24      +1 -1      LFS/BOOK/chapter06/flex.xml
  
  Index: flex.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/flex.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- flex.xml	24 May 2004 21:37:21 -0000	1.23
  +++ flex.xml	7 Jun 2004 18:52:47 -0000	1.24
  @@ -31,7 +31,7 @@
   
   <para>Flex contains several known bugs. Fix these with the following patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian-fixes-2.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian_fixes-2.patch</userinput></screen>
   
   <para>The GNU autotools detects that the Flex source code has been modified by the patch,
   and tries to update the man pages to include those changes, but this breaks on many
  
  
  
  1.35      +1 -1      LFS/BOOK/chapter06/gcc.xml
  
  Index: gcc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/gcc.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- gcc.xml	1 Jun 2004 17:49:37 -0000	1.34
  +++ gcc.xml	7 Jun 2004 18:52:47 -0000	1.35
  @@ -44,7 +44,7 @@
   <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
   the Specs patch) also used in the previous chapter:</para>
   
  -<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no_fixincludes-1.patch</userinput></screen>
   
   <para>Now apply a sed substitution that will suppress the installation of
   <filename>libiberty.a</filename>. We want to use the version of
  
  
  
  1.23      +2 -2      LFS/BOOK/chapter06/inetutils.xml
  
  Index: inetutils.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/inetutils.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- inetutils.xml	24 May 2004 21:37:21 -0000	1.22
  +++ inetutils.xml	7 Jun 2004 18:52:47 -0000	1.23
  @@ -31,13 +31,13 @@
   <para>Inetutils has issues with the Linux 2.6 kernel series - fix these isues
   by applying the following patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel-headers-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel_headers-1.patch</userinput></screen>
   
   <para>We are not going to install all the programs that come with Inetutils.
   However, the Inetutils build system will insist on installing all the man
   pages anyway. The following patch will correct this situation:</para>
   
  -<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-no-server-man-pages-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-no_server_man_pages-1.patch</userinput></screen>
   
   <para>Now prepare Inetutils for compilation:</para>
   
  
  
  
  1.8       +1 -1      LFS/BOOK/chapter06/mktemp.xml
  
  Index: mktemp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/mktemp.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mktemp.xml	24 May 2004 21:37:21 -0000	1.7
  +++ mktemp.xml	7 Jun 2004 18:52:47 -0000	1.8
  @@ -30,7 +30,7 @@
   program, which has functionality much the same as <command>mktemp</command>.
   Patch mktemp to include a <command>tempfile</command> wrapper:</para>
   
  -<screen><userinput>patch -Np1 -i ../mktemp-&mktemp-version;-add-tempfile-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../mktemp-&mktemp-version;-add_tempfile-1.patch</userinput></screen>
   
   <para>Now prepare Mktemp for compilation:</para>
   
  
  
  
  1.7       +1 -1      LFS/BOOK/chapter06/net-tools.xml
  
  Index: net-tools.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/net-tools.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- net-tools.xml	24 May 2004 21:37:21 -0000	1.6
  +++ net-tools.xml	7 Jun 2004 18:52:47 -0000	1.7
  @@ -46,7 +46,7 @@
   <para>Net-tools has issues with the Linux 2.6 kernel series - fix these issues
   by applying the following patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-kernel-headers-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-kernel_headers-1.patch</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 "" |
  
  
  
  1.4       +1 -1      LFS/BOOK/chapter06/readline.xml
  
  Index: readline.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/readline.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- readline.xml	17 May 2004 21:54:59 -0000	1.3
  +++ readline.xml	7 Jun 2004 18:52:47 -0000	1.4
  @@ -32,7 +32,7 @@
   way it is expected at times. Fix this behavior with the following
   patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../readline-&readline-version;-gnu-fixes-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../readline-&readline-version;-gnu_fixes-1.patch</userinput></screen>
   
   <para>Now prepare Readline for compilation:</para>
   
  
  
  
  1.27      +1 -1      LFS/BOOK/chapter06/sysklogd.xml
  
  Index: sysklogd.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/sysklogd.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- sysklogd.xml	24 May 2004 21:37:21 -0000	1.26
  +++ sysklogd.xml	7 Jun 2004 18:52:47 -0000	1.27
  @@ -31,7 +31,7 @@
   <para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
   by applying the following patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel-headers-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_headers-1.patch</userinput></screen>
   
   <para>There is also a race condition in the signal handling logic, and this
   sometimes confuses the <command>sysklogd</command> initscript.
  
  
  
  1.8       +1 -1      LFS/BOOK/chapter06/util-linux.xml
  
  Index: util-linux.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/util-linux.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- util-linux.xml	24 May 2004 21:37:21 -0000	1.7
  +++ util-linux.xml	7 Jun 2004 18:52:47 -0000	1.8
  @@ -48,7 +48,7 @@
   <para>Util-linux has issues with the Linux 2.6 kernel series - fix these isues
   by applying the following patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel_headers-1.patch</userinput></screen>
   
   <para>Prepare Util-linux for compilation:</para>
   
  
  
  



More information about the lfs-book mailing list