Clarified what SBU times include in Chapter 5 and 6

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9332 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 40 insertions, 27 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 624af6c2e..7896c3673 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,13 @@
       <para>2010-07-02</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Clarified that SBU data is not included in 
+           Chapter 5, but is included in Chapter 6.  Thanks to 
+           littlebat for the patch.
+           Fixes
+           <ulink url="&lfs-ticket-root;2702">#2702</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Exapand and reformat notes concerning
            grub.cfg.</para>
         </listitem>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index d4c193364..b88edaebc 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -67,6 +67,9 @@ cd ../binutils-build</userinput></screen>
       &amp;&amp; make install; }</userinput>.</para>
     </note>
 
+    <note><para>The approximate build SBU values and required disk space
+    in Chapter 5 does not include testsuite data.</para></note>
+
     <para>Now prepare Binutils for compilation:</para>
 
 <screen><userinput remap="configure">../binutils-&binutils-version;/configure \
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index ab8c566a3..abb4bc3ee 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -52,4 +52,7 @@
   instructions, there is a list of programs and libraries (along with brief
   descriptions of these) that the package installs.</para>
 
+  <note><para>The SBU values and required disk space includes
+  testsuite data for all applicable packages in Chapter 6.</para></note>
+
 </sect1>
diff --git a/packages.ent b/packages.ent
index 6c94e8928..d0af95d57 100644
--- a/packages.ent
+++ b/packages.ent
@@ -12,16 +12,16 @@
 <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2">
 <!ENTITY autoconf-md5 "a6de1cc6434cd64038b0a0ae4e252b33">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
-<!ENTITY autoconf-ch6-du "12.4 MB testsuite included">
-<!ENTITY autoconf-ch6-sbu "4.8 SBU testsuite included">
+<!ENTITY autoconf-ch6-du "12.4 MB">
+<!ENTITY autoconf-ch6-sbu "4.8 SBU">
 
 <!ENTITY automake-version "1.11.1">
 <!ENTITY automake-size "1,042 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
 <!ENTITY automake-md5 "c2972c4d9b3e29c03d5f2af86249876f">
 <!ENTITY automake-home "&gnu-software;automake/">
-<!ENTITY automake-ch6-du "28.8 MB testsuite included">
-<!ENTITY automake-ch6-sbu "18.3 SBU testsuite included">
+<!ENTITY automake-ch6-du "28.8 MB">
+<!ENTITY automake-ch6-sbu "18.3 SBU">
 
 <!ENTITY bash-version "4.1">
 <!ENTITY bash-size "6,444 KB">
@@ -42,8 +42,8 @@
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
 <!ENTITY binutils-ch5p2-du "259 MB">
 <!ENTITY binutils-ch5p2-sbu "1.3 SBU">
-<!ENTITY binutils-ch6-du "222 MB testsuite included">
-<!ENTITY binutils-ch6-sbu "2.1 SBU testsuite included">
+<!ENTITY binutils-ch6-du "222 MB">
+<!ENTITY binutils-ch6-sbu "2.1 SBU">
 
 <!ENTITY bison-version "2.4.2">
 <!ENTITY bison-size "1,578 KB">
@@ -74,8 +74,8 @@
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "88 MB">
 <!ENTITY coreutils-ch5-sbu "0.7 SBU">
-<!ENTITY coreutils-ch6-du "98 MB testsuite included">
-<!ENTITY coreutils-ch6-sbu "3.2 SBU testsuite included">
+<!ENTITY coreutils-ch6-du "98 MB">
+<!ENTITY coreutils-ch6-sbu "3.2 SBU">
 
 <!ENTITY dejagnu-version "1.4.4">
 <!ENTITY dejagnu-size "1,055 KB">
@@ -106,8 +106,8 @@
 <!--
 <!ENTITY e2fsprogs-ch5-du "38 MB">
 <!ENTITY e2fsprogs-ch5-sbu "0.3 SBU"> -->
-<!ENTITY e2fsprogs-ch6-du "45 MB testsuite included">
-<!ENTITY e2fsprogs-ch6-sbu "0.5 SBU testsuite included">
+<!ENTITY e2fsprogs-ch6-du "45 MB">
+<!ENTITY e2fsprogs-ch6-sbu "0.5 SBU">
 
 <!ENTITY expect-version "5.44.1.15">
 <!ENTITY expect-lib-version "5.44">
@@ -147,8 +147,8 @@
 <!ENTITY flex-ch5-du "">
 <!ENTITY flex-ch5-sbu "">
 -->
-<!ENTITY flex-ch6-du "28 MB testsuite included">
-<!ENTITY flex-ch6-sbu "0.7 SBU testsuite included">
+<!ENTITY flex-ch6-du "28 MB">
+<!ENTITY flex-ch6-sbu "0.7 SBU">
 
 <!ENTITY gawk-version "3.1.8">
 <!ENTITY gawk-size "1,938 KB">
@@ -169,8 +169,8 @@
 <!ENTITY gcc-ch5p1-sbu "5.0 SBU">
 <!ENTITY gcc-ch5p2-du "1003 MB">
 <!ENTITY gcc-ch5p2-sbu "9.0 SBU">
-<!ENTITY gcc-ch6-du "1.1 GB testsuite included">
-<!ENTITY gcc-ch6-sbu "44 SBU testsuite included">
+<!ENTITY gcc-ch6-du "1.1 GB">
+<!ENTITY gcc-ch6-sbu "44 SBU">
 
 <!ENTITY gdbm-version "1.8.3">
 <!ENTITY gdbm-size "223 KB">
@@ -199,8 +199,8 @@
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "371 MB">
 <!ENTITY glibc-ch5-sbu "6.9 SBU">
-<!ENTITY glibc-ch6-du "637 MB testsuite included">
-<!ENTITY glibc-ch6-sbu "16.9 SBU testsuite included">
+<!ENTITY glibc-ch6-du "637 MB">
+<!ENTITY glibc-ch6-sbu "16.9 SBU">
 
 <!ENTITY gmp-version "5.0.1">
 <!ENTITY gmp-size "1,959 KB">
@@ -209,8 +209,8 @@
 <!ENTITY gmp-home "&gnu-software;gmp/">
 <!ENTITY gmp-ch5-du "39 MB">
 <!ENTITY gmp-ch5-sbu "1.5 SBU">
-<!ENTITY gmp-ch6-du "39 MB testsuite included">
-<!ENTITY gmp-ch6-sbu "1.7 SBU testsuite included">
+<!ENTITY gmp-ch6-du "39 MB">
+<!ENTITY gmp-ch6-sbu "1.7 SBU">
 
 <!ENTITY grep-version "2.6.3">
 <!ENTITY grep-size "1,280 KB">
@@ -301,8 +301,8 @@
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
 <!ENTITY libtool-md5 "b745d220e88163fcd9eea0a90ccf21b0">
 <!ENTITY libtool-home "&gnu-software;libtool/">
-<!ENTITY libtool-ch6-du "35 MB testsuite included">
-<!ENTITY libtool-ch6-sbu "3.7 SBU testsuite included">
+<!ENTITY libtool-ch6-du "35 MB">
+<!ENTITY libtool-ch6-sbu "3.7 SBU">
 
 <!ENTITY linux-major-version "2.6">
 <!ENTITY linux-minor-version "34">
@@ -329,7 +329,7 @@
 <!ENTITY m4-ch5-du "11.6 MB">
 <!ENTITY m4-ch5-sbu "0.2 SBU">
 <!ENTITY m4-ch6-du "14.2 MB">
-<!ENTITY m4-ch6-sbu "0.4 SBU testsuite included">
+<!ENTITY m4-ch6-sbu "0.4 SBU">
 
 <!ENTITY make-version "3.81">
 <!ENTITY make-size "1,125 KB">
@@ -372,8 +372,8 @@
 <!ENTITY mpc-home "http://www.multiprecision.org/">
 <!ENTITY mpc-ch5-du "5.6 MB">
 <!ENTITY mpc-ch5-sbu "0.1 SBU">
-<!ENTITY mpc-ch6-du "10.5 MB testsuite included">
-<!ENTITY mpc-ch6-sbu "0.3 SBU testsuite included">
+<!ENTITY mpc-ch6-du "10.5 MB">
+<!ENTITY mpc-ch6-sbu "0.3 SBU">
 
 <!ENTITY mpfr-version "3.0.0">
 <!ENTITY mpfr-size "1,112 KB">
@@ -382,8 +382,8 @@
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 <!ENTITY mpfr-ch5-du "27.1 MB">
 <!ENTITY mpfr-ch5-sbu "1.0 SBU">
-<!ENTITY mpfr-ch6-du "27.1 MB testsuite included">
-<!ENTITY mpfr-ch6-sbu "1.1 SBU testsuite included">
+<!ENTITY mpfr-ch6-du "27.1 MB">
+<!ENTITY mpfr-ch6-sbu "1.1 SBU">
 
 <!ENTITY ncurses-version "5.7">
 <!-- <!ENTITY ncurses-date "20050319"> -->
@@ -413,7 +413,7 @@
 <!ENTITY perl-home "http://cpan.org/">
 <!ENTITY perl-ch5-du "106 MB">
 <!ENTITY perl-ch5-sbu "0.8 SBU">
-<!ENTITY perl-ch6-du "171 MB testsuite included">
+<!ENTITY perl-ch6-du "171 MB">
 <!ENTITY perl-ch6-sbu "5.5 SBU">
 
 <!ENTITY pkg-config-version "0.25">
@@ -492,7 +492,7 @@
 <!ENTITY tar-ch5-du "20.9 MB">
 <!ENTITY tar-ch5-sbu "0.3 SBU">
 <!ENTITY tar-ch6-du "21.2 MB">
-<!ENTITY tar-ch6-sbu "1.9 SBU testsuite included">
+<!ENTITY tar-ch6-sbu "1.9 SBU">
 
 <!ENTITY tcl-version "8.5.8">
 <!ENTITY tcl-major-version "8.5">