Resolve merge confict

4 files changed, 160 insertions, 142 deletions

diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml
index 022e5d749..5be5d61ac 100644
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -10,6 +10,21 @@
 
   <title>Host System Requirements</title>
 
+  <sect2>
+     <title>Hardware</title>
+
+     <para>The LFS editors recommend that the system CPU have at least
+     four cores and that the system have at least 8 GB of memory. 
+     Older systems that do not meet these requirements will still work,
+     but the time to build packages will be significantly longer
+     than documented.
+  </para>
+
+  </sect2>
+
+  <sect2>
+     <title>Software</title>
+
     <para>Your host system should have the following software with the
     minimum versions indicated. This should not be an issue for most
     modern Linux distributions. Also note that many distributions will
@@ -245,4 +260,5 @@ or all absent, but not only one or two present.</para>
       so an upgrade of your host system kernel is required.
     </para>
     
+  </sect2>
 </sect1>
diff --git a/chapter04/aboutsbus.xml b/chapter04/aboutsbus.xml
index 82934d851..f88db24f6 100644
--- a/chapter04/aboutsbus.xml
+++ b/chapter04/aboutsbus.xml
@@ -13,17 +13,17 @@
   <para>Many people would like to know beforehand approximately how long
   it takes to compile and install each package. Because Linux From
   Scratch can be built on many different systems, it is impossible to
-  provide absolute time estimates. The biggest package (Glibc) will
-  take approximately 20 minutes on the fastest systems, but could take
-  up to three days on slower systems! Instead of providing actual times,
+  provide absolute time estimates. The biggest package (gcc) will
+  take approximately 5 minutes on the fastest systems, but could take
+  days on slower systems! Instead of providing actual times,
   the Standard Build Unit (SBU) measure will be
   used instead.</para>
 
-  <para>The SBU measure works as follows. The first package to be compiled
-  is binutils in <xref linkend="chapter-cross-tools"/>. The
-  time it takes to compile this package is what we will refer to as the
-  Standard Build Unit or SBU. All other compile times will be expressed in
-  terms of this unit of time.</para>
+  <para>The SBU measure works as follows. The first package to be compiled is
+  binutils in <xref linkend="chapter-cross-tools"/>. The time it takes to
+  compile using one core is what we will refer to as the Standard
+  Build Unit or SBU. All other compile times will be expressed in terms of this
+  unit of time.</para>
 
   <para>For example, consider a package whose compilation time is 4.5
   SBUs. This means that if your system took 10 minutes to compile and
@@ -55,6 +55,11 @@
     be more difficult because the lines from different processes will be
     interleaved.  If you run into a problem with a build step, revert to a
     single processor build to properly analyze the error messages.</para>
+
+    <para>The times presented here are based upon using four cores (-j4). The
+    times in Chapter 8 also include the time to run the regression tests for
+    the package unless specified otherwise.</para>
+
   </note>
 
 </sect1>
diff --git a/chapter08/introduction.xml b/chapter08/introduction.xml
index f80ccc0c1..93d4bd68d 100644
--- a/chapter08/introduction.xml
+++ b/chapter08/introduction.xml
@@ -52,8 +52,8 @@
 
   <note><para>The SBU values and required disk space include test suite data
   for all applicable packages in <xref linkend="chapter-building-system"/>. SBU
-  values have been calculated using a single CPU core (-j1) for all
-  operations.</para></note>
+  values have been calculated using four CPU cores (-j4) for all
+  operations unless specified otherwise.</para></note>
 
   <sect2>
     <title>About Libraries</title>
diff --git a/packages.ent b/packages.ent
index 9279b0483..45551e1e6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -19,7 +19,7 @@
 <!ENTITY acl-md5 "95ce715fe09acca7c12d3306d0f076b2">
 <!ENTITY acl-home "&savannah-nongnu;/projects/acl">
 <!ENTITY acl-fin-du "6.1 MB">
-<!ENTITY acl-fin-sbu "0.1 SBU">
+<!ENTITY acl-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY attr-version "2.5.1">
 <!ENTITY attr-size "456 KB">
@@ -35,7 +35,7 @@
 <!ENTITY autoconf-md5 "12cfa1687ffa2606337efe1a64416106">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-fin-du "24 MB">
-<!ENTITY autoconf-fin-sbu-tests "6.7">
+<!ENTITY autoconf-fin-sbu-tests "6.2">
 <!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
 
 <!ENTITY automake-version "1.16.5">
@@ -45,25 +45,25 @@
 <!ENTITY automake-md5 "4017e96f89fca45ca946f1c5db6be714">
 <!ENTITY automake-sha256 "80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d">
 <!ENTITY automake-home "&gnu-software;automake/">
-<!ENTITY automake-fin-du "116 MB">
-<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 7.7 SBU with tests)">
+<!ENTITY automake-fin-du "114 MB">
+<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 7.3 SBU with tests)">
 
 <!ENTITY bash-version "5.2.15">
 <!ENTITY bash-size "10,695 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
 <!ENTITY bash-md5 "4281bb43497f3905a308430a8d6a30a5">
 <!ENTITY bash-home "&gnu-software;bash/">
