r6694 - in branches/cross-lfs/BOOK: . boot/common chroot/common final-system/common final-system/mips final-system/mips64 final-system/mips64-64 final-system/multilib final-system/sparc final-system/sparc64 final-system/sparc64-64 final-system/x86 final-system/x86_64 final-system/x86_64-64 introduction/common materials/common temp-tools/common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue Aug 16 11:48:42 PDT 2005


Author: manuel
Date: 2005-08-16 12:48:37 -0600 (Tue, 16 Aug 2005)
New Revision: 6694

Modified:
   branches/cross-lfs/BOOK/boot/common/devices.xml
   branches/cross-lfs/BOOK/chroot/common/devices.xml
   branches/cross-lfs/BOOK/final-system/common/bash.xml
   branches/cross-lfs/BOOK/final-system/common/bzip2.xml
   branches/cross-lfs/BOOK/final-system/common/findutils.xml
   branches/cross-lfs/BOOK/final-system/common/libtool.xml
   branches/cross-lfs/BOOK/final-system/common/shadow.xml
   branches/cross-lfs/BOOK/final-system/common/udev.xml
   branches/cross-lfs/BOOK/final-system/common/vim.xml
   branches/cross-lfs/BOOK/final-system/mips/glibc.xml
   branches/cross-lfs/BOOK/final-system/mips64-64/glibc.xml
   branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/udev.xml
   branches/cross-lfs/BOOK/final-system/sparc/glibc.xml
   branches/cross-lfs/BOOK/final-system/sparc64-64/glibc.xml
   branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml
   branches/cross-lfs/BOOK/final-system/x86/glibc.xml
   branches/cross-lfs/BOOK/final-system/x86/grub.xml
   branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml
   branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml
   branches/cross-lfs/BOOK/general.ent
   branches/cross-lfs/BOOK/introduction/common/changelog.xml
   branches/cross-lfs/BOOK/materials/common/patches.xml
   branches/cross-lfs/BOOK/patches.ent
   branches/cross-lfs/BOOK/temp-tools/common/expect.xml
Log:
Text updates ported from trunk up to r6693.
Added Bzip2 documentation patch.

Modified: branches/cross-lfs/BOOK/boot/common/devices.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/devices.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/boot/common/devices.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -17,10 +17,14 @@
   <sect2>
     <title>Creating Initial Device Nodes</title>
 
-    <para>When the kernel boots the system, it requires the presence
+    <para os="a">When the kernel boots the system, it requires the presence
     of a few device nodes, in particular the <filename
     class="devicefile">console</filename> and <filename
-    class="devicefile">null</filename> devices. Create these by running
+    class="devicefile">null</filename> devices. The device nodes will
+    be created on the hard disk so that they are available before
+    <command>udev</command> has been started, and additionally when Linux
+    is started in single user mode (hence the restrictive permissions on
+    <filename class="devicefile">console</filename>). Create these by running
     the following commands:</para>
 
 <screen><userinput>mknod -m 600 ${LFS}/dev/console c 5 1

Modified: branches/cross-lfs/BOOK/chroot/common/devices.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/common/devices.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/chroot/common/devices.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -19,7 +19,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../boot/common/devices.xml"
-    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>mknod -m 600 /dev/console c 5 1
 mknod -m 666 /dev/null c 1 3</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/common/bash.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/bash.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/common/bash.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -74,7 +74,7 @@
       <varlistentry>
         <term><parameter>--with-installed-readline</parameter></term>
         <listitem>
-          <para>This options tells Bash to use the
+          <para>This option tells Bash to use the
           <filename class="libraryfile">readline</filename> library that is
           already installed on the system rather than using its own readline
           version.</para>

Modified: branches/cross-lfs/BOOK/final-system/common/bzip2.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/bzip2.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/common/bzip2.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -47,6 +47,11 @@
   <sect2 id="install-bzip2" role="installation">
     <title>Installation of Bzip2</title>
 
