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

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Mon May 3 14:41:20 PDT 2004


winkie      04/05/03 15:41:20

  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 adjusting.xml bash.xml
                        gcc-pass2.xml util-linux.xml
               BOOK/chapter06 Tag: b6_0 bash.xml gcc.xml inetutils.xml
                        man.xml net-tools.xml readjusting.xml sysklogd.xml
                        util-linux.xml
  Log:
  6.0 vs 6.1 changes
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +3 -3      LFS/BOOK/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/general.ent,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- general.ent	3 May 2004 21:28:56 -0000	1.3
  +++ general.ent	3 May 2004 21:41:19 -0000	1.3.2.1
  @@ -1,14 +1,14 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   <!ENTITY version "CVS-2004-05-03">
   <!ENTITY releasedate "May 3, 2004">
  -<!ENTITY milestone "6.0">
  +<!ENTITY milestone "6.1">
   
   <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
   <!ENTITY blfs-root "&lfs-root;blfs/">
   <!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 "ftp://ftp.be-linux.org/belfs/patches/">
   <!ENTITY wiki-root "http://wiki.linuxfromscratch.org/">
   <!ENTITY http-down "http://downloads.linuxfromscratch.org/">
   <!ENTITY freshmeat "http://freshmeat.net/projects/">
  @@ -32,7 +32,7 @@
   <!ENTITY findutils-version "4.1.20">
   <!ENTITY flex-version "2.5.31">
   <!ENTITY gawk-version "3.1.3">
  -<!ENTITY gcc-version "3.3.3">
  +<!ENTITY gcc-version "3.4.0">
   <!ENTITY gettext-version "0.14.1">
   <!ENTITY glibc-version "2.3.4-20040408">
   <!ENTITY grep-version "2.5.1">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.741.2.1 +3 -1      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.741
  retrieving revision 1.741.2.1
  diff -u -r1.741 -r1.741.2.1
  --- changelog.xml	3 May 2004 21:28:56 -0000	1.741
  +++ changelog.xml	3 May 2004 21:41:19 -0000	1.741.2.1
  @@ -28,7 +28,7 @@
   <listitem><para>expect-5.41.0</para></listitem>
   <listitem><para>file-4.09</para></listitem>
   <listitem><para>flex-2.5.31</para></listitem>
  -<listitem><para>gcc-3.3.3</para></listitem>
  +<listitem><para>gcc-3.4.0</para></listitem>
   <listitem><para>gettext-0.14.1</para></listitem>
   <listitem><para>glibc-2.3.4-20040408</para></listitem>
   <listitem><para>grub-0.94</para></listitem>
  @@ -61,6 +61,7 @@
   <listitem><para>mktemp-1.5</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>sysklogd-1.4.1-kernel-headers-1.patch</para></listitem>
   <listitem><para>udev-025</para></listitem>
  @@ -83,6 +84,7 @@
   <listitem><para>modutils-2.4.25</para></listitem>
   <listitem><para>ncurses-5.3-etip-2.patch</para></listitem>
   <listitem><para>ncurses-5.3-vsscanf.patch</para></listitem>
  +<listitem><para>net-tools-1.60-miitool-gcc33-1.patch</para></listitem>
   <listitem><para>procinfo-18</para></listitem>
   <listitem><para>procps-3.1.11-locale-fix.patch</para></listitem>
   <listitem><para>shadow-4.0.3-newgrp-fix.patch</para></listitem>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +10 -10    LFS/BOOK/chapter03/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/patches.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- patches.xml	3 May 2004 21:28:56 -0000	1.2
  +++ patches.xml	3 May 2004 21:41:19 -0000	1.2.2.1
  @@ -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"/>
   
   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 GCC 3.4 Compatibility Patch - 3 KB:
  +<ulink url="&patches-root;net-tools-&net-tools-version;-gcc34-2.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-dj-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.1.4.1   +2 -2      LFS/BOOK/chapter05/adjusting.xml
  
  Index: adjusting.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/adjusting.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- adjusting.xml	3 May 2004 10:59:41 -0000	1.1
  +++ adjusting.xml	3 May 2004 21:41:19 -0000	1.1.4.1
  @@ -38,7 +38,7 @@
   
   <!-- Ampersands are needed to allow cut and paste -->
   
  -<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs &&
  +<screen><userinput>SPECFILE=/tools/lib/gcc/*/*/specs &&
   sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2 at g' \
       $SPECFILE > tempspecfile &&
   mv -f tempspecfile $SPECFILE &&
  @@ -62,7 +62,7 @@
   GCC build.  We'll explain more about this further on in this chapter. For now,
   run the following commands to eliminate this possibility:</para>
   
  -<screen><userinput>rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen>
  +<screen><userinput>rm -f /tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen>
   
   
   <caution><para>It is imperative at this point to stop and ensure that the basic
  
  
  
  1.23.2.1  +1 -1      LFS/BOOK/chapter05/bash.xml
  
  Index: bash.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bash.xml,v
  retrieving revision 1.23
  retrieving revision 1.23.2.1
  diff -u -r1.23 -r1.23.2.1
  --- bash.xml	3 May 2004 21:28:56 -0000	1.23
  +++ bash.xml	3 May 2004 21:41:19 -0000	1.23.2.1
  @@ -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.1  +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
  retrieving revision 1.27.2.1
  diff -u -r1.27 -r1.27.2.1
  --- gcc-pass2.xml	3 May 2004 21:28:57 -0000	1.27
  +++ gcc-pass2.xml	3 May 2004 21:41:19 -0000	1.27.2.1
  @@ -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.1   +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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- util-linux.xml	3 May 2004 21:28:57 -0000	1.2
  +++ util-linux.xml	3 May 2004 21:41:19 -0000	1.2.2.1
  @@ -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-dj-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.1  +1 -1      LFS/BOOK/chapter06/bash.xml
  
  Index: bash.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bash.xml,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- bash.xml	3 May 2004 21:28:57 -0000	1.21
  +++ bash.xml	3 May 2004 21:41:19 -0000	1.21.2.1
  @@ -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.1  +1 -1      LFS/BOOK/chapter06/gcc.xml
  
  Index: gcc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/gcc.xml,v
  retrieving revision 1.28
  retrieving revision 1.28.2.1
  diff -u -r1.28 -r1.28.2.1
  --- gcc.xml	3 May 2004 21:28:57 -0000	1.28
  +++ gcc.xml	3 May 2004 21:41:19 -0000	1.28.2.1
  @@ -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.1  +1 -1      LFS/BOOK/chapter06/inetutils.xml
  
  Index: inetutils.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/inetutils.xml,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- inetutils.xml	3 May 2004 21:28:57 -0000	1.16
  +++ inetutils.xml	3 May 2004 21:41:19 -0000	1.16.2.1
  @@ -25,7 +25,7 @@
   <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
  
  
  
  1.23.4.1  +1 -1      LFS/BOOK/chapter06/man.xml
  
  Index: man.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man.xml,v
  retrieving revision 1.23
  retrieving revision 1.23.4.1
  diff -u -r1.23 -r1.23.4.1
  --- man.xml	3 May 2004 10:59:41 -0000	1.23
  +++ man.xml	3 May 2004 21:41:19 -0000	1.23.4.1
  @@ -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.1   +4 -4      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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- net-tools.xml	3 May 2004 21:28:57 -0000	1.2
  +++ net-tools.xml	3 May 2004 21:41:19 -0000	1.2.2.1
  @@ -32,15 +32,15 @@
   telling the package to include support for those protocols in its programs,
   but it's up to the kernel to make the protocols available.</para>
   
  -<para>First fix a small syntax problem in the sources of the
  -<command>mii-tool</command> program:</para>
  +<para>This package also has issues with being compiled by GCC 3.4, which we
  +fix by applying the following patch:</para>
   
  -<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-miitool-gcc33-1.patch</userinput></screen>
  +<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>
   
  -<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.1.4.1   +1 -1      LFS/BOOK/chapter06/readjusting.xml
  
  Index: readjusting.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/readjusting.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- readjusting.xml	3 May 2004 10:59:41 -0000	1.1
  +++ readjusting.xml	3 May 2004 21:41:19 -0000	1.1.4.1
  @@ -52,7 +52,7 @@
   
   <!-- Ampersands are needed to allow cut and paste -->
   
  -<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs &&
  +<screen><userinput>SPECFILE=/tools/lib/gcc/*/*/specs &&
   sed -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2 at g' \
       $SPECFILE > newspecfile &&
   mv -f newspecfile $SPECFILE &&
  
  
  
  1.20.2.1  +1 -1      LFS/BOOK/chapter06/sysklogd.xml
  
  Index: sysklogd.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/sysklogd.xml,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -u -r1.20 -r1.20.2.1
  --- sysklogd.xml	3 May 2004 21:28:57 -0000	1.20
  +++ sysklogd.xml	3 May 2004 21:41:19 -0000	1.20.2.1
  @@ -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.1   +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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- util-linux.xml	3 May 2004 21:28:57 -0000	1.2
  +++ util-linux.xml	3 May 2004 21:41:19 -0000	1.2.2.1
  @@ -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-dj-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