-<!ENTITY bash-tmp-du "64 MB">
-<!ENTITY bash-tmp-sbu "0.5 SBU">
-<!ENTITY bash-fin-du "50 MB">
-<!ENTITY bash-fin-sbu "1.4 SBU">
+<!ENTITY bash-tmp-du "67 MB">
+<!ENTITY bash-tmp-sbu "0.2 SBU">
+<!ENTITY bash-fin-du "52 MB">
+<!ENTITY bash-fin-sbu "1.2 SBU">
 
 <!ENTITY bc-version "6.2.4">
 <!ENTITY bc-size "447 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
 <!ENTITY bc-md5 "5245ff400df17b66be7621c7a6498953">
 <!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc">
-<!ENTITY bc-fin-du "7.4 MB">
+<!ENTITY bc-fin-du "7.6 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY binutils-version "2.40">
@@ -71,12 +71,12 @@
 <!ENTITY binutils-url "https://sourceware.org/pub/binutils/releases/binutils-&binutils-version;.tar.xz">
 <!ENTITY binutils-md5 "007b59bd908a737c06e5a8d3d2c737eb">
 <!ENTITY binutils-home "&gnu-software;binutils/">
-<!ENTITY binutils-tmpp1-du "629 MB">
+<!ENTITY binutils-tmpp1-du "639 MB">
 <!ENTITY binutils-tmpp1-sbu "1 SBU">
-<!ENTITY binutils-tmpp2-du "514 MB">
-<!ENTITY binutils-tmpp2-sbu "1.4 SBU">
-<!ENTITY binutils-fin-du "2.7 GB">
-<!ENTITY binutils-fin-sbu "8.2 SBU">
+<!ENTITY binutils-tmpp2-du "525 MB">
+<!ENTITY binutils-tmpp2-sbu "0.4 SBU">
+<!ENTITY binutils-fin-du "2.6 GB">
+<!ENTITY binutils-fin-sbu "2.2 SBU">
 
 <!ENTITY bison-version "3.8.2">
 <!ENTITY bison-size "2,752 KB">
@@ -84,9 +84,9 @@
 <!ENTITY bison-md5 "c28f119f405a2304ff0a7ccdcc629713">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!ENTITY bison-tmp-du "57 MB">
-<!ENTITY bison-tmp-sbu "0.3 SBU">
-<!ENTITY bison-fin-du "63 MB">
-<!ENTITY bison-fin-sbu "8.7 SBU">
+<!ENTITY bison-tmp-sbu "0.2 SBU">
+<!ENTITY bison-fin-du "62 MB">
+<!ENTITY bison-fin-sbu "2.3 SBU">
 
 <!ENTITY bzip2-version "1.0.8">
 <!ENTITY bzip2-size "792 KB">
@@ -102,17 +102,17 @@
 <!ENTITY check-md5 "50fcafcecde5a380415b12e9c574e0b2">
 <!ENTITY check-home "https://libcheck.github.io/check">
 <!ENTITY check-fin-du "12 MB">
-<!ENTITY check-fin-sbu "0.1 SBU (about 3.6 SBU with tests)">
+<!ENTITY check-fin-sbu "0.1 SBU (about 1.7 SBU with tests)">
 
 <!ENTITY coreutils-version "9.1">
 <!ENTITY coreutils-size "5,570 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
 <!ENTITY coreutils-md5 "8b1ca4e018a7dce9bb937faec6618671">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
-<!ENTITY coreutils-tmp-du "163 MB">
-<!ENTITY coreutils-tmp-sbu "0.6 SBU">
-<!ENTITY coreutils-fin-du "159 MB">
-<!ENTITY coreutils-fin-sbu "2.8 SBU">
+<!ENTITY coreutils-tmp-du "162 MB">
+<!ENTITY coreutils-tmp-sbu "0.3 SBU">
+<!ENTITY coreutils-fin-du "156 MB">
+<!ENTITY coreutils-fin-sbu "0.9 SBU">
 
 <!ENTITY dbus-version "1.14.6">
 <!ENTITY dbus-size "1,339 KB">
@@ -128,7 +128,7 @@
 <!ENTITY dejagnu-md5 "68c5208c58236eba447d7d6d1326b821">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu/">
 <!ENTITY dejagnu-tmp-du "6.9 MB">
-<!ENTITY dejagnu-tmp-sbu "less than 0.1 SBU">
+<!ENTITY dejagnu-tmp-sbu "0.1 SBU">
 
 <!ENTITY diffutils-version "3.9">
 <!ENTITY diffutils-size "1,551 KB">
@@ -138,30 +138,30 @@
 <!ENTITY diffutils-tmp-du "26 MB">
 <!ENTITY diffutils-tmp-sbu "0.2 SBU">
 <!ENTITY diffutils-fin-du "35 MB">
-<!ENTITY diffutils-fin-sbu "0.6 SBU">
+<!ENTITY diffutils-fin-sbu "0.3 SBU">
 
 <!ENTITY e2fsprogs-version "1.47.0">
 <!ENTITY e2fsprogs-size "9,412 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
 <!ENTITY e2fsprogs-md5 "6b4f18a33873623041857b4963641ee9">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
