diff --git a/appendixa/coreutils-desc.xml b/appendixa/coreutils-desc.xml
index 3381ca2ff..27d89d8c9 100644
--- a/appendixa/coreutils-desc.xml
+++ b/appendixa/coreutils-desc.xml
@@ -2,8 +2,6 @@
Descriptions
-Not yet fully checked.
-
Program file descriptions
basename
@@ -123,6 +121,9 @@ standard output.
hostid prints the numeric identifier (in hexadecimal) for the current
host.
+hostname
+hostname reports or sets the name of the current host.
+
id
id prints the effective user and group IDs of the current
user or a given user.
@@ -134,6 +135,9 @@ their owner and group.
join
join joins lines of two files on a common field.
+kill
+kill terminates the given process.
+
ln
ln makes hard or soft (symbolic) links between files.
@@ -210,6 +214,9 @@ function).
seq prints numbers in a certain range with a certain
increment.
+sha1sum
+sha1sum prints or checks 160-bit SHA1checksums.
+
shred
shred deletes a file securely, overwriting it first so that its
contents can't be recovered.
diff --git a/appendixa/coreutils-shortdesc.xml b/appendixa/coreutils-shortdesc.xml
index 711786ba9..6cdb62a88 100644
--- a/appendixa/coreutils-shortdesc.xml
+++ b/appendixa/coreutils-shortdesc.xml
@@ -1,7 +1,5 @@
Contents of Coreutils
-Not yet fully checked.
-
The Coreutils package contains a whole series of basic shell utilities.
Coreutils installs the following:
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c990e4a38..27cbb1735 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -82,6 +82,22 @@
+August 11th, 2003 [alex]: Chapter 05 - From Binutils Pass 1 to
+Findutils: several small textual adjustments. For the second passes not giving
+the contents and dependencies.
+
+August 11th, 2003 [alex]: Chapter 04 - Listing for GCC separate
+core, g++, and testsuite tarballs.
+
+August 11th, 2003 [alex]: Chapter 04 - Suppressed the
+mention of a wget script.
+
+August 9th, 2003 [alex]: Chapter 05 - Binutils Pass2 and GCC
+Pass 2: integrated some text from the pure-lfs hint.
+
+August 8th, 2003 [alex]: Chapter 05 - Tcl, Expect, and DejaGNU:
+added some text.
+
August 6th, 2003 [gerard]: Applied Alex Groenewoud's patch
that adds Appendix B, providing a list of all installed programs and
libraries plus references to the installation pages.
diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml
index ed8926d11..00454c451 100644
--- a/chapter04/binutils.xml
+++ b/chapter04/binutils.xml
@@ -1,3 +1,2 @@
Binutils (&binutils-version;) - &binutils-size;:
-
diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml
index e54f7f7c0..694d26a6c 100644
--- a/chapter04/gcc.xml
+++ b/chapter04/gcc.xml
@@ -1,2 +1,8 @@
-GCC (&gcc-version;) - &gcc-core-size;:
+GCC-core (&gcc-version;) - &gcc-core-size;:
+
+
+GCC-g++ (&gcc-version;) - &gcc-gpp-size;:
+
+
+GCC-testsuite (&gcc-version;) - &gcc-testsuite-size;:
diff --git a/chapter04/introduction.xml b/chapter04/introduction.xml
index 859b5dbc0..3e82c190f 100644
--- a/chapter04/introduction.xml
+++ b/chapter04/introduction.xml
@@ -9,16 +9,18 @@ them. Feel free to try out newer versions, but if you experience problems
with those versions, please try the recommended version first before
sending bug reports.
-All the URL's, when possible, refer to the project's page at
+All the URLs, when possible, refer to the project's page at
Freshmeat.net. The Freshmeat
pages will give you easy access to the official download sites as well as
-project websites, mailinglists, FAQ's, Changelogs and more.
+project websites, mailinglists, FAQs, Changelogs and more.
+For your convenience the top of the list contains a link to a file
you can use with the wget
program. Using this file and the wget program will
make it easy to download all the files at once, rather than downloading each
and every individual file manually.
+]]>
diff --git a/chapter05/binutils-pass2-inst.xml b/chapter05/binutils-pass2-inst.xml
index 9c0db80e6..939e83460 100644
--- a/chapter05/binutils-pass2-inst.xml
+++ b/chapter05/binutils-pass2-inst.xml
@@ -1,7 +1,7 @@
-Installation of Binutils
+Re-installation of Binutils
First create a separate build directory again:
@@ -13,11 +13,14 @@ cd ../binutils-build
../binutils-&binutils-version;/configure --prefix=/stage1 \
--enable-shared --with-lib-path=/stage1/lib
+Before starting to build Binutils, remember to unset any environment
+variables that override the default optimization flags.
+
Compile the package:
make
-Test the package (nothing should fail here):
+Test the results (nothing should fail here):
make check
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 8cfcb96cc..e443af968 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -5,8 +5,6 @@
Estimated build time: &binutils-pass1-time-stage1;
Estimated required disk space: &binutils-pass1-compsize-stage1;
-&aa-binutils-shortdesc;
-&aa-binutils-dep;
&c5-binutils-pass2-inst;
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
index de0ee1c43..bdfb951ab 100644
--- a/chapter05/bzip2-inst.xml
+++ b/chapter05/bzip2-inst.xml
@@ -3,13 +3,10 @@
Installation of Bzip2
-Since the Bzip2 package has no configure script we can't prepare it
-for compilation. Instead we just run the make
-program and start compiling, with a few variables changed to suit our
-environment:
+The Bzip2 package doesn't contain a configure
+script. Compile and install it with a straightforward:
-make
-make PREFIX=/stage1 install
+make PREFIX=/stage1 install
diff --git a/chapter05/coreutils-inst.xml b/chapter05/coreutils-inst.xml
index 40d5f823e..455185064 100644
--- a/chapter05/coreutils-inst.xml
+++ b/chapter05/coreutils-inst.xml
@@ -3,10 +3,21 @@
Installation of Coreutils
-./configure --prefix=/stage1
-make
-make RUN_EXPENSIVE_TESTS=yes check
-make install
+Prepare Coreutils to be compiled:
+
+./configure --prefix=/stage1
+
+Compile the package:
+
+make
+
+Test the results thoroughly:
+
+make RUN_EXPENSIVE_TESTS=yes check
+
+And install the package:
+
+make install
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 7ccfe6e1a..43180b86f 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -2,6 +2,11 @@
Installing Coreutils-&coreutils-version;
+Estimated build time: &coreutils-time;
+Estimated required disk space: &coreutils-compsize;
+
+&aa-coreutils-shortdesc;
+&aa-coreutils-dep;
&c5-coreutils-inst;
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index cbfbb0264..edaf67440 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -5,9 +5,15 @@
Prepare Diffutils to be compiled:
-./configure --prefix=/stage1
-make
-make install
+./configure --prefix=/stage1
+
+Compile the package:
+
+make
+
+And install it:
+
+make install
diff --git a/chapter05/expect-inst.xml b/chapter05/expect-inst.xml
index f4f24687b..243e078f7 100644
--- a/chapter05/expect-inst.xml
+++ b/chapter05/expect-inst.xml
@@ -23,7 +23,7 @@ make install
Note that also here some of the tests might fail, and that this is not a
problem here either.
-You can now remove the build directories of both Tcl and Expect.
+You can now remove the source directories of both Tcl and Expect.
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index f654dc521..650a7caf8 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -5,9 +5,18 @@
Prepare Findutils to be compiled:
-./configure --prefix=/stage1
-make
-make check
-make install
+./configure --prefix=/stage1
+
+Compile the package:
+
+make
+
+Test the results:
+
+make check
+
+And install the package:
+
+make install
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index 203aec063..b60048eb1 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -7,11 +7,11 @@
./configure --prefix=/stage1
-Continue with compiling the package:
+Compile the package:
make
-And finish off installing the package:
+And install it:
make install
diff --git a/chapter05/gcc-pass1-inst.xml b/chapter05/gcc-pass1-inst.xml
index e9a649776..d7f98aa0a 100644
--- a/chapter05/gcc-pass1-inst.xml
+++ b/chapter05/gcc-pass1-inst.xml
@@ -3,8 +3,8 @@
Installation of GCC
-We won't be needing a C++ compiler until the next chapter. So, only
-the gcc-core tarball needs to be unpacked at this time.
+Unpack only the GCC-core tarball, as we won't be needing a C++ compiler
+for the moment.
This package is known to behave badly when you have changed its
default optimization flags (including the -march and -mcpu options).
@@ -42,13 +42,13 @@ seem counter-intuitive at first. But using it allows the building of
libgcc_s.so.1 and libgcc_eh.a, and
having libgcc_eh.a available ensures that the configure
script for Glibc (the next package we compile) produces the proper results.
-Please note that the gcc binaries will still be linked
+Note that the gcc binaries will still be linked
statically, as this is controlled by the -static
value of BOOT_LDFLAGS further on.
---enable-languages=c: This will build
-only the C compiler from the GCC package. We won't be needing anything else
-during this chapter.
+--enable-languages=c: This option
+ensures that only the C compiler is built. The option is only needed when you
+have downloaded and unpacked the full GCC tarball.
Continue with compiling the package:
diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml
index e21cda452..ce88c062a 100644
--- a/chapter05/gcc-pass2-inst.xml
+++ b/chapter05/gcc-pass2-inst.xml
@@ -1,7 +1,11 @@
-Installation of GCC
+Re-installation of GCC
+
+Unpack all three GCC tarballs in one and the same working directory.
+They will all unfold into a single gcc-&gcc-version;/
+subdir.
First correct two problems and make an essential adjustment:
@@ -21,6 +25,9 @@ binaries created during the build will link against the new Glibc.
mkdir ../gcc-build
cd ../gcc-build
+Before starting to build GCC, remember to unset any environment
+variables that override the default optimization flags.
+
Now prepare GCC to be compiled:
../gcc-&gcc-version;/configure --prefix=/stage1 \
@@ -36,7 +43,7 @@ cd ../gcc-build
as the compiler we're using to compile this GCC has been built from the exact
same sources.
-Test the package:
+Test the results:
make -k check
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index b55c5e5d6..58d6b7672 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -5,8 +5,6 @@
Estimated build time: &gcc-time-pass1-stage1;
Estimated required disk space: &gcc-compsize-pass1-stage1;
-&aa-gcc-shortdesc;
-&aa-gcc-dep;
&c5-gcc-pass2-inst;
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
index bd81361f5..bd0c4964e 100644
--- a/chapter05/gzip-inst.xml
+++ b/chapter05/gzip-inst.xml
@@ -3,9 +3,17 @@
Installation of Gzip
-./configure --prefix=/stage1
-make
-make install
+Prepare Gzip to be compiled:
+
+./configure --prefix=/stage1
+
+Compile the package:
+
+make
+
+And install it:
+
+make install
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index 45a4fe5fb..2ba8db0e2 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -16,7 +16,7 @@ scripts now contain no mention of /lib,
From this point onwards everything will link only
against the libraries in /stage1/lib.
-You can now remove the binutils-* directories.
+You can now remove Binutils' build and source directories.
diff --git a/chapter05/tcl-inst.xml b/chapter05/tcl-inst.xml
index e2e5da3a5..5aa7a53ef 100644
--- a/chapter05/tcl-inst.xml
+++ b/chapter05/tcl-inst.xml
@@ -26,9 +26,9 @@ suites.
Make a link:
ln -s tclsh8.4 /stage1/bin/tclsh
-Do not remove the
-tcl&tcl-version; directory yet, as the next package will
-need its internal headers.
+Do not remove the
+tcl&tcl-version; source directory yet, as the next package
+will need its internal headers.
diff --git a/entities/gcc.ent b/entities/gcc.ent
index 4702610db..2678ac9ed 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -21,11 +21,13 @@
-
+
+
-
+
+