1
0
Quellcode durchsuchen

Committing current BE-LFS to head.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3452 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Zack Winkles vor 21 Jahren
Ursprung
Commit
c8ba565c4e

+ 9 - 0
TODO

@@ -0,0 +1,9 @@
+ - Mention --enable-kernel=... where appropriate.
+ - Create and use the 'utmp' group, and explain to the user how to use it to
+   improve the security of things that write to utmp, such as terminal
+   emulators.
+ - Move passwd to /bin.
+ - Mention --enable-multibyte when building vim.
+ - POSIX compliance patches (aka, removing the coreutils hack).
+ - Upgraded to a glibc that supports POSIX message queues.
+ - Pass --enable-const to ncurses.

+ 3 - 1
chapter01/changelog.xml

@@ -28,7 +28,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>expect-5.41.0</para></listitem>
 <listitem><para>expect-5.41.0</para></listitem>
 <listitem><para>file-4.09</para></listitem>
 <listitem><para>file-4.09</para></listitem>
 <listitem><para>flex-2.5.31</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>gettext-0.14.1</para></listitem>
 <listitem><para>glibc-2.3.4-20040408</para></listitem>
 <listitem><para>glibc-2.3.4-20040408</para></listitem>
 <listitem><para>grub-0.94</para></listitem>
 <listitem><para>grub-0.94</para></listitem>
@@ -61,6 +61,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>mktemp-1.5</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>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>sysklogd-1.4.1-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</para></listitem>
@@ -83,6 +84,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>modutils-2.4.25</para></listitem>
 <listitem><para>modutils-2.4.25</para></listitem>
 <listitem><para>ncurses-5.3-etip-2.patch</para></listitem>
 <listitem><para>ncurses-5.3-etip-2.patch</para></listitem>
 <listitem><para>ncurses-5.3-vsscanf.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>procinfo-18</para></listitem>
 <listitem><para>procps-3.1.11-locale-fix.patch</para></listitem>
 <listitem><para>procps-3.1.11-locale-fix.patch</para></listitem>
 <listitem><para>shadow-4.0.3-newgrp-fix.patch</para></listitem>
 <listitem><para>shadow-4.0.3-newgrp-fix.patch</para></listitem>

+ 10 - 10
chapter03/patches.xml

@@ -14,7 +14,7 @@ following:</para>
 
 
 <literallayout>
 <literallayout>
 Bash Patch - 7 KB:
 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:
 Coreutils Hostname Patch - 1 KB:
 <ulink url="&patches-root;coreutils-&coreutils-version;-hostname-1.patch"/>
 <ulink url="&patches-root;coreutils-&coreutils-version;-hostname-1.patch"/>
@@ -29,40 +29,40 @@ Flex Brokenness Patch - 8 KB:
 <ulink url="&patches-root;flex-&flex-version;-debian-fixes-2.patch"/>
 <ulink url="&patches-root;flex-&flex-version;-debian-fixes-2.patch"/>
 
 
 GCC No-Fixincludes Patch - 1 KB:
 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:
 GCC Specs Patch - 11 KB:
 <ulink url="&patches-root;gcc-&gcc-version;-specs-1.patch"/>
 <ulink url="&patches-root;gcc-&gcc-version;-specs-1.patch"/>
 
 
 Inetutils Kernel Headers Patch - 1 KB:
 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:
 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:
 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:
 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:
 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:
 Perl Libc Patch - 1 KB:
 <ulink url="&patches-root;perl-&perl-version;-libc-1.patch"/>
 <ulink url="&patches-root;perl-&perl-version;-libc-1.patch"/>
 
 
 Sysklogd Kernel Headers Patch - 3 KB:
 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:
 Udev Configuration Patch - 6 KB:
 <ulink url="&patches-root;udev-&udev-version;-config-1.patch"/>
 <ulink url="&patches-root;udev-&udev-version;-config-1.patch"/>
 
 
 Util-Linux Kernel Headers Patch - 3 KB:
 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>
 </literallayout>
 
 
 <para>In addition to the above required patches, there exist a number of
 <para>In addition to the above required patches, there exist a number of

+ 2 - 2
chapter05/adjusting.xml

@@ -38,7 +38,7 @@ to the new dynamic linker. A simple sed will accomplish this:</para>
 
 
 <!-- Ampersands are needed to allow cut and paste -->
 <!-- Ampersands are needed to allow cut and paste -->
 
 
-<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs &amp;&amp;
+<screen><userinput>SPECFILE=/tools/lib/gcc/*/*/specs &amp;&amp;
 sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \
 sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \
     $SPECFILE &gt; tempspecfile &amp;&amp;
     $SPECFILE &gt; tempspecfile &amp;&amp;
 mv -f tempspecfile $SPECFILE &amp;&amp;
 mv -f tempspecfile $SPECFILE &amp;&amp;
@@ -62,7 +62,7 @@ because of GCC's <quote>fixincludes</quote> process which runs as part of the
 GCC build.  We'll explain more about this further on in this chapter. For now,
 GCC build.  We'll explain more about this further on in this chapter. For now,
 run the following commands to eliminate this possibility:</para>
 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
 <caution><para>It is imperative at this point to stop and ensure that the basic

+ 1 - 1
chapter05/bash.xml

@@ -25,7 +25,7 @@
 <para>Bash contains several known bugs. Fix these with the following
 <para>Bash contains several known bugs. Fix these with the following
 patch:</para>
 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>
 <para>Now prepare Bash for compilation:</para>
 
 