-<!ENTITY e2fsprogs-fin-du "94 MB">
-<!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.2 SBU on an SSD">
+<!ENTITY e2fsprogs-fin-du "95 MB">
+<!ENTITY e2fsprogs-fin-sbu "2.4 SBU on a spinning disk, 0.4 SBU on an SSD">
 
 <!ENTITY elfutils-version "0.188"> <!-- libelf -->
 <!ENTITY elfutils-size "8,900 KB">
 <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
 <!ENTITY elfutils-md5 "efb25a91873b2eec4df9f31e6a4f4e5c">
 <!ENTITY elfutils-home "https://sourceware.org/elfutils/">
-<!ENTITY elfutils-fin-du "117 MB">
-<!ENTITY elfutils-fin-sbu "0.9 SBU">
+<!ENTITY elfutils-fin-du "120 MB">
+<!ENTITY elfutils-fin-sbu "0.3 SBU">
 
 <!ENTITY eudev-version "3.2.11">
 <!ENTITY eudev-size "2,075 KB">
 <!ENTITY eudev-url "https://github.com/eudev-project/eudev/releases/download/v&eudev-version;/eudev-&eudev-version;.tar.gz">
 <!ENTITY eudev-md5 "417ba948335736d4d81874fba47a30f7">
 <!ENTITY eudev-fin-du "83 MB">
-<!ENTITY eudev-fin-sbu "0.2 SBU">
+<!ENTITY eudev-fin-sbu "0.1 SBU">
 
 <!ENTITY expat-version "2.5.0">
 <!ENTITY expat-size "450 KB">
@@ -184,8 +184,8 @@
 <!ENTITY file-url "https://astron.com/pub/file/file-&file-version;.tar.gz">
 <!ENTITY file-md5 "a60d586d49d015d842b9294864a89c7a">
 <!ENTITY file-home "https://www.darwinsys.com/file/">
-<!ENTITY file-tmp-du "34 MB">
-<!ENTITY file-tmp-sbu "0.2 SBU">
+<!ENTITY file-tmp-du "36 MB">
+<!ENTITY file-tmp-sbu "0.1 SBU">
 <!ENTITY file-fin-du "16 MB">
 <!ENTITY file-fin-sbu "0.1 SBU">
 
@@ -196,8 +196,8 @@
 <!ENTITY findutils-home "&gnu-software;findutils/">
 <!ENTITY findutils-tmp-du "42 MB">
 <!ENTITY findutils-tmp-sbu "0.2 SBU">
-<!ENTITY findutils-fin-du "52 MB">
-<!ENTITY findutils-fin-sbu "0.8 SBU">
+<!ENTITY findutils-fin-du "51 MB">
+<!ENTITY findutils-fin-sbu "0.4 SBU">
 
 <!ENTITY flex-version "2.6.4">
 <!ENTITY flex-size "1,386 KB">
@@ -205,17 +205,17 @@
 <!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d">
 <!ENTITY flex-home "&github;/westes/flex">
 <!ENTITY flex-fin-du "33 MB">
-<!ENTITY flex-fin-sbu "0.4 SBU">
+<!ENTITY flex-fin-sbu "0.1 SBU">
 
 <!ENTITY gawk-version "5.2.1">
 <!ENTITY gawk-size "3,332 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
 <!ENTITY gawk-md5 "02956bc5d117a7437bb4f7039f23b964">
 <!ENTITY gawk-home "&gnu-software;gawk/">
-<!ENTITY gawk-tmp-du "45 MB">
-<!ENTITY gawk-tmp-sbu "0.2 SBU">
-<!ENTITY gawk-fin-du "44 MB">
-<!ENTITY gawk-fin-sbu "0.4 SBU">
+<!ENTITY gawk-tmp-du "47 MB">
+<!ENTITY gawk-tmp-sbu "0.1 SBU">
+<!ENTITY gawk-fin-du "43 MB">
+<!ENTITY gawk-fin-sbu "0.2 SBU">
 
 <!ENTITY gcc-version "12.2.0">
 <!ENTITY gcc-size "82,662 KB">
@@ -224,18 +224,18 @@
 <!ENTITY gcc-sha256 "">
 <!ENTITY gcc-home "https://gcc.gnu.org/">
 <!ENTITY gcc-tmpp1-du "3.8 GB">
-<!ENTITY gcc-tmpp1-sbu "12 SBU">
-<!ENTITY gcc-tmpp2-du "4.5 GB">
-<!ENTITY gcc-tmpp2-sbu "15 SBU">
+<!ENTITY gcc-tmpp1-sbu "3.3 SBU">
+<!ENTITY gcc-tmpp2-du "4.7 GB">
+<!ENTITY gcc-tmpp2-sbu "4.6 SBU">
 <!ENTITY gcc-fin-du "5.1 GB ">
-<!ENTITY gcc-fin-sbu "160 SBU (with tests)">
+<!ENTITY gcc-fin-sbu "43 SBU (with tests)">
 <!ENTITY libquadmath-version "0.0.0">
 <!ENTITY libstdcpp-version   "6.0.30">
 <!ENTITY libitm-version      "1.0.0">
 <!ENTITY libatomic-version   "1.2.0">
 
 <!ENTITY libstdcpp-tmpp1-du "1.1 GB">
