cvs commit: LFS/BOOK/chapter06 bash.xml gcc.xml inetutils.xml man.xml net-tools.xml sysklogd.xml util-linux.xml

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Tue May 4 10:24:40 PDT 2004


winkie      04/05/04 11:24:40

  Modified:    BOOK     Tag: b6_0 general.ent
               BOOK/chapter01 Tag: b6_0 changelog.xml
               BOOK/chapter03 Tag: b6_0 patches.xml
               BOOK/chapter05 Tag: b6_0 bash.xml gcc-pass2.xml
                        util-linux.xml
               BOOK/chapter06 Tag: b6_0 bash.xml gcc.xml inetutils.xml
                        man.xml net-tools.xml sysklogd.xml util-linux.xml
  Log:
  Temporarily relocate all the patches for consistency.  Currently the patches
  project is under some renovation, and crap'll be changing a lot.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.5   +2 -2      LFS/BOOK/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/general.ent,v
  retrieving revision 1.3.2.4
  retrieving revision 1.3.2.5
  diff -u -r1.3.2.4 -r1.3.2.5
  --- general.ent	4 May 2004 16:48:09 -0000	1.3.2.4
  +++ general.ent	4 May 2004 17:24:39 -0000	1.3.2.5
  @@ -1,5 +1,5 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  -<!ENTITY version "6_0-2004-05-04">
  +<!ENTITY version "6.0-20040504">
   <!ENTITY releasedate "May 4, 2004">
   <!ENTITY milestone "6.0">
   
  @@ -8,7 +8,7 @@
   <!ENTITY faq-root "&lfs-root;faq/">
   <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
   <!ENTITY hints-index "&lfs-root;hints/list.html">
  -<!ENTITY patches-root "&lfs-root;patches/lfs/cvs/">
  +<!ENTITY patches-root "http://downloads.linuxfromscratch.org/patches/6.0-cvs/">
   <!ENTITY wiki-root "http://wiki.linuxfromscratch.org/">
   <!ENTITY http-down "http://downloads.linuxfromscratch.org/">
   <!ENTITY freshmeat "http://freshmeat.net/projects/">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.741.2.5 +8 -8      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.741.2.4
  retrieving revision 1.741.2.5
  diff -u -r1.741.2.4 -r1.741.2.5
  --- changelog.xml	4 May 2004 16:48:10 -0000	1.741.2.4
  +++ changelog.xml	4 May 2004 17:24:39 -0000	1.741.2.5
  @@ -55,17 +55,17 @@
   <itemizedlist>
   <listitem><para>flex-2.5.31-debian-fixes-2.patch</para></listitem>
   <listitem><para>iana-etc-1.00</para></listitem>
  -<listitem><para>inetutils-1.4.2-kernel-2.6-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.1</para></listitem>
   <listitem><para>mktemp-1.5</para></listitem>
  -<listitem><para>mktemp-1.5-add-tempfile.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-kernel-2.6-1.patch</para></listitem>
  -<listitem><para>sysklogd-1.4.1-kernel_kernel.patch</para></listitem>
  +<listitem><para>net-tools-1.60-kernel-headers-1.patch</para></listitem>
  +<listitem><para>sysklogd-1.4.1-kernel-headers-1.patch</para></listitem>
   <listitem><para>udev-025</para></listitem>
   <listitem><para>udev-025-config-1.patch</para></listitem>
  -<listitem><para>util-linux-2.12a-kernel-jg-2.6-1.patch</para></listitem>
  +<listitem><para>util-linux-2.12a-kernel-headers-1.patch</para></listitem>
   </itemizedlist>
   </listitem>
    
  @@ -90,8 +90,8 @@
   </itemizedlist>
   </listitem>
   
  -<listitem><para>May 4th, 2004 [winkie]: Chapter 5 & 6 - Fixed Util-Linux
  -patch name.</para></listitem>
  +<listitem><para>May 4th, 2004 [winkie]: Chapter 5 & 6 - Use new patch
  +naming <quote>standard</quote>.</para></listitem>
   
   <listitem><para>May 3rd, 2004 [winkie]: Branched for 6.0</para></listitem>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.4   +9 -9      LFS/BOOK/chapter03/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/patches.xml,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- patches.xml	4 May 2004 16:48:10 -0000	1.2.2.3
  +++ patches.xml	4 May 2004 17:24:40 -0000	1.2.2.4
  @@ -14,7 +14,7 @@
   
   <literallayout>
   Bash Patch - 7 KB:
  -<ulink url="&patches-root;bash-&bash-version;-2.patch"/>
  +<ulink url="&patches-root;bash-&bash-version;-gnu-fixes-2.patch"/>
   
   Coreutils Hostname Patch - 1 KB:
   <ulink url="&patches-root;coreutils-&coreutils-version;-hostname-1.patch"/>
  @@ -29,40 +29,40 @@
   <ulink url="&patches-root;flex-&flex-version;-debian-fixes-2.patch"/>
   
   GCC No-Fixincludes Patch - 1 KB:
  -<ulink url="&patches-root;gcc-&gcc-version;-no_fixincludes-1.patch"/>
  +<ulink url="&patches-root;gcc-&gcc-version;-no-fixincludes-1.patch"/>
   
   GCC Specs Patch - 11 KB:
   <ulink url="&patches-root;gcc-&gcc-version;-specs-1.patch"/>
   
   Inetutils Kernel Headers Patch - 1 KB:
  -<ulink url="&patches-root;inetutils-&inetutils-version;-kernel-2.6-1.patch"/>
  +<ulink url="&patches-root;inetutils-&inetutils-version;-kernel-headers-1.patch"/>
   
   Inetutils No-Server-Man-Pages Patch - 4 KB:
  -<ulink url="&patches-root;inetutils-&inetutils-version;-no_server_man_pages-1.patch"/>
  +<ulink url="&patches-root;inetutils-&inetutils-version;-no-server-man-pages-1.patch"/>
   
   Man 80-Columns Patch - 1 KB:
  -<ulink url="&patches-root;man-&man-version;-80cols.patch"/>
  +<ulink url="&patches-root;man-&man-version;-80cols-1.patch"/>
   
   Mktemp Tempfile Patch - 3 KB:
  -<ulink url="&patches-root;mktemp-&mktemp-version;-add-tempfile.patch"/>
  +<ulink url="&patches-root;mktemp-&mktemp-version;-add-tempfile-1.patch"/>
   
   Net-tools Mii-Tool-Gcc33 Patch - 2 KB:
   <ulink url="&patches-root;net-tools-&net-tools-version;-miitool-gcc33-1.patch"/>
   
   Net-tools Kernel Headers Patch - 1 KB:
  -<ulink url="&patches-root;net-tools-&net-tools-version;-kernel-2.6-1.patch"/>
  +<ulink url="&patches-root;net-tools-&net-tools-version;-kernel-headers-1.patch"/>
   
   Perl Libc Patch - 1 KB:
   <ulink url="&patches-root;perl-&perl-version;-libc-1.patch"/>
   
   Sysklogd Kernel Headers Patch - 3 KB:
  -<ulink url="&patches-root;sysklogd-&sysklogd-version;-kernel_header.patch"/>
  +<ulink url="&patches-root;sysklogd-&sysklogd-version;-kernel-headers-1.patch"/>
   
   Udev Configuration Patch - 6 KB:
   <ulink url="&patches-root;udev-&udev-version;-config-1.patch"/>
   
   Util-Linux Kernel Headers Patch - 3 KB:
  -<ulink url="&patches-root;util-linux-&util-linux-version;-kernel-jg-2.6-1.patch"/>
  +<ulink url="&patches-root;util-linux-&util-linux-version;-kernel-headers-1.patch"/>
   </literallayout>
   
   <para>In addition to the above required patches, there exist a number of
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.23.2.3  +1 -1      LFS/BOOK/chapter05/bash.xml
  
  Index: bash.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bash.xml,v
  retrieving revision 1.23.2.2
  retrieving revision 1.23.2.3
  diff -u -r1.23.2.2 -r1.23.2.3
  --- bash.xml	3 May 2004 22:02:35 -0000	1.23.2.2
  +++ bash.xml	4 May 2004 17:24:40 -0000	1.23.2.3
  @@ -25,7 +25,7 @@
   <para>Bash contains several known bugs. Fix these with the following
   patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../bash-&bash-version;-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.2.3  +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.27.2.2
  retrieving revision 1.27.2.3
  diff -u -r1.27.2.2 -r1.27.2.3
  --- gcc-pass2.xml	3 May 2004 22:02:35 -0000	1.27.2.2
  +++ gcc-pass2.xml	4 May 2004 17:24:40 -0000	1.27.2.3
  @@ -46,7 +46,7 @@
   
   <para>First correct a problem and make an essential adjustment:</para>
   
  -<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch
  +<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch
   patch -Np1 -i ../gcc-&gcc-version;-specs-1.patch</userinput></screen>
   
   <para>The first patch disables the GCC <quote>fixincludes</quote> script. We
  
  
  
  1.2.2.4   +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.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- util-linux.xml	4 May 2004 16:48:10 -0000	1.2.2.3
  +++ util-linux.xml	4 May 2004 17:24:40 -0000	1.2.2.4
  @@ -25,7 +25,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-jg-2.6-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 /tools directory.  This is fixed by altering the configure
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.21.2.3  +1 -1      LFS/BOOK/chapter06/bash.xml
  
  Index: bash.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bash.xml,v
  retrieving revision 1.21.2.2
  retrieving revision 1.21.2.3
  diff -u -r1.21.2.2 -r1.21.2.3
  --- bash.xml	3 May 2004 22:02:35 -0000	1.21.2.2
  +++ bash.xml	4 May 2004 17:24:40 -0000	1.21.2.3
  @@ -25,7 +25,7 @@
   way it is expected at times. Fix this behavior with the following
   patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../bash-&bash-version;-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.28.2.3  +1 -1      LFS/BOOK/chapter06/gcc.xml
  
  Index: gcc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/gcc.xml,v
  retrieving revision 1.28.2.2
  retrieving revision 1.28.2.3
  diff -u -r1.28.2.2 -r1.28.2.3
  --- gcc.xml	3 May 2004 22:02:35 -0000	1.28.2.2
  +++ gcc.xml	4 May 2004 17:24:40 -0000	1.28.2.3
  @@ -38,7 +38,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-version;-no_fixincludes-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../gcc-&gcc-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.16.2.3  +2 -2      LFS/BOOK/chapter06/inetutils.xml
  
  Index: inetutils.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/inetutils.xml,v
  retrieving revision 1.16.2.2
  retrieving revision 1.16.2.3
  diff -u -r1.16.2.2 -r1.16.2.3
  --- inetutils.xml	3 May 2004 22:02:35 -0000	1.16.2.2
  +++ inetutils.xml	4 May 2004 17:24:40 -0000	1.16.2.3
  @@ -25,13 +25,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-2.6-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.23.4.3  +1 -1      LFS/BOOK/chapter06/man.xml
  
  Index: man.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man.xml,v
  retrieving revision 1.23.4.2
  retrieving revision 1.23.4.3
  diff -u -r1.23.4.2 -r1.23.4.3
  --- man.xml	3 May 2004 22:02:35 -0000	1.23.4.2
  +++ man.xml	4 May 2004 17:24:40 -0000	1.23.4.3
  @@ -28,7 +28,7 @@
   of Groff. In particular, man pages will now display using the full terminal
   width instead of being limited to 80 characters:</para>
   
  -<screen><userinput>patch -Np1 -i ../man-&man-version;-80cols.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../man-&man-version;-80cols-1.patch</userinput></screen>
   
   <para>The second is a sed substitution to add the <emphasis>-R</emphasis>
   switch to the <emphasis>PAGER</emphasis> variable so that escape sequences are
  
  
  
  1.2.2.3   +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.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- net-tools.xml	3 May 2004 22:02:35 -0000	1.2.2.2
  +++ net-tools.xml	4 May 2004 17:24:40 -0000	1.2.2.3
  @@ -40,7 +40,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-2.6-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.20.2.3  +1 -1      LFS/BOOK/chapter06/sysklogd.xml
  
  Index: sysklogd.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/sysklogd.xml,v
  retrieving revision 1.20.2.2
  retrieving revision 1.20.2.3
  diff -u -r1.20.2.2 -r1.20.2.3
  --- sysklogd.xml	3 May 2004 22:02:35 -0000	1.20.2.2
  +++ sysklogd.xml	4 May 2004 17:24:40 -0000	1.20.2.3
  @@ -24,7 +24,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_header.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel-headers-1.patch</userinput></screen>
   
   <para>Compile Sysklogd:</para>
   
  
  
  
  1.2.2.4   +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.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- util-linux.xml	4 May 2004 16:48:11 -0000	1.2.2.3
  +++ util-linux.xml	4 May 2004 17:24:40 -0000	1.2.2.4
  @@ -42,7 +42,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-jg-2.6-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