+    <para os="j">Apply a patch to install the documentation for this
+    package:</para>
+
+<screen os="k"><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
+
     <para os="a">The Bzip2 package does not contain a <command>configure</command>
     script. Compile it with:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/common/findutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/findutils.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/common/findutils.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -53,10 +53,20 @@
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
     --localstatedir=/var/lib/locate</userinput></screen>
 
-    <para>The <parameter>localstatedir</parameter> option above changes the
-    location of the <command>locate</command> database to be in <filename
-    class="directory">/var/lib/locate</filename>, which is FHS-compliant.</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
 
+      <varlistentry>
+        <term><parameter>--localstatedir</parameter></term>
+        <listitem>
+          <para>This option changes the location of the <command>locate</command>
+          database to be in <filename class="directory">/var/lib/locate</filename>,
+          which is FHS-compliant.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/common/libtool.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/libtool.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/common/libtool.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -62,6 +62,11 @@
 
 <screen><userinput>make install</userinput></screen>
 
+    <para>Correct the ownership of the <filename
+    class="libraryfile">libltdl</filename> data files:</para>
+
+<screen><userinput>chown -R root:root /usr/share/libtool/libltdl</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-libtool" role="content">

Modified: branches/cross-lfs/BOOK/final-system/common/shadow.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/shadow.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/common/shadow.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -46,10 +46,32 @@
   <sect2 id="install-shadow" role="installation">
     <title>Installation of Shadow</title>
 
+    <note>
+      <para>If you would like to enforce the use of strong passwords,
+      refer to <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/>
+      for installing Cracklib prior to building Shadow. Then add
+      <parameter>--with-libcrack</parameter> to the <command>configure</command>
+      command below.</para>
+    </note>
+
     <para>Prepare Shadow for compilation:</para>
 
-<screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
+<screen><userinput>./configure --libdir=/lib --enable-shared --enable-shadowgrp</userinput></screen>
 
+    <variablelist>
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-shadowgrp</parameter></term>
+        <listitem>
+          <para>This version of Shadow defaults to not enabling shadow group
+          functionality, which will cause <command>grpconv</command> to
+          fail.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
     <para>Disable the installation of the <command>groups</command> program
     and it's man page, as Coreutils provides a better version:</para>
 
@@ -92,10 +114,17 @@
       <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
     </indexterm>
 
-<screen><userinput>cp etc/login.defs.linux /etc/login.defs
-sed -i -e 's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
-    -e 's@/var/spool/mail@/var/mail@' /etc/login.defs</userinput></screen>
+    <note>
+      <para>If you built Shadow with Cracklib support, insert the following into
+      the <command>sed</command> given below:</para>
 
+<screen><literal>-e 's at DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@'</literal></screen>
+    </note>
+
+<screen><userinput>sed -e's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
+    -e 's@/var/spool/mail@/var/mail@' \
+    etc/login.defs.linux > /etc/login.defs</userinput></screen>
+
     <para>Move a misplaced program to their proper location:</para>
 
 <screen><userinput>mv /usr/bin/passwd /bin</userinput></screen>
@@ -170,7 +199,7 @@
       <seglistitem>
         <seg>chage, chfn, chpasswd, chsh, expiry, faillog, gpasswd, groupadd,
         groupdel, groupmod, grpck, grpconv, grpunconv, lastlog, login,
-        logoutd, mkpasswd, newgrp, newusers, passwd, pwck, pwconv, pwunconv,
+        logoutd, newgrp, newusers, passwd, pwck, pwconv, pwunconv,
         sg (link to newgrp), useradd, userdel, usermod, vigr (link to vipw),
         and vipw</seg>
         <seg>libshadow.[a,so]</seg>
@@ -353,16 +382,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="mkpasswd">
-        <term><command>mkpasswd</command></term>
-        <listitem>
-          <para>Generates random passwords</para>
-          <indexterm zone="ch-system-shadow mkpasswd">
-            <primary sortas="b-mkpasswd">mkpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="newgrp">
         <term><command>newgrp</command></term>
         <listitem>

Modified: branches/cross-lfs/BOOK/final-system/common/udev.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/udev.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/common/udev.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -45,6 +45,11 @@
   <sect2 id="install-udev" role="installation">
     <title>Installation of Udev</title>
 