-<!ENTITY libstdcpp-tmpp1-sbu "0.4 SBU">
+<!ENTITY libstdcpp-tmpp1-sbu "0.2 SBU">
 
 <!ENTITY gdbm-version "1.23">
 <!ENTITY gdbm-size "1,092 KB">
@@ -243,42 +243,42 @@
 <!ENTITY gdbm-md5 "8551961e36bf8c70b7500d255d3658ec">
 <!ENTITY gdbm-home "&gnu-software;gdbm/">
 <!ENTITY gdbm-fin-du "13 MB">
-<!ENTITY gdbm-fin-sbu "0.1 SBU">
+<!ENTITY gdbm-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY gettext-version "0.21.1">
 <!ENTITY gettext-size "9,819 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
 <!ENTITY gettext-md5 "27fcc8a42dbc8f334f23a08f1f2fe00a">
 <!ENTITY gettext-home "&gnu-software;gettext/">
-<!ENTITY gettext-tmp-du "282 MB">
-<!ENTITY gettext-tmp-sbu "1.6 SBU">
-<!ENTITY gettext-fin-du "235 MB">
-<!ENTITY gettext-fin-sbu "2.7 SBU">
+<!ENTITY gettext-tmp-du "287 MB">
+<!ENTITY gettext-tmp-sbu "1.0 SBU">
+<!ENTITY gettext-fin-du "241 MB">
+<!ENTITY gettext-fin-sbu "1.3 SBU">
 
 <!ENTITY glibc-version "2.37">
 <!ENTITY glibc-size "18,244 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
 <!ENTITY glibc-md5 "e89cf3dcb64939d29f04b4ceead5cc4e">
 <!ENTITY glibc-home "&gnu-software;libc/">
-<!ENTITY glibc-tmp-du "821 MB">
-<!ENTITY glibc-tmp-sbu "4.4 SBU">
-<!ENTITY glibc-fin-du "2.8 GB">
-<!ENTITY glibc-fin-sbu "24 SBU">
+<!ENTITY glibc-tmp-du "822 MB">
+<!ENTITY glibc-tmp-sbu "1.5 SBU">
+<!ENTITY glibc-fin-du "2.9 GB">
+<!ENTITY glibc-fin-sbu "11 SBU">
 
 <!ENTITY gmp-version "6.2.1">
 <!ENTITY gmp-size "1,980 KB">
 <!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;.tar.xz">
 <!ENTITY gmp-md5 "0b82665c4a92fd2ade7440c13fcaa42b">
 <!ENTITY gmp-home "&gnu-software;gmp/">
-<!ENTITY gmp-fin-du "53 MB">
-<!ENTITY gmp-fin-sbu "0.9 SBU">
+<!ENTITY gmp-fin-du "52 MB">
+<!ENTITY gmp-fin-sbu "0.3 SBU">
 
 <!ENTITY gperf-version "3.1">
 <!ENTITY gperf-size "1,188 KB">
 <!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
 <!ENTITY gperf-md5 "9e251c0a618ad0824b51117d5d9db87e">
 <!ENTITY gperf-home "&gnu-software;gperf/">
-<!ENTITY gperf-fin-du "6.0 MB">
+<!ENTITY gperf-fin-du "6.1 MB">
 <!ENTITY gperf-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY grep-version "3.8">
@@ -289,23 +289,23 @@
 <!ENTITY grep-tmp-du "25 MB">
 <!ENTITY grep-tmp-sbu "0.2 SBU">
 <!ENTITY grep-fin-du "37 MB">
-<!ENTITY grep-fin-sbu "0.8 SBU">
+<!ENTITY grep-fin-sbu "0.4 SBU">
 
 <!ENTITY groff-version "1.22.4">
 <!ENTITY groff-size "4,044 KB">
 <!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
 <!ENTITY groff-md5 "08fb04335e2f5e73f23ea4c3adbf0c5f">
 <!ENTITY groff-home "&gnu-software;groff/">
-<!ENTITY groff-fin-du "88 MB">
-<!ENTITY groff-fin-sbu "0.5 SBU">
+<!ENTITY groff-fin-du "89 MB">
+<!ENTITY groff-fin-sbu "0.2 SBU">
 
 <!ENTITY grub-version "2.06">
 <!ENTITY grub-size "6,428 KB">
 <!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
 <!ENTITY grub-md5 "cf0fd928b1e5479c8108ee52cb114363">
 <!ENTITY grub-home "&gnu-software;grub/">
-<!ENTITY grub-fin-du "159 MB">
-<!ENTITY grub-fin-sbu "0.7 SBU">
+<!ENTITY grub-fin-du "161 MB">
+<!ENTITY grub-fin-sbu "0.3 SBU">
 
 <!ENTITY gzip-version "1.12">
 <!ENTITY gzip-size "807 KB">
@@ -332,7 +332,7 @@
 <!ENTITY inetutils-sha256 "">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 <!ENTITY inetutils-fin-du "31 MB">
-<!ENTITY inetutils-fin-sbu "0.3 SBU">
+<!ENTITY inetutils-fin-sbu "0.2 SBU">
 
 <!ENTITY intltool-version "0.51.0">
 <!ENTITY intltool-size "159 KB">
@@ -347,8 +347,8 @@
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
 <!ENTITY iproute2-md5 "f3ff4461e25dbc5ef1fb7a9167a9523d">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
-<!ENTITY iproute2-fin-du "16 MB">
-<!ENTITY iproute2-fin-sbu "0.2 SBU">
+<!ENTITY iproute2-fin-du "17 MB">
+<!ENTITY iproute2-fin-sbu "0.1 SBU">
 
 <!ENTITY isl-version "0.24">
 <!ENTITY isl-size "2.1 MB">
@@ -381,14 +381,14 @@
 <!ENTITY kmod-md5 "85202f0740a75eb52f2163c776f9b564">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-fin-du "12 MB">
-<!ENTITY kmod-fin-sbu "0.1 SBU">
+<!ENTITY kmod-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY less-version "608">
 <!ENTITY less-size "354 KB">
 <!ENTITY less-url "https://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
 <!ENTITY less-md5 "1cdec714569d830a68f4cff11203cdba">
 <!ENTITY less-home "https://www.greenwoodsoftware.com/less/">
-<!ENTITY less-fin-du "4.2 MB">
+<!ENTITY less-fin-du "4.3 MB">
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY lfs-bootscripts-version "20230101">      <!-- Scripts depend on this format -->
@@ -404,7 +404,7 @@
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
 <!ENTITY libcap-md5 "06333f4301657298890fd8d6f1fb4793">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
-<!ENTITY libcap-fin-du "2.7 MB">
+<!ENTITY libcap-fin-du "2.9 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY libffi-version "3.4.4">
@@ -412,7 +412,7 @@
 <!ENTITY libffi-url "https://github.com/libffi/libffi/releases/download/v&libffi-version;/libffi-&libffi-version;.tar.gz">
 <!ENTITY libffi-md5 "0da1a5ed7786ac12dcbaf0d499d8a049">
 <!ENTITY libffi-home "https://sourceware.org/libffi/">
-<!ENTITY libffi-fin-du "10 MB">
+<!ENTITY libffi-fin-du "11 MB">
 <!ENTITY libffi-fin-sbu "1.8 SBU">
 
 <!ENTITY libpipeline-version "1.5.7">
@@ -428,8 +428,8 @@
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.xz">
 <!ENTITY libtool-md5 "2fc0b6ddcd66a89ed6e45db28fa44232">
 <!ENTITY libtool-home "&gnu-software;libtool/">
-<!ENTITY libtool-fin-du "43 MB">
-<!ENTITY libtool-fin-sbu "1.5 SBU">
+<!ENTITY libtool-fin-du "44 MB">
+<!ENTITY libtool-fin-sbu "1.4 SBU">
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "1">
@@ -446,21 +446,18 @@
 <!ENTITY linux-knl-du "1200 - 8800 MB (typically about 1700 MB)">
 <!ENTITY linux-knl-sbu "1.5 - 130.0 SBU (typically about 12 SBU)">
 
-<!ENTITY linux-headers-tmp-du "1.4 GB">
-<!ENTITY linux-headers-tmp-sbu "0.1 SBU">
-<!-- Removed in this book
-<!ENTITY linux-headers-fin-du "1 GB">
-<!ENTITY linux-headers-fin-sbu "0.1 SBU">-->
+<!ENTITY linux-headers-tmp-du "1.5 GB">
+<!ENTITY linux-headers-tmp-sbu "less than 0.1 SBU">
 
 <!ENTITY m4-version "1.4.19">
 <!ENTITY m4-size "1,617 KB">
 <!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.xz">
 <!ENTITY m4-md5 "0d90823e1426f1da2fd872df0311298d">
 <!ENTITY m4-home "&gnu-software;m4/">
-<!ENTITY m4-tmp-du "32 MB">
-<!ENTITY m4-tmp-sbu "0.2 SBU">
+<!ENTITY m4-tmp-du "31 MB">
+<!ENTITY m4-tmp-sbu "0.1 SBU">
 <!ENTITY m4-fin-du "49 MB">
-<!ENTITY m4-fin-sbu "0.6 SBU">
+<!ENTITY m4-fin-sbu "0.3 SBU">
 
 <!ENTITY make-version "4.4">
 <!ENTITY make-size "2,254 KB">
@@ -468,8 +465,8 @@
 <!ENTITY make-md5 "d7575a26a94ee8427130e9db23cdaa78">
 <!ENTITY make-home "&gnu-software;make/">
 <!ENTITY make-tmp-du "15 MB">
-<!ENTITY make-tmp-sbu "0.1 SBU">
-<!ENTITY make-fin-du "14 MB">
+<!ENTITY make-tmp-sbu "less than 0.1 SBU">
+<!ENTITY make-fin-du "13 MB">
 <!ENTITY make-fin-sbu "0.5 SBU">
 
 <!ENTITY man-db-version "2.11.2">
@@ -478,14 +475,14 @@
 <!ENTITY man-db-md5 "a7d59fb2df6158c44f8f7009dcc6d875">
 <!ENTITY man-db-home "https://www.nongnu.org/man-db/">
 <!ENTITY man-db-fin-du "40 MB">
-<!ENTITY man-db-fin-sbu "0.4 SBU">
+<!ENTITY man-db-fin-sbu "0.2 SBU">
 
 <!ENTITY man-pages-version "6.02">
 <!ENTITY man-pages-size "1,759 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
 <!ENTITY man-pages-md5 "05b9e8ce59f6257141fe9e4edd5bd149">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
-<!ENTITY man-pages-fin-du "33 MB">
+<!ENTITY man-pages-fin-du "32 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY markupsafe-version "2.1.2">
@@ -501,7 +498,7 @@
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
 <!ENTITY meson-md5 "009b78125467cd9ee4d467175a5c12e1">
 <!ENTITY meson-home "https://mesonbuild.com">
-<!ENTITY meson-fin-du "38 MB">
+<!ENTITY meson-fin-du "41 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY mpc-version "1.3.1">
@@ -509,42 +506,42 @@
 <!ENTITY mpc-url "https://ftp.gnu.org/gnu/mpc/mpc-&mpc-version;.tar.gz">
 <!ENTITY mpc-md5 "5c9bc658c9fd0f940e8e3e0f09530c62">
 <!ENTITY mpc-home "https://www.multiprecision.org/">
-<!ENTITY mpc-fin-du "21 MB">
-<!ENTITY mpc-fin-sbu "0.3 SBU">
+<!ENTITY mpc-fin-du "22 MB">
+<!ENTITY mpc-fin-sbu "0.1 SBU">
 
 <!ENTITY mpfr-version "4.2.0">
 <!ENTITY mpfr-size "1,443 KB">
 <!ENTITY mpfr-url "https://ftp.gnu.org/gnu/mpfr/mpfr-&mpfr-version;.tar.xz">
 <!ENTITY mpfr-md5 "a25091f337f25830c16d2054d74b5af7">
 <!ENTITY mpfr-home "https://www.mpfr.org/">
-<!ENTITY mpfr-fin-du "39 MB">
-<!ENTITY mpfr-fin-sbu "0.8 SBU">
+<!ENTITY mpfr-fin-du "43 MB">
+<!ENTITY mpfr-fin-sbu "0.2 SBU">
 
 <!ENTITY ncurses-version "6.4">
 <!ENTITY ncurses-size "3,528 KB">
 <!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-md5 "5a62487b5d4ac6b132fe2bf9f8fad29b">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
-<!ENTITY ncurses-tmp-du "50 MB">
-<!ENTITY ncurses-tmp-sbu "0.7 SBU">
+<!ENTITY ncurses-tmp-du "51 MB">
+<!ENTITY ncurses-tmp-sbu "0.3 SBU">
 <!ENTITY ncurses-fin-du "45 MB">
-<!ENTITY ncurses-fin-sbu "0.4 SBU">
+<!ENTITY ncurses-fin-sbu "0.2 SBU">
 
 <!ENTITY ninja-version "1.11.1">
 <!ENTITY ninja-size "225 KB">
 <!ENTITY ninja-url "&github;/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz">
 <!ENTITY ninja-md5 "32151c08211d7ca3c1d832064f6939b0">
 <!ENTITY ninja-home "https://ninja-build.org/">
-<!ENTITY ninja-fin-du "79 MB">
-<!ENTITY ninja-fin-sbu "0.6 SBU">
+<!ENTITY ninja-fin-du "77 MB">
+<!ENTITY ninja-fin-sbu "0.3 SBU">
 
 <!ENTITY openssl-version "3.0.8">
 <!ENTITY openssl-size "14,800 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
 <!ENTITY openssl-md5 "61e017cf4fea1b599048f621f1490fbd">
 <!ENTITY openssl-home "https://www.openssl.org/">
-<!ENTITY openssl-fin-du "476 MB">
-<!ENTITY openssl-fin-sbu "5.0 SBU">
+<!ENTITY openssl-fin-du "520 MB">
+<!ENTITY openssl-fin-sbu "3.2 SBU">
 
 <!ENTITY patch-version "2.7.6">
 <!ENTITY patch-size "766 KB">
@@ -554,7 +551,7 @@
 <!ENTITY patch-tmp-du "12 MB">
 <!ENTITY patch-tmp-sbu "0.1 SBU">
 <!ENTITY patch-fin-du "12 MB">
-<!ENTITY patch-fin-sbu "0.2 SBU">
+<!ENTITY patch-fin-sbu "0.1 SBU">
 
 <!ENTITY perl-version-major "5">
 <!ENTITY perl-version-minor "36">
@@ -565,10 +562,10 @@
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
 <!ENTITY perl-md5 "826e42da130011699172fd655e49cfa2">
 <!ENTITY perl-home "https://www.perl.org/">
-<!ENTITY perl-tmp-du "282 MB">
-<!ENTITY perl-tmp-sbu "1.6 SBU">
-<!ENTITY perl-fin-du "236 MB">
-<!ENTITY perl-fin-sbu "9.4 SBU">
+<!ENTITY perl-tmp-du "281 MB">
+<!ENTITY perl-tmp-sbu "0.6 SBU">
+<!ENTITY perl-fin-du "234 MB">
+<!ENTITY perl-fin-sbu "7.9 SBU">
 
 <!ENTITY pkgconfig-version "0.29.2">
 <!ENTITY pkgconfig-size "1,970 KB">
@@ -576,14 +573,14 @@
 <!ENTITY pkgconfig-md5 "f6e931e319531b736fadc017f470e68a">
 <!ENTITY pkgconfig-home "https://www.freedesktop.org/wiki/Software/pkg-config">
 <!ENTITY pkgconfig-fin-du "29 MB">
