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 +Make clean-up: + rm -f /tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h} Test the tools: @@ -32,6 +34,8 @@ readelf -l a.out | grep ': /tools' [Requesting program interpreter: /tools/lib/ld-linux.so.2] +Remove the test files: + rm dummy.c a.out 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 @@ Installation of Bash +Apply a patch: + patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch Prepare Bash for compilation: @@ -38,6 +40,8 @@ make install +Create a symlink: + ln -s bash /tools/bin/sh 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: patch -Np1 -i ../binutils-&binutils-version;-fix_strip-1.patch +Create a buil dir: + mkdir ../binutils-build cd ../binutils-build 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 make +Test the results: + make -k check 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 @@ Installation of Expect +Apply a patch: + patch -Np1 -i ../expect-&expect-version;-spawn-1.patch Now prepare Expect for compilation: 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 @@ Installation of Flex +Apply a patch: + patch -Np1 -i ../flex-&flex-version;-debian_fixes-2.patch +Touch the man-page: + touch doc/flex.1 Now prepare Flex for compilation: 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 @@ Installation of GCC +Create a build dir: + mkdir ../gcc-build cd ../gcc-build @@ -38,6 +40,8 @@ cd ../gcc-build make install +Create a symlink: + ln -s gcc /tools/bin/cc 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 @@ expect -c "spawn ls" +Apply two patches: + patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch patch -Np1 -i ../gcc-&gcc-version;-specs-2.patch @@ -44,6 +46,8 @@ cd ../gcc-build make +Test the results + make -k check To get a summary of the test suite results, run this: 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 @@ Installation of Glibc +Create a build dir: + mkdir ../glibc-build cd ../glibc-build @@ -34,6 +36,8 @@ cd ../glibc-build make +Test the results: + make check 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 @@ Stripping +Strip the programs and libraries: + strip --strip-debug /tools/lib/* strip --strip-unneeded /tools/{,s}bin/* +Remove the documentation: + rm -rf /tools/{doc,info,man} 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 @@ Installation of Util-linux +Issue a sed sustitution: + sed -i 's@/usr/include@/tools/include@g' configure Prepare Util-linux for compilation: 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 @@ Sysvinit -<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 -/etc/resolv.conf Create the file by running the following: