aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter05/adjusting.xml4
-rw-r--r--chapter05/bash.xml4
-rw-r--r--chapter05/binutils-pass1.xml2
-rw-r--r--chapter05/binutils-pass2.xml2
-rw-r--r--chapter05/expect.xml2
-rw-r--r--chapter05/flex.xml4
-rw-r--r--chapter05/gcc-pass1.xml4
-rw-r--r--chapter05/gcc-pass2.xml4
-rw-r--r--chapter05/glibc.xml4
-rw-r--r--chapter05/stripping.xml4
-rw-r--r--chapter05/util-linux.xml2
-rw-r--r--chapter06/sysvinit.xml6
-rw-r--r--chapter07/network.xml1
13 files changed, 36 insertions, 7 deletions
diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index c3d584ab2..ee4db51d6 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -20,6 +20,8 @@ sed 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \
mv -f tempspecfile $SPECFILE &&
unset SPECFILE</userinput></screen>
+<para>Make clean-up:</para>
+
<screen><userinput>rm -f /tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen>
<para>Test the tools:</para>
@@ -32,6 +34,8 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
+<para>Remove the test files:</para>
+
<screen><userinput>rm dummy.c a.out</userinput></screen>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 323dcd3ff..130fb3798 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -21,6 +21,8 @@
<sect2 role="installation">
<title>Installation of Bash</title>
+<para>Apply a patch:</para>
+
<screen><userinput>patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch</userinput></screen>
<para>Prepare Bash for compilation:</para>
@@ -38,6 +40,8 @@
<screen><userinput>make install</userinput></screen>
+<para>Create a symlink:</para>
+
<screen><userinput>ln -s bash /tools/bin/sh</userinput></screen>
</sect2>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 28b98fb59..614db83b6 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -26,6 +26,8 @@ the problem:</para>
<screen><userinput>patch -Np1 -i ../binutils-&binutils-version;-fix_strip-1.patch</userinput></screen>
+<para>Create a buil dir:</para>
+
<screen><userinput>mkdir ../binutils-build
cd ../binutils-build</userinput></screen>
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index a6082a5bc..54f365dc9 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -40,6 +40,8 @@ cd ../binutils-build</userinput></screen>
<screen><userinput>make</userinput></screen>
+<para>Test the results:</para>
+
<screen><userinput>make -k check</userinput></screen>
<para>Except for a few known failures, the binutils tests should all pass. The
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 6ac5cdef0..f5b0bbd25 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -22,6 +22,8 @@
<sect2 role="installation">
<title>Installation of Expect</title>
+<para>Apply a patch:</para>
+
<screen><userinput>patch -Np1 -i ../expect-&expect-version;-spawn-1.patch</userinput></screen>
<para>Now prepare Expect for compilation:</para>
diff --git a/chapter05/flex.xml b/chapter05/flex.xml
index 6a5f25daf..f86853a2f 100644
--- a/chapter05/flex.xml
+++ b/chapter05/flex.xml
@@ -20,8 +20,12 @@
<sect2 role="installation">
<title>Installation of Flex</title>
+<para>Apply a patch:</para>
+
<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian_fixes-2.patch</userinput></screen>
+<para>Touch the man-page:</para>
+
<screen><userinput>touch doc/flex.1</userinput></screen>
<para>Now prepare Flex for compilation:</para>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 94cbcb91b..c878bd4b2 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -20,6 +20,8 @@
<sect2 role="installation">
<title>Installation of GCC</title>
+<para>Create a build dir:</para>
+
<screen><userinput>mkdir ../gcc-build
cd ../gcc-build</userinput></screen>
@@ -38,6 +40,8 @@ cd ../gcc-build</userinput></screen>
<screen><userinput>make install</userinput></screen>
+<para>Create a symlink:</para>
+
<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
</sect2>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index e5dd780b6..61bd3e9b6 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -24,6 +24,8 @@
<screen><userinput>expect -c "spawn ls"</userinput></screen>
+<para>Apply two patches:</para>
+
<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch
patch -Np1 -i ../gcc-&gcc-version;-specs-2.patch</userinput></screen>
@@ -44,6 +46,8 @@ cd ../gcc-build</userinput></screen>
<screen><userinput>make</userinput></screen>
+<para>Test the results</para>
+
<screen><userinput>make -k check</userinput></screen>
<para>To get a summary of the test suite results, run this:</para>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index a3bea4019..649eb9584 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -20,6 +20,8 @@
<sect2 role="installation">
<title>Installation of Glibc</title>
+<para>Create a build dir:</para>
+
<screen><userinput>mkdir ../glibc-build
cd ../glibc-build</userinput></screen>
@@ -34,6 +36,8 @@ cd ../glibc-build</userinput></screen>
<screen><userinput>make</userinput></screen>
+<para>Test the results:</para>
+
<screen><userinput>make check</userinput></screen>
<para>For a discussion of test failures that are of particular
diff --git a/chapter05/stripping.xml b/chapter05/stripping.xml
index 586df1089..ed53adc63 100644
--- a/chapter05/stripping.xml
+++ b/chapter05/stripping.xml
@@ -7,9 +7,13 @@
<title>Stripping</title>
<?dbhtml filename="stripping.html"?>
+<para>Strip the programs and libraries:</para>
+
<screen><userinput>strip --strip-debug /tools/lib/*
strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
+<para>Remove the documentation:</para>
+
<screen><userinput>rm -rf /tools/{doc,info,man}</userinput></screen>
</sect1>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index 50284817e..ca6368c9a 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -20,6 +20,8 @@
<sect2 role="installation">
<title>Installation of Util-linux</title>
+<para>Issue a sed sustitution:</para>
+
<screen><userinput>sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen>
<para>Prepare Util-linux for compilation:</para>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 8148dc672..34f59ff95 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -10,8 +10,6 @@
<indexterm zone="ch-system-sysvinit"><primary sortas="a-Sysvinit">Sysvinit</primary></indexterm>
<sect2 role="package"><title/>
-<para>The Sysvinit package contains programs for controlling the startup,
-running, and shutdown of your system.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
@@ -19,10 +17,6 @@ running, and shutdown of your system.</para>
<seglistitem><seg>0.1 SBU</seg><seg> 0.9 MB</seg></seglistitem>
</segmentedlist>
-<segmentedlist>
-<segtitle>Sysvinit installation depends on</segtitle>
-<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make</seg></seglistitem>
-</segmentedlist>
</sect2>
<sect2 role="installation">
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 8d19791dd..068ba157c 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -29,7 +29,6 @@ EOF</userinput></screen>
<sect2 id="resolv.conf">
<title>Creating the /etc/resolv.conf file</title>
-<indexterm zone="resolv.conf"><primary sortas="e-/etc/resolv.conf">/etc/resolv.conf</primary></indexterm>
<para>Create the file by running the following:</para>