-<!ENTITY pkgconfig-fin-sbu "0.3 SBU">
+<!ENTITY pkgconfig-fin-sbu "0.1 SBU">
 
 <!ENTITY procps-ng-version "4.0.2">
 <!ENTITY procps-ng-size "1250 KB">
 <!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
 <!ENTITY procps-ng-md5 "691748c4767f19b9d94ed9d088e40c4d">
 <!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
-<!ENTITY procps-ng-fin-du "19 MB">
+<!ENTITY procps-ng-fin-du "26 MB">
 <!ENTITY procps-ng-fin-sbu "0.1 SBU">
 
 <!ENTITY psmisc-version "23.6">
@@ -591,7 +588,7 @@
 <!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-&psmisc-version;.tar.xz">
 <!ENTITY psmisc-md5 "ed3206da1184ce9e82d607dc56c52633">
 <!ENTITY psmisc-home "https://gitlab.com/psmisc/psmisc">
-<!ENTITY psmisc-fin-du "5.8 MB">
+<!ENTITY psmisc-fin-du "6.5 MB">
 <!ENTITY psmisc-fin-sbu "less than 0.1 SBU">
 
 <!-- If python minor version changes, updates in python and
@@ -603,10 +600,10 @@
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
 <!ENTITY python-md5 "a957cffb58a89303b62124896881950b">
 <!ENTITY python-home "https://www.python.org/">
-<!ENTITY python-tmp-du "364 MB">
-<!ENTITY python-tmp-sbu "0.9 SBU">
-<!ENTITY python-fin-du "283 MB">
-<!ENTITY python-fin-sbu "3.4 SBU">
+<!ENTITY python-tmp-du "529 MB">
+<!ENTITY python-tmp-sbu "0.4 SBU">
+<!ENTITY python-fin-du "372 MB">
+<!ENTITY python-fin-sbu "2.0 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
 <!ENTITY python-docs-md5 "eb4132c780b60b5782a4f66b29b08d5c">
 <!ENTITY python-docs-size "7,598 KB">
@@ -617,18 +614,18 @@
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
 <!ENTITY readline-md5 "4aa1b31be779e6b84f9a96cb66bc50f6">
 <!ENTITY readline-home "https://tiswww.case.edu/php/chet/readline/rltop.html">
-<!ENTITY readline-fin-du "15 MB">
-<!ENTITY readline-fin-sbu "0.1 SBU">
+<!ENTITY readline-fin-du "16 MB">
+<!ENTITY readline-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY sed-version "4.9">
 <!ENTITY sed-size "1,365 KB">
 <!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.xz">
 <!ENTITY sed-md5 "6aac9b2dbafcd5b7a67a8a9bcb8036c3">
 <!ENTITY sed-home "&gnu-software;sed/">
-<!ENTITY sed-tmp-du "20 MB">
-<!ENTITY sed-tmp-sbu "0.1 SBU">
+<!ENTITY sed-tmp-du "19 MB">
+<!ENTITY sed-tmp-sbu "0.2 SBU">
 <!ENTITY sed-fin-du "31 MB">
-<!ENTITY sed-fin-sbu "0.4 SBU">
+<!ENTITY sed-fin-sbu "0.3 SBU">
 
 <!ENTITY shadow-version "4.13">
 <!ENTITY shadow-size "1,722 KB">
@@ -636,14 +633,14 @@
 <!ENTITY shadow-md5 "b1ab01b5462ddcf43588374d57bec123">
 <!ENTITY shadow-home "https://shadow-maint.github.io/shadow/">
 <!ENTITY shadow-fin-du "46 MB">
-<!ENTITY shadow-fin-sbu "0.2 SBU">
+<!ENTITY shadow-fin-sbu "0.1 SBU">
 
 <!ENTITY sysklogd-version "1.5.1">
 <!ENTITY sysklogd-size "88 KB">
 <!ENTITY sysklogd-url "https://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
 <!ENTITY sysklogd-md5 "c70599ab0d037fde724f7210c2c8d7f8">
 <!ENTITY sysklogd-home "https://www.infodrom.org/projects/sysklogd/">
-<!ENTITY sysklogd-fin-du "0.6 MB">
+<!ENTITY sysklogd-fin-du "0.7 MB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY systemd-version  "252">
@@ -668,7 +665,7 @@
 <!ENTITY sysvinit-url "&github;/slicer69/sysvinit/releases/download/&sysvinit-version;/sysvinit-&sysvinit-version;.tar.xz">
 <!ENTITY sysvinit-md5 "96771d0a88315c91199830ea49b859ca">
 <!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
-<!ENTITY sysvinit-fin-du "2.7 MB">
+<!ENTITY sysvinit-fin-du "4.4 MB">
 <!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY tar-version "1.34">
@@ -677,9 +674,9 @@
 <!ENTITY tar-md5 "9a08d29a9ac4727130b5708347c0f5cf">
 <!ENTITY tar-home "&gnu-software;tar/">
 <!ENTITY tar-tmp-du "38 MB">
