diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter04/coreutils-patch.xml | 10 | ||||
| -rw-r--r-- | chapter04/gcc-patch.xml | 8 | ||||
| -rw-r--r-- | chapter04/gcc.xml | 9 | ||||
| -rw-r--r-- | chapter04/packages.xml | 1 | ||||
| -rw-r--r-- | chapter06/coreutils-inst.xml | 11 | ||||
| -rw-r--r-- | chapter06/ncurses-inst.xml | 8 | ||||
| -rw-r--r-- | chapter06/procps-inst.xml | 8 | ||||
| -rw-r--r-- | entities/coreutils.ent | 6 |
10 files changed, 47 insertions, 28 deletions
@@ -9,7 +9,7 @@ XML to HTML: Create a directory in which you want to store the HTML files and cd into that directory. Now run: - mkdir -p chapter0{1,2,3,4,5,6,7,8,9} preface appendix{a,b} && + mkdir -p chapter0{1,2,3,4,5,6,7,8,9} preface appendixa && /usr/bin/openjade -t xml \ -d /usr/share/dsssl/docbook/html/lfs.dsl \ /usr/share/dsssl/docbook/dtds/decls/xml.dcl \ diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index de8f28fcd..197d88e76 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -68,6 +68,18 @@ </itemizedlist> </para></listitem> +<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Ncurses: +Fix up the symlinks so that they follow suit of other library symlinks. +No more weirdness here.</para></listitem> + +<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Procps: +Removed XSCPT="" cruft and it's corresponding paragraph. This stuff +isn't needed anymore.</para></listitem> + +<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Ncurses: +Pass --without-debug to the configure script. It seems to have gotten +lost at some point.</para></listitem> + <listitem><para>May 11th, 2003 [timothy]: Chapter 5 & 6 - Installing Bzip2, Installing Zlib: Modified build commands per bug #524.</para></listitem> diff --git a/chapter04/coreutils-patch.xml b/chapter04/coreutils-patch.xml index 2ebd8fa61..f0a559b74 100644 --- a/chapter04/coreutils-patch.xml +++ b/chapter04/coreutils-patch.xml @@ -1,3 +1,7 @@ -Coreutils Patch (&coreutils-patch-version;) - &coreutils-patch-size;: -<ulink url="&ftp;/coreutils-&coreutils-patch-version;.patch"/> -<ulink url="&http;/coreutils-&coreutils-patch-version;.patch"/> +Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;: +<ulink url="&ftp;/coreutils-&coreutils-uname-patch-version;.patch"/> +<ulink url="&http;/coreutils-&coreutils-uname-patch-version;.patch"/> + +Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;: +<ulink url="&ftp;/coreutils-&coreutils-hostname-patch-version;.patch"/> +<ulink url="&http;/coreutils-&coreutils-hostname-patch-version;.patch"/> diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml new file mode 100644 index 000000000..3102617ec --- /dev/null +++ b/chapter04/gcc-patch.xml @@ -0,0 +1,8 @@ +GCC Specs Patch: +<ulink url="&http;/gcc-3.2.3-specs-3.patch"/> + +GCC MMap Test Patch: +<ulink url="&http;/gcc-3.2.3-mmap_test.patch"/> + +GCC No Fixincludes Patch: +<ulink url="&http;/gcc-3.2.3-no_fixincludes.patch"/> diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml index bc27a4a88..e54f7f7c0 100644 --- a/chapter04/gcc.xml +++ b/chapter04/gcc.xml @@ -1,11 +1,2 @@ GCC (&gcc-version;) - &gcc-core-size;: <ulink url="http://freshmeat.net/projects/gcc/"/> - -GCC Specs Patch: -<ulink url="&http;/gcc-3.2.3-specs-3.patch"/> - -GCC MMap Test Patch: -<ulink url="&http;/gcc-3.2.3-mmap_test.patch"/> - -GCC No Fixincludes Patch: -<ulink url="&http;/gcc-3.2.3-no_fixincludes.patch"/> diff --git a/chapter04/packages.xml b/chapter04/packages.xml index 6be2490dc..31e839e6d 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -29,6 +29,7 @@ &c4-gawk; &c4-gawk-patch; &c4-gcc; +&c4-gcc-patch; &c4-gcc-2953; &c4-gettext; &c4-glibc; diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml index 1d2df60b2..f1225d77c 100644 --- a/chapter06/coreutils-inst.xml +++ b/chapter06/coreutils-inst.xml @@ -4,9 +4,16 @@ <title>Installation of Coreutils</title> <para>Normally the functionality of uname is somewhat broken, in that -the -p switch always returns "unknown". This patch fixes that behaviour:</para> +the -p switch always returns "unknown". This patch fixes that behaviour +for Intel architectures:</para> -<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-patch-version;.patch</userinput></screen></para> +<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch</userinput></screen></para> + +<para>We do not want Coreutils to install it's version of the hostname +binary, because it is inferior to the version provided by Net-tools. +Prevent the installation of hostname with this patch:</para> + +<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-hostname-patch-version;.patch</userinput></screen></para> <para>Prepare Coreutils to be compiled:</para> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index 65856f312..8a56f31e4 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -7,7 +7,8 @@ <para>Prepare Ncurses to be compiled:</para> -<para><screen><userinput>./configure --prefix=/usr --with-shared</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --with-shared && + --without-debug</userinput></screen></para> <para>Continue with compiling the package:</para> @@ -30,8 +31,7 @@ where they're expected to reside:</para> <filename>/lib</filename>, a few symlinks are currently pointing towards non-existing files. Recreate those symlinks:</para> -<para><screen><userinput>ln -sf libncurses.a /usr/lib/libcurses.a && -ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so && -ln -sf ../../lib/libncurses.so.5 /usr/lib/libcurses.so</userinput></screen></para> +<para><screen><userinput>ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so && +ln -sf libncurses.so /usr/lib/libcurses.so</userinput></screen></para> </sect2> diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 619457799..c9b8fd8d5 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -16,13 +16,7 @@ the patch:</para> <para>Finish installing the package:</para> -<para><screen><userinput>make XSCPT="" install</userinput></screen></para> - -<para>The <emphasis>XSCPT</emphasis> option will set the Makefile -variable XSCPT to an empty value so that XConsole installation is -disabled. Otherwise, <userinput>make install</userinput> tries to -copy the file XConsole to /usr/X11R6/lib/X11/app-defaults. That -directory does not exist because X is not installed.</para> +<para><screen><userinput>make install</userinput></screen></para> </sect2> diff --git a/entities/coreutils.ent b/entities/coreutils.ent index b1a452a4d..6ca7e383c 100644 --- a/entities/coreutils.ent +++ b/entities/coreutils.ent @@ -19,8 +19,10 @@ <!ENTITY coreutils-size "1,831 KB"> <!ENTITY coreutils-dir "coreutils-&coreutils-version;"> <!ENTITY coreutils-package "coreutils-&coreutils-version;.tar.bz2"> -<!ENTITY coreutils-patch-size "1 KB"> -<!ENTITY coreutils-patch-version "5.0-uname"> +<!ENTITY coreutils-uname-patch-size "1 KB"> +<!ENTITY coreutils-uname-patch-version "5.0-uname"> +<!ENTITY coreutils-hostname-patch-size "1 KB"> +<!ENTITY coreutils-hostname-patch-version "5.0-hostname"> <!ENTITY coreutils-compsize-static "17 MB"> <!ENTITY coreutils-time-static "0.39 SBU"> |