+    <para>Fix an incorrect assumption in the Udev testsuite regarding the
+    location of the <command>test</command> binary:</para>
+
+<screen><userinput>sed -i -e 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
+
     <para>Compile the package:</para>
 
 <screen><userinput>make udevdir=/dev</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/common/vim.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/vim.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/common/vim.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -71,19 +71,27 @@
 
 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-    <para>The optional but highly recommended
-    <parameter>--enable-multibyte</parameter> switch includes support for
-    editing files in multibyte character encodings into
-    <command>vim</command>.  This is needed if using a locale with
-    a multibyte character set. This switch is also helpful to be able to
-    edit text files initially created in Linux distributions like Fedora
-    Core that use UTF-8 as a default character set.</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
 
+      <varlistentry>
+        <term><parameter>--enable-multibyte</parameter></term>
+        <listitem>
+          <para>This optional but highly recommended switch enables support
+          for editing files in multibyte character encodings. This is needed
+          if using a locale with a multibyte character set. This switch is
+          also helpful to be able to edit text files initially created in
+          Linux distributions like Fedora Core that use UTF-8 as a default
+          character set.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-
     <para>To test the results, issue: <userinput>make test</userinput>.
     However, this test suite outputs a lot of binary data to the
     screen, which can cause issues with the settings of the current terminal.

Modified: branches/cross-lfs/BOOK/final-system/mips/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/glibc.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/mips/glibc.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -25,6 +25,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <para os="ba">This architecture does not currently support NPTL, so we will

Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -43,6 +43,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips64/glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64-64/glibc.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/mips64-64/glibc.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -43,6 +43,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips64/glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -42,8 +42,14 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>Prepare Bzip2 for compilation with:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
     <para os="ba">We need to remove the tests since they won't work on
     a multi-architecture build, and tell change the default lib path
     to <filename class="directory">lib64</filename>:</para>

Modified: branches/cross-lfs/BOOK/final-system/multilib/udev.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/udev.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/multilib/udev.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -45,6 +45,11 @@
   <sect2 id="install-udev" role="installation">
     <title>Installation of Udev</title>
 
+    <para>Fix an incorrect assumption in the Udev testsuite regarding the
+    location of the <command>test</command> binary:</para>
+
+<screen><userinput>sed -i -e 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
+
     <para>Compile the package:</para>
 
 <screen><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" udevdir=/dev</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/sparc/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/glibc.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/sparc/glibc.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -25,6 +25,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -43,6 +43,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc64/glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64-64/glibc.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/sparc64-64/glibc.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -43,6 +43,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc64/glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/x86/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86/glibc.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/x86/glibc.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -48,6 +48,17 @@
   <sect2 id="install-glibc" role="installation">
     <title>Installation of Glibc</title>
 
+    <note os="z">
+      <para>Some packages outside of LFS suggest installing GNU libiconv in
+      order to translate data from one encoding to another. The project's
+      home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
+      <quote>This library provides an <function>iconv()</function>
+      implementation, for use on systems which don't have one, or whose
+      implementation cannot convert from/to Unicode.</quote> Glibc provides
+      an <function>iconv()</function> implementation and can convert from/to
+      Unicode, therefore libiconv is not required on an LFS system.</para>
+    </note>
+
     <para os="a">This package is known to behave badly when you change its default
     optimization flags (including the <option>-march</option> and
     <option>-mcpu</option> options). Therefore, if you have defined any
@@ -63,7 +74,7 @@
 
     <para os="c">Glibc has two tests which fail when the running kernel is 2.6.11 or
     later. The problem has been determined to be with the tests themselves, not
-    with the C library nor the kernel. This patch fixes the problem:</para>
+    with the C library or the kernel. This patch fixes the problem:</para>
 
 <screen os="d"><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/final-system/x86/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86/grub.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/x86/grub.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -59,13 +59,14 @@
 <screen><userinput>make</userinput></screen>
 
     <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <userinput>sed -i '/ufs2/d' stage2/size_test &&
+    make check</userinput>.</para>
 