-<!ENTITY tar-tmp-sbu "0.2 SBU">
+<!ENTITY tar-tmp-sbu "0.1 SBU">
 <!ENTITY tar-fin-du "40 MB">
-<!ENTITY tar-fin-sbu "1.7 SBU">
+<!ENTITY tar-fin-sbu "1.5 SBU">
 
 <!ENTITY tcl-version "8.6.13">
 <!ENTITY tcl-major-version "8.6">
@@ -690,18 +687,18 @@
 <!ENTITY tcl-docs-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-html.tar.gz">
 <!ENTITY tcl-docs-md5 "4452f2f6d557f5598cca17b786d6eb68">
 <!ENTITY tcl-docs-size "1,165 KB">
-<!ENTITY tcl-tmp-du "88 MB">
-<!ENTITY tcl-tmp-sbu "3.2 SBU">
+<!ENTITY tcl-tmp-du "89 MB">
+<!ENTITY tcl-tmp-sbu "2.7 SBU">
 
 <!ENTITY texinfo-version "7.0.2">
 <!ENTITY texinfo-size "4,762 KB">
 <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
 <!ENTITY texinfo-md5 "be9500f3a361525622850ecb1b1fc024">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
-<!ENTITY texinfo-tmp-du "113 MB">
+<!ENTITY texinfo-tmp-du "116 MB">
 <!ENTITY texinfo-tmp-sbu "0.2 SBU">
-<!ENTITY texinfo-fin-du "114 MB">
-<!ENTITY texinfo-fin-sbu "0.6 SBU">
+<!ENTITY texinfo-fin-du "128 MB">
+<!ENTITY texinfo-fin-sbu "0.3 SBU">
 
 <!ENTITY tzdata-version "2022g">
 <!ENTITY tzdata-size "430 KB">
@@ -721,10 +718,10 @@
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
 <!ENTITY util-linux-md5 "cd11456f4ddd31f7fbfdd9488c0c0d02">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
-<!ENTITY util-linux-tmp-du "149 MB">
-<!ENTITY util-linux-tmp-sbu "0.6 SBU">
+<!ENTITY util-linux-tmp-du "150 MB">
+<!ENTITY util-linux-tmp-sbu "0.2 SBU">
 <!ENTITY util-linux-fin-du "283 MB">
-<!ENTITY util-linux-fin-sbu "1.0 SBU">
+<!ENTITY util-linux-fin-sbu "0.5 SBU">
 
 <!ENTITY vim-version "9.0.1273">
 <!-- <!ENTITY vim-majmin "90"> -->
@@ -734,15 +731,15 @@
 <!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.xz">
 <!ENTITY vim-md5 "9c80755d2d95ec4ef713f66e57671797">
 <!ENTITY vim-home "https://www.vim.org">
-<!ENTITY vim-fin-du "217 MB">
-<!ENTITY vim-fin-sbu "2.5 SBU">
+<!ENTITY vim-fin-du "235 MB">
+<!ENTITY vim-fin-sbu "2.4 SBU">
 
 <!ENTITY wheel-version "0.38.4">
 <!ENTITY wheel-size "66 KB">
 <!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
 <!ENTITY wheel-md5 "83bb4e7bd4d687d398733f341a64ab91">
 <!ENTITY wheel-home "&pypi-home;/wheel/">
-<!ENTITY wheel-fin-du "956 KB">
+<!ENTITY wheel-fin-du "1.3 MB">
 <!ENTITY wheel-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY xml-parser-version "2.46">
@@ -758,17 +755,17 @@
 <!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
 <!ENTITY xz-md5 "47d831c659e94071d5dd384d0d1ed4c6">
 <!ENTITY xz-home "https://tukaani.org/xz">
-<!ENTITY xz-tmp-du "16 MB">
+<!ENTITY xz-tmp-du "20 MB">
 <!ENTITY xz-tmp-sbu "0.1 SBU">
-<!ENTITY xz-fin-du "16 MB">
-<!ENTITY xz-fin-sbu "0.2 SBU">
+<!ENTITY xz-fin-du "21 MB">
+<!ENTITY xz-fin-sbu "0.1 SBU">
 
 <!ENTITY zlib-version "1.2.13">
 <!ENTITY zlib-size "1267 KB">
 <!ENTITY zlib-url "https://zlib.net/zlib-&zlib-version;.tar.xz">
 <!ENTITY zlib-md5 "7d9fc1d78ae2fa3e84fe98b77d006c63">
 <!ENTITY zlib-home "https://www.zlib.net/">
-<!ENTITY zlib-fin-du "6.1 MB">
+<!ENTITY zlib-fin-du "6.2 MB">
 <!ENTITY zlib-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY zstd-version "1.5.4">
@@ -776,6 +773,6 @@
 <!ENTITY zstd-url "https://github.com/facebook/zstd/releases/download/v&zstd-version;/zstd-&zstd-version;.tar.gz">
 <!ENTITY zstd-md5 "2352b1f9ccc7446641046bb3d440c3ed">
 <!ENTITY zstd-home "https://facebook.github.io/zstd/">
-<!ENTITY zstd-fin-du "56 MB">
-<!ENTITY zstd-fin-sbu "1.1 SBU">
+<!ENTITY zstd-fin-du "75 MB">
+<!ENTITY zstd-fin-sbu "0.4 SBU">