diff options
| -rw-r--r-- | chapter01/changelog.xml | 5 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 2 | ||||
| -rw-r--r-- | chapter06/glibc-inst.xml | 4 | ||||
| -rw-r--r-- | chapter06/linuxthreadsmanpages-inst.xml | 16 | ||||
| -rw-r--r-- | chapter06/linuxthreadsmanpages.xml | 14 | ||||
| -rw-r--r-- | entities/glibc.ent | 2 | ||||
| -rw-r--r-- | entities/linuxthreadsmanpages.ent | 16 | ||||
| -rw-r--r-- | index.xml | 2 |
8 files changed, 10 insertions, 51 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c518fa37d..e389ec8ea 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -48,6 +48,11 @@ </itemizedlist> </para></listitem> +<listitem><para>December 31st, 2002 [gerard]: Chapter 06: Added second +Glibc installation at the end of the chapter. Removed the seperate +linuxthreads man-pages installation and moved that to the second Glibc +installation.</para></listitem> + <listitem><para>December 31st, 2002 [gerard]: Upgraded to Glibc-2.3.1</para></listitem> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index c5ba6389d..3cf4f1573 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -34,7 +34,6 @@ &c6-gettext; &c6-nettools; &c6-perl; -&c6-linuxthreadsmanpages; &c6-texinfo; &c6-autoconf; &c6-automake; @@ -63,6 +62,7 @@ &c6-sysvinit; &c6-tar; &c6-utillinux; +&c6-glibc-pass2; &c6-bootscripts; &c6-configure; diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index a7a757c87..4370cf1de 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -44,8 +44,8 @@ to create it first.</para> <para>The Linux Threads man pages are not going to be installed at this point because it requires a working Perl installation. We'll install Perl -later on in this chapter, so we'll come back to the Linux Threads man page -installation after that.</para> +later on in this chapter, and the man pages will be installed when Glibc is +installed for the second time at the end of this chapter.</para> <para>During the configure stage you will see the following warning:</para> diff --git a/chapter06/linuxthreadsmanpages-inst.xml b/chapter06/linuxthreadsmanpages-inst.xml deleted file mode 100644 index 012cb3966..000000000 --- a/chapter06/linuxthreadsmanpages-inst.xml +++ /dev/null @@ -1,16 +0,0 @@ -<sect2> -<title>Installation of Linux threads man pages</title> - -<para>Unpack the glibc-linuxthreads package and you'll notice that you end -up with two new directories. Enter the -<filename class="directory">linuxthreads</filename> directory, not the -<filename class="directory">linuxthreads_db</filename> directory.</para> - -<para>Install the Linux threads man pages by running the following -commands:</para> - -<para><screen><userinput>make -C man && -make -C man install</userinput></screen></para> - -</sect2> - diff --git a/chapter06/linuxthreadsmanpages.xml b/chapter06/linuxthreadsmanpages.xml deleted file mode 100644 index f955b73e6..000000000 --- a/chapter06/linuxthreadsmanpages.xml +++ /dev/null @@ -1,14 +0,0 @@ -<sect1 id="ch06-linuxthreadsmanpages"> -<title>Installing Linux threads-&linuxthreadsmanpages-version; man pages</title> -<?dbhtml filename="linuxthreadsmanpages.html" dir="chapter06"?> - -<screen>Estimated build time: &linuxthreadsmanpages-time; -Estimated required disk space: &linuxthreadsmanpages-compsize;</screen> - -&c6-linuxthreadsmanpages-inst; -&aa-linuxthreadsmanpages-desc; -&aa-linuxthreadsmanpages-dep; - -</sect1> - - diff --git a/entities/glibc.ent b/entities/glibc.ent index f9900182e..bb068bbca 100644 --- a/entities/glibc.ent +++ b/entities/glibc.ent @@ -5,6 +5,8 @@ <!ENTITY c6-glibc SYSTEM "../chapter06/glibc.xml"> <!ENTITY c6-glibc-inst SYSTEM "../chapter06/glibc-inst.xml"> <!ENTITY c6-glibc-exp SYSTEM "../chapter06/glibc-exp.xml"> +<!ENTITY c6-glibc-pass2 SYSTEM "../chapter06/glibc-pass2.xml"> +<!ENTITY c6-glibc-pass2-inst SYSTEM "../chapter06/glibc-pass2-inst.xml"> <!ENTITY c6-cf-glibc SYSTEM "../chapter06/config-glibc.xml"> <!ENTITY aa-glibc SYSTEM "../appendixa/glibc.xml"> diff --git a/entities/linuxthreadsmanpages.ent b/entities/linuxthreadsmanpages.ent deleted file mode 100644 index 6c060cacb..000000000 --- a/entities/linuxthreadsmanpages.ent +++ /dev/null @@ -1,16 +0,0 @@ -<!ENTITY c6-linuxthreadsmanpages SYSTEM "../chapter06/linuxthreadsmanpages.xml"> -<!ENTITY c6-linuxthreadsmanpages-inst SYSTEM "../chapter06/linuxthreadsmanpages-inst.xml"> - -<!ENTITY aa-linuxthreadsmanpages SYSTEM "../appendixa/linuxthreadsmanpages.xml"> -<!ENTITY aa-linuxthreadsmanpages-desc SYSTEM "../appendixa/linuxthreadsmanpages-desc.xml"> -<!ENTITY aa-linuxthreadsmanpages-dep SYSTEM "../appendixa/linuxthreadsmanpages-dep.xml"> - -<!ENTITY linuxthreadsmanpages-version "2.2.5"> -<!ENTITY linuxthreadsmanpages-depversion "2.2.5"> -<!ENTITY linuxthreadsmanpages-contversion "2.2.5"> -<!ENTITY linuxthreadsmanpages-size "164 KB"> -<!ENTITY linuxthreadsmanpages-dir "glibc-&glibc-version;/linuxthreads/man"> -<!ENTITY linuxthreadsmanpages-package "glibc-linuxthreads-&linuxthreadsmanpages-version;.tar.bz2"> - -<!ENTITY linuxthreadsmanpages-compsize "1.5 MB"> -<!ENTITY linuxthreadsmanpages-time "0.01 SBU"> @@ -73,7 +73,6 @@ <!ENTITY % nettools-entities SYSTEM "entities/nettools.ent"> <!ENTITY % patch-entities SYSTEM "entities/patch.ent"> <!ENTITY % perl-entities SYSTEM "entities/perl.ent"> -<!ENTITY % linuxthreadsmanpages-entities SYSTEM "entities/linuxthreadsmanpages.ent"> <!ENTITY % procinfo-entities SYSTEM "entities/procinfo.ent"> <!ENTITY % procps-entities SYSTEM "entities/procps.ent"> <!ENTITY % psmisc-entities SYSTEM "entities/psmisc.ent"> @@ -142,7 +141,6 @@ %nettools-entities; %patch-entities; %perl-entities; -%linuxthreadsmanpages-entities; %procinfo-entities; %procps-entities; %psmisc-entities; |