diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml
index 6361607ab..fd1a3692e 100644
--- a/chapter05/introduction.xml
+++ b/chapter05/introduction.xml
@@ -1,66 +1,70 @@
-
%general-entities;
]>
+
-Introduction
-
+
-This chapter shows how to compile and install a minimal Linux
-system. This system will contain just enough tools to start
-constructing the final LFS system in and allow a working environment
-with more user convenience than a minimum environment would.
+ Introduction
-There are two steps in building this minimal system. The first
-step is to build a new and host-independent toolchain (compiler,
-assembler, linker, libraries, and a few useful utilities). The second
-step uses this toolchain to build the other essential tools.
+ This chapter shows how to compile and install a minimal Linux system.
+ This system will contain just enough tools to start constructing the final
+ LFS system in and allow a working
+ environment with more user convenience than a minimum environment would.
-The files compiled in this chapter will be installed under the
-$LFS/tools directory to keep
-them separate from the files installed in the next chapter and the
-host production directories. Since the packages compiled here are
-temporary, we do not want them to pollute the soon-to-be LFS
-system.
+ There are two steps in building this minimal system. The first step
+ is to build a new and host-independent toolchain (compiler, assembler,
+ linker, libraries, and a few useful utilities). The second step uses this
+ toolchain to build the other essential tools.
-Before issuing the build instructions for a package, the package
-should be unpacked as user lfs, and a
-cd into the created directory should be performed. The build
-instructions assume that the bash shell is in use.
+ The files compiled in this chapter will be installed under the
+ $LFS/tools directory to keep them
+ separate from the files installed in the next chapter and the host
+ production directories. Since the packages compiled here are temporary,
+ we do not want them to pollute the soon-to-be LFS system.
-Several of the packages are patched before compilation, but only
-when the patch is needed to circumvent a problem. A patch is often
-needed in both this and the next chapter, but sometimes in only one or
-the other. Therefore, do not be concerned if instructions for a downloaded
-patch seem to be missing. Warning messages about
-offset or fuzz may
-also be encountered when applying a patch. Do not worry about these
-warnings, as the patch was still successfully applied.
+
+ Before issuing the build instructions for a package, the package
+ should be unpacked as user lfs,
+ and a cd into the created directory should be performed.
+ The build instructions assume that the bash shell is
+ in use.
+
-During the compilation of most packages, there will be several
-warnings that scroll by on the screen. These are normal and can safely
-be ignored. These warnings are as they appear—warnings about
-deprecated, but not invalid, use of the C or C++ syntax. C standards
-change fairly often, and some packages still use the older standard.
-This is not a problem, but does prompt the warning.
+ Several of the packages are patched before compilation, but only when
+ the patch is needed to circumvent a problem. A patch is often needed in both
+ this and the next chapter, but sometimes in only one or the other. Therefore,
+ do not be concerned if instructions for a downloaded patch seem to be missing.
+ Warning messages about offset or fuzz
+ may also be encountered when applying a patch. Do not worry about these
+ warnings, as the patch was still successfully applied.
-After installing each package, delete its source and build
-directories, unless specifically instructed otherwise. Deleting the
-sources prevents mis-configuration when the same package is reinstalled later.
-Only three of the packages need to retain the source and build directories in
-order for their contents to be used by later commands. Pay special attention to
-these reminders.
+ During the compilation of most packages, there will be several warnings
+ that scroll by on the screen. These are normal and can safely be ignored.
+ These warnings are as they appear—warnings about deprecated, but not
+ invalid, use of the C or C++ syntax. C standards change fairly often, and
+ some packages still use the older standard. This is not a problem, but does
+ prompt the warning.
-Check one last time that the LFS environment
-variable is set up properly:
+
+ After installing each package, delete its source and build directories,
+ unless specifically instructed otherwise. Deleting the sources prevents
+ mis-configuration when the same package is reinstalled later. Only three
+ of the packages need to retain the source and build directories in order
+ for their contents to be used by later commands. Pay special attention to
+ these reminders.
+
+
+ Check one last time that the LFS environment
+ variable is set up properly:
echo $LFS
-Make sure the output shows the path to the LFS partition's mount
-point, which is /mnt/lfs, using
-our example.
+ Make sure the output shows the path to the LFS partition's mount
+ point, which is /mnt/lfs, using
+ our example.
-
diff --git a/chapter05/linux-libc-headers.xml b/chapter05/linux-libc-headers.xml
index 7b1fecc7e..b30286273 100644
--- a/chapter05/linux-libc-headers.xml
+++ b/chapter05/linux-libc-headers.xml
@@ -1,59 +1,71 @@
-
%general-entities;
]>
+
-
diff --git a/chapter05/m4.xml b/chapter05/m4.xml
index 3f3f23da1..289710f6b 100644
--- a/chapter05/m4.xml
+++ b/chapter05/m4.xml
@@ -1,52 +1,69 @@
-
%general-entities;
]>
+
-M4-&m4-version;
-
+
-
-M4
-tools
+ M4-&m4-version;
-
-
+
+ M4
+ tools
+
-
-&buildtime;
-&diskspace;
-0.1 SBU2.8 MB
-
+
+
-
+
-
+
+ &buildtime;
+ &diskspace;
-
-Installation of M4
+
+ 0.1 SBU
+ 2.8 MB
+
+
-Prepare M4 for compilation:
+
+
+
+
+
+ Installation of M4
+
+ Prepare M4 for compilation:
./configure --prefix=/tools
-Compile the package:
+ Compile the package:
make
-To test the results, issue: make check.
+ To test the results, issue:
+ make check.
-Install the package:
+ Install the package:
make install
-
+
-
-Details on this package are located in
-
+
+
+
+ Details on this package are located in
+
+
+
-
diff --git a/chapter05/make.xml b/chapter05/make.xml
index d2a6946b3..7c3f04103 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -1,52 +1,68 @@
-
%general-entities;
]>
-Make-&make-version;
-
+
-
-Make
-tools
+ Make-&make-version;
-
-
+
+ Make
+ tools
+
-
-&buildtime;
-&diskspace;
-0.2 SBU7.1 MB
-
+
+
-
+
-
+
+ &buildtime;
+ &diskspace;
-
-Installation of Make
+
+ 0.2 SBU
+ 7.1 MB
+
+
-Prepare Make for compilation:
+
+
+
+
+
+ Installation of Make
+
+ Prepare Make for compilation:
./configure --prefix=/tools
-Compile the package:
+ Compile the package:
make
-To test the results, issue: make check.
+ To test the results, issue:
+ make check.
-Install the package:
+ Install the package:
make install
-
+
-
-Details on this package are located in
-
+
+
+
+ Details on this package are located in
+
+
+
-
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 9893dfaf8..a433b07f9 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -1,73 +1,94 @@
-
%general-entities;
]>
+
-Ncurses-&ncurses-version;
-
+
-
-Ncurses
-tools
+ Ncurses-&ncurses-version;
-
-
+
+ Ncurses
+ tools
+
-
-&buildtime;
-&diskspace;
-0.7 SBU27.5 MB
-
+
+
-
+
-
+
+ &buildtime;
+ &diskspace;
-
-Installation of Ncurses
+
+ 0.7 SBU
+ 27.5 MB
+
+
-Prepare Ncurses for compilation:
+
+
+
+
+
+ Installation of Ncurses
+
+ Prepare Ncurses for compilation:
./configure --prefix=/tools --with-shared \
--without-debug --without-ada --enable-overwrite
-The meaning of the configure options:
+
+ The meaning of the configure options:
-
-
---without-ada
-This ensures that Ncurses does not build support for the Ada
-compiler which may be present on the host but will not be available once we
-enter the chroot environment.
-
+
+ --without-ada
+
+ This ensures that Ncurses does not build support for the Ada
+ compiler which may be present on the host but will not be available
+ once we enter the chroot environment.
+
+
-
---enable-overwrite
-This tells Ncurses to install its header files into
-/tools/include, instead of
-/tools/include/ncurses, to
-ensure that other packages can find the Ncurses headers
-successfully.
-
-
+
+ --enable-overwrite
+
+ This tells Ncurses to install its header files into
+ /tools/include, instead of
+ /tools/include/ncurses, to
+ ensure that other packages can find the Ncurses headers
+ successfully.
+
+
-Compile the package:
+
+
+ Compile the package:
make
-This package does not come with a test suite.
+ This package does not come with a test suite.
-Install the package:
+ Install the package:
make install
-
+
-
-Details on this package are located in
-
+
+
+
+ Details on this package are located in
+
+
+
-
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index 531c4124a..47cec290a 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -1,56 +1,72 @@
-
%general-entities;
]>
+
-Patch-&patch-version;
-
+
-
-Patch
-tools
+ Patch-&patch-version;
-
-
+
+ Patch
+ tools
+
-
-&buildtime;
-&diskspace;
-0.1 SBU1.5 MB
-
+
+
-
+
-
+
+ &buildtime;
+ &diskspace;
-
-Installation of Patch
+
+ 0.1 SBU
+ 1.5 MB
+
+
-Prepare Patch for compilation:
+
+
+
+
+
+ Installation of Patch
+
+ Prepare Patch for compilation:
CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/tools
-The preprocessor flag -D_GNU_SOURCE is
-only needed on the PowerPC platform. It can be left out on other
-architectures.
+ The preprocessor flag -D_GNU_SOURCE is
+ only needed on the PowerPC platform. It can be left out on other
+ architectures.
-Compile the package:
+ Compile the package:
make
-This package does not come with a test suite.
+ This package does not come with a test suite.
-Install the package:
+ Install the package:
make install
-
+
-
-Details on this package are located in
-
+
+
+
+ Details on this package are located in
+
+
+
-
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index e020e4e80..97b84984d 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -1,77 +1,96 @@
-
%general-entities;
]>
+
-Perl-&perl-version;
-
+
-
-Perl
-tools
+ Perl-&perl-version;
-
-
+
+ Perl
+ tools
+
-
-&buildtime;
-&diskspace;
-0.8 SBU79.8 MB
-
+
+
-
+
-
+
+ &buildtime;
+ &diskspace;
-
-Installation of Perl
+
+ 0.8 SBU
+ 79.8 MB
+
+
-First adapt some hard-wired paths to the C library by applying
-the following patch:
+
+
+
+
+
+ Installation of Perl
+
+ First adapt some hard-wired paths to the C library by applying
+ the following patch:
patch -Np1 -i ../&perl-libc-patch;
-Prepare Perl for compilation (make sure to get the
-'Data/Dumper Fcntl IO POSIX' part of the command correct—they are all
-letters):
+ Prepare Perl for compilation (make sure to get the
+ 'Data/Dumper Fcntl IO POSIX' part of the command correct—they are all
+ letters):
./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX'
-The meaning of the configure options:
+
+ The meaning of the configure options:
-
-
--Dstatic_ext='Data/Dumper Fcntl IO POSIX'
-This tells Perl to build the minimum set of static
-extensions needed for installing and testing the Coreutils package in
-the next chapter.
-
-
+
+ -Dstatic_ext='Data/Dumper Fcntl IO POSIX'
+
+ This tells Perl to build the minimum set of static extensions
+ needed for installing and testing the Coreutils package in the next
+ chapter.
+
+
-Only a few of the utilities contained in this package need to be
-built:
+
+
+ Only a few of the utilities contained in this package need to be
+ built:
make perl utilities
-Although Perl comes with a test suite, it is not recommended to
-run it at this point. Only part of Perl was built and running
-make test now will cause the rest of Perl to be
-built as well, which is unnecessary at this point. The test suite can
-be run in the next chapter if desired.
+ Although Perl comes with a test suite, it is not recommended to
+ run it at this point. Only part of Perl was built and running
+ make test now will cause the rest of Perl to be
+ built as well, which is unnecessary at this point. The test suite can
+ be run in the next chapter if desired.
-Install these tools and their libraries:
+ Install these tools and their libraries:
cp -v perl pod/pod2man /tools/bin
mkdir -pv /tools/lib/perl5/&perl-version;
cp -Rv lib/* /tools/lib/perl5/&perl-version;
-
+
-
-Details on this package are located in
-
+
+
+
+ Details on this package are located in
+
+
+
-
diff --git a/general.ent b/general.ent
index 977fa251f..cffb90e63 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
-
+
+