From c8ba565c4e262a4871a49a0543b5f76d93570a71 Mon Sep 17 00:00:00 2001 From: Zack Winkles Date: Mon, 3 May 2004 22:08:10 +0000 Subject: Committing current BE-LFS to head. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3452 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- TODO | 9 +++++++++ chapter01/changelog.xml | 4 +++- chapter03/patches.xml | 20 ++++++++++---------- chapter05/adjusting.xml | 4 ++-- chapter05/bash.xml | 2 +- chapter05/gcc-pass2.xml | 2 +- chapter05/util-linux.xml | 2 +- chapter06/bash.xml | 2 +- chapter06/gcc.xml | 2 +- chapter06/inetutils.xml | 2 +- chapter06/man.xml | 2 +- chapter06/net-tools.xml | 8 ++++---- chapter06/readjusting.xml | 2 +- chapter06/sysklogd.xml | 2 +- chapter06/util-linux.xml | 2 +- general.ent | 6 +++--- 16 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 TODO diff --git a/TODO b/TODO new file mode 100644 index 000000000..1ac44fb42 --- /dev/null +++ b/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. diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 3bf2f6dd1..2b660537a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -28,7 +28,7 @@ first a summary, then a detailed log. expect-5.41.0 file-4.09 flex-2.5.31 -gcc-3.3.3 +gcc-3.4.0 gettext-0.14.1 glibc-2.3.4-20040408 grub-0.94 @@ -61,6 +61,7 @@ first a summary, then a detailed log. mktemp-1.5 mktemp-1.5-add-tempfile-1.patch module-init-tools-3.0 +net-tools-1.60-gcc34-2.patch net-tools-1.60-kernel-headers-1.patch sysklogd-1.4.1-kernel-headers-1.patch udev-025 @@ -83,6 +84,7 @@ first a summary, then a detailed log. modutils-2.4.25 ncurses-5.3-etip-2.patch ncurses-5.3-vsscanf.patch +net-tools-1.60-miitool-gcc33-1.patch procinfo-18 procps-3.1.11-locale-fix.patch shadow-4.0.3-newgrp-fix.patch diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 7c5e7ee0c..11814f099 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -14,7 +14,7 @@ following: Bash Patch - 7 KB: - + Coreutils Hostname Patch - 1 KB: @@ -29,40 +29,40 @@ Flex Brokenness Patch - 8 KB: GCC No-Fixincludes Patch - 1 KB: - + GCC Specs Patch - 11 KB: Inetutils Kernel Headers Patch - 1 KB: - + Inetutils No-Server-Man-Pages Patch - 4 KB: Man 80-Columns Patch - 1 KB: - + Mktemp Tempfile Patch - 3 KB: - + -Net-tools Mii-Tool-Gcc33 Patch - 2 KB: - +Net-tools GCC 3.4 Compatibility Patch - 3 KB: + Net-tools Kernel Headers Patch - 1 KB: - + Perl Libc Patch - 1 KB: Sysklogd Kernel Headers Patch - 3 KB: - + Udev Configuration Patch - 6 KB: Util-Linux Kernel Headers Patch - 3 KB: - + In addition to the above required patches, there exist a number of diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml index b18b6f132..1f18d7cb2 100644 --- a/chapter05/adjusting.xml +++ b/chapter05/adjusting.xml @@ -38,7 +38,7 @@ to the new dynamic linker. A simple sed will accomplish this: -SPECFILE=/tools/lib/gcc-lib/*/*/specs && +SPECFILE=/tools/lib/gcc/*/*/specs && sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \ $SPECFILE > tempspecfile && mv -f tempspecfile $SPECFILE && @@ -62,7 +62,7 @@ because of GCC's fixincludes process which runs as part of the GCC build. We'll explain more about this further on in this chapter. For now, run the following commands to eliminate this possibility: -rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h} +rm -f /tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h} It is imperative at this point to stop and ensure that the basic diff --git a/chapter05/bash.xml b/chapter05/bash.xml index d5d5ee747..53994cfa8 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -25,7 +25,7 @@ Bash contains several known bugs. Fix these with the following patch: -patch -Np1 -i ../bash-&bash-version;-2.patch +patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch Now prepare Bash for compilation: diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index fbf321af4..ed0d752c8 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -46,7 +46,7 @@ into a single gcc-&gcc-version;/ subdirectory. First correct a problem and make an essential adjustment: -patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch +patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch patch -Np1 -i ../gcc-&gcc-version;-specs-1.patch The first patch disables the GCC fixincludes script. We diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml index 7954b0f83..44ac77f81 100644 --- a/chapter05/util-linux.xml +++ b/chapter05/util-linux.xml @@ -25,7 +25,7 @@ Util-linux has issues with the Linux 2.6 kernel series - fix these issues by applying the following patch: -patch -Np1 -i ../util-linux-&util-linux-version;-kernel-dj-2.6-1.patch +patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch Util-linux doesn't use the freshly installed headers and libraries from the /tools directory. This is fixed by altering the configure diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 8ce43a01e..c1d011a13 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -25,7 +25,7 @@ GCC, Glibc, Grep, Make, Ncurses, Sed. way it is expected at times. Fix this behavior with the following patch: -patch -Np1 -i ../bash-&bash-version;-2.patch +patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch Now prepare Bash for compilation: diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index eb168cb61..73e4cab92 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -38,7 +38,7 @@ compilers. Instructions for building these can be found at First apply only the No-Fixincludes patch (and not the Specs patch) also used in the previous chapter: -patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch +patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch Now apply a sed substitution that will suppress the installation of libiberty.a. We want to use the version of diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index 6ef16b16f..eb61c553c 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -25,7 +25,7 @@ Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed. Inetutils has issues with the Linux 2.6 kernel series - fix these isues by applying the following patch: -patch -Np1 -i ../inetutils-&inetutils-version;-kernel-2.6-1.patch +patch -Np1 -i ../inetutils-&inetutils-version;-kernel-headers-1.patch 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 diff --git a/chapter06/man.xml b/chapter06/man.xml index 37ec8c8e9..a1cf37193 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -28,7 +28,7 @@ Glibc, Grep, Make, Sed. of Groff. In particular, man pages will now display using the full terminal width instead of being limited to 80 characters: -patch -Np1 -i ../man-&man-version;-80cols.patch +patch -Np1 -i ../man-&man-version;-80cols-1.patch The second is a sed substitution to add the -R switch to the PAGER variable so that escape sequences are diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml index d63b2f4b4..98864daa5 100644 --- a/chapter06/net-tools.xml +++ b/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, but it's up to the kernel to make the protocols available. -First fix a small syntax problem in the sources of the -mii-tool program: +This package also has issues with being compiled by GCC 3.4, which we +fix by applying the following patch: -patch -Np1 -i ../net-tools-&net-tools-version;-miitool-gcc33-1.patch +patch -Np1 -i ../net-tools-&net-tools-version;-gcc34-2.patch Net-tools has issues with the Linux 2.6 kernel series - fix these issues by applying the following patch: -patch -Np1 -i ../net-tools-&net-tools-version;-kernel-2.6-1.patch +patch -Np1 -i ../net-tools-&net-tools-version;-kernel-headers-1.patch Now prepare Net-tools for compilation (if you intend to accept the defaults, you can skip all the questions by running yes "" | diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml index 48efb8805..e4c8c46a6 100644 --- a/chapter06/readjusting.xml +++ b/chapter06/readjusting.xml @@ -52,7 +52,7 @@ this: -SPECFILE=/tools/lib/gcc-lib/*/*/specs && +SPECFILE=/tools/lib/gcc/*/*/specs && sed -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g' \ $SPECFILE > newspecfile && mv -f newspecfile $SPECFILE && diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index c9eac3bdf..3820bb7f3 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -24,7 +24,7 @@ as those given by the kernel when unusual things happen. Sysklogd has issues with the Linux 2.6 kernel series - fix these isues by applying the following patch: -patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_header.patch +patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel-headers-1.patch Compile Sysklogd: diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index b0d5ca805..8695e36ab 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -42,7 +42,7 @@ mkdir -p /var/lib/hwclock Util-linux has issues with the Linux 2.6 kernel series - fix these isues by applying the following patch: -patch -Np1 -i ../util-linux-&util-linux-version;-kernel-dj-2.6-1.patch +patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch Prepare Util-linux for compilation: diff --git a/general.ent b/general.ent index 454b9de3c..5f6bbbebf 100644 --- a/general.ent +++ b/general.ent @@ -1,14 +1,14 @@ - + - + @@ -32,7 +32,7 @@ - + -- cgit v1.2.3-54-g00ecf