+ 1 - 1
chapter05/gcc-pass2.xml

@@ -46,7 +46,7 @@ into a single <filename>gcc-&gcc-version;/</filename> subdirectory.</para>
 
 
 <para>First correct a problem and make an essential adjustment:</para>
 <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>
 patch -Np1 -i ../gcc-&gcc-version;-specs-1.patch</userinput></screen>
 
 
 <para>The first patch disables the GCC <quote>fixincludes</quote> script. We
 <para>The first patch disables the GCC <quote>fixincludes</quote> script. We

+ 1 - 1
chapter05/util-linux.xml

@@ -25,7 +25,7 @@
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these issues
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these issues
 by applying the following patch:</para>
 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
 <para>Util-linux doesn't use the freshly installed headers and libraries
 from the /tools directory.  This is fixed by altering the configure
 from the /tools directory.  This is fixed by altering the configure

+ 1 - 1
chapter06/bash.xml

@@ -25,7 +25,7 @@ GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
 way it is expected at times. Fix this behavior with the following
 way it is expected at times. Fix this behavior with the following
 patch:</para>
 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>
 <para>Now prepare Bash for compilation:</para>
 
 

+ 1 - 1
chapter06/gcc.xml

@@ -38,7 +38,7 @@ compilers. Instructions for building these can be found at
 <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
 <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
 the Specs patch) also used in the previous chapter:</para>
 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
 <para>Now apply a sed substitution that will suppress the installation of
 <filename>libiberty.a</filename>. We want to use the version of
 <filename>libiberty.a</filename>. We want to use the version of

+ 1 - 1
chapter06/inetutils.xml

@@ -25,7 +25,7 @@ Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
 <para>Inetutils has issues with the Linux 2.6 kernel series - fix these isues
 <para>Inetutils has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 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.
 <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
 However, the Inetutils build system will insist on installing all the man

+ 1 - 1
chapter06/man.xml

@@ -28,7 +28,7 @@ Glibc, Grep, Make, Sed.</para>
 of Groff. In particular, man pages will now display using the full terminal
 of Groff. In particular, man pages will now display using the full terminal
 width instead of being limited to 80 characters:</para>
 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>
 <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
 switch to the <emphasis>PAGER</emphasis> variable so that escape sequences are

+ 4 - 4
chapter06/net-tools.xml

@@ -32,15 +32,15 @@ to actually enable these protocols in the kernel -- what you do here is merely
 telling the package to include support for those protocols in its programs,
 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>
 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
 <para>Net-tools has issues with the Linux 2.6 kernel series - fix these issues
 by applying the following patch:</para>
 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
 <para>Now prepare Net-tools for compilation (if you intend to accept the
 defaults, you can skip all the questions by running <userinput>yes "" |
 defaults, you can skip all the questions by running <userinput>yes "" |

+ 1 - 1
chapter06/readjusting.xml

@@ -52,7 +52,7 @@ this:</para>
 
 
 <!-- Ampersands are needed to allow cut and paste -->
 <!-- Ampersands are needed to allow cut and paste -->
 
 
-<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs &amp;&amp;
+<screen><userinput>SPECFILE=/tools/lib/gcc/*/*/specs &amp;&amp;
 sed -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g' \
 sed -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g' \
     $SPECFILE &gt; newspecfile &amp;&amp;
     $SPECFILE &gt; newspecfile &amp;&amp;
 mv -f newspecfile $SPECFILE &amp;&amp;
 mv -f newspecfile $SPECFILE &amp;&amp;

+ 1 - 1
chapter06/sysklogd.xml

@@ -24,7 +24,7 @@ as those given by the kernel when unusual things happen.</para>
 <para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
 <para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 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>
 <para>Compile Sysklogd:</para>
 
 

+ 1 - 1
chapter06/util-linux.xml

@@ -42,7 +42,7 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these isues
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 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>
 <para>Prepare Util-linux for compilation:</para>
 
 

+ 3 - 3
general.ent

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!ENTITY version "CVS-2004-05-03">
 <!ENTITY version "CVS-2004-05-03">
 <!ENTITY releasedate "May 3, 2004">
 <!ENTITY releasedate "May 3, 2004">
-<!ENTITY milestone "6.0">
+<!ENTITY milestone "6.1">
 
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
 <!ENTITY faq-root "&lfs-root;faq/">
 <!ENTITY faq-root "&lfs-root;faq/">
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!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 wiki-root "http://wiki.linuxfromscratch.org/">
 <!ENTITY http-down "http://downloads.linuxfromscratch.org/">
 <!ENTITY http-down "http://downloads.linuxfromscratch.org/">
 <!ENTITY freshmeat "http://freshmeat.net/projects/">
 <!ENTITY freshmeat "http://freshmeat.net/projects/">
@@ -32,7 +32,7 @@
 <!ENTITY findutils-version "4.1.20">
 <!ENTITY findutils-version "4.1.20">
 <!ENTITY flex-version "2.5.31">
 <!ENTITY flex-version "2.5.31">
 <!ENTITY gawk-version "3.1.3">
 <!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 gettext-version "0.14.1">
 <!ENTITY glibc-version "2.3.4-20040408">
 <!ENTITY glibc-version "2.3.4-20040408">
 <!ENTITY grep-version "2.5.1">
 <!ENTITY grep-version "2.5.1">