-    <para>Note that the test results will always show the error
-    <quote>ufs2_stage1_5 is too big.</quote> This is due to a compiler
-    issue, but can be ignored unless you plan to boot from an UFS
-    partition. The partitions are normally only used by Sun
-    workstations.</para>
+    <para>The UFS test is known to fail due to a compiler issue. The failure
+    prevents the rest of the tests from being run, so the <command>sed</command>
+    command is used to avoid the failure. The UFS test failure can be ignored
+    unless you plan to boot from a UFS partition. The partitions are normally
+    only used by Sun workstations.</para>
 
     <para>Install the package:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -44,6 +44,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -44,6 +44,10 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-16 18:48:37 UTC (rev 6694)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050815">
+<!ENTITY version "7.0-cross-lfs-20050816">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64">
 <!ENTITY version-ppc "&version;-PowerPC">
@@ -8,7 +8,7 @@
 <!ENTITY version-mips "&version;-MIPS">
 <!ENTITY version-mips64 "&version;-MIPS64">
 
-<!ENTITY releasedate "August 15, 2005">
+<!ENTITY releasedate "August 16, 2005">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 
@@ -46,6 +46,7 @@
 <!ENTITY e2fsprogs-version "1.38">
 <!ENTITY elftoaout-version "2.3">
 <!ENTITY expect-version "5.43.0">
+<!ENTITY expect-lib-version "5.43">
 <!ENTITY file-version "4.14">
 <!ENTITY findutils-version "4.2.23">
 <!ENTITY flex-version "2.5.31">

Modified: branches/cross-lfs/BOOK/introduction/common/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/changelog.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/introduction/common/changelog.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -131,6 +131,9 @@
       <para>Bash-doc-&bash-doc-version;</para>
     </listitem>
     <listitem>
+      <para>&bzip2-docs-patch;</para>
+    </listitem>
+    <listitem>
       <para>&binutils-posix-patch;</para>
     </listitem>
     <listitem>
@@ -202,6 +205,18 @@
 -->
 
     <listitem>
+      <para>August 16, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - Text updates ported from trunk up to r6693.</para>
+        </listitem>
+        <listitem>
+          <para>[manuel] - Added Bzip2 documentation patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 9, 2005</para>
       <itemizedlist>
         <listitem>

Modified: branches/cross-lfs/BOOK/materials/common/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/common/patches.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/materials/common/patches.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -37,6 +37,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Bzip2 Documentation Patch - 1 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;bzip2/&bzip2-docs-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Binutils Posix Patch - 1 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/patches.ent
===================================================================
--- branches/cross-lfs/BOOK/patches.ent	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/patches.ent	2005-08-16 18:48:37 UTC (rev 6694)
@@ -4,6 +4,8 @@
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
 <!ENTITY bash-avoid_WCONTINUED-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
 
+<!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
+
 <!ENTITY binutils-posix-patch "binutils-&binutils-version;-posix-1.patch">
 
 <!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">

Modified: branches/cross-lfs/BOOK/temp-tools/common/expect.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/common/expect.xml	2005-08-15 21:40:17 UTC (rev 6693)
+++ branches/cross-lfs/BOOK/temp-tools/common/expect.xml	2005-08-16 18:48:37 UTC (rev 6694)
@@ -134,7 +134,7 @@
 
       <seglistitem>
         <seg>expect</seg>
-        <seg>libexpect-5.42.a</seg>
+        <seg>libexpect-&expect-lib-version;.a</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -155,12 +155,12 @@
       </varlistentry>
 
       <varlistentry id="libexpect">
-        <term><filename class="libraryfile">libexpect-5.42.a</filename></term>
+        <term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
         <listitem>
           <para>Contains functions that allow Expect to be used as a Tcl
           extension or to be used directly from C or C++ (without Tcl)</para>
           <indexterm zone="ch-temp-tools-expect libexpect">
-            <primary sortas="c-libexpect-5.42">libexpect-5.42</primary>
+            <primary sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary>
           </indexterm>
         </listitem>
       </varlistentry>




More information about the lfs-book mailing list