Automatic merge of trunk into multilib

This reverts commit 2195c1e800.

.gitignore

@@ -1,5 +1,4 @@
 lfs-bootscripts-*.tar.xz
-lfs-*.tar.xz
 conditional.ent
 version.ent
 appendices/*.script

Makefile

@@ -1,4 +1,6 @@
-# vim:ts=3
+#BASEDIR = ~/lfs-book
+#SYSDDIR = ~/lfs-systemd
+#DUMPDIR = ~/lfs-commands
 RENDERTMP = $(HOME)/tmp
 CHUNK_QUIET = 1
 ROOT_ID =
@@ -21,15 +23,28 @@ ifneq ($(REV), sysv)
 endif
 
 ifeq ($(REV), sysv)
-  BASEDIR         ?= $(HOME)/public_html/lfs-book
+  BASEDIR         ?= ~/lfs-book
   PDF_OUTPUT      ?= LFS-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-BOOK.html
-  DUMPDIR         ?= $(HOME)/lfs-commands
+  DUMPDIR         ?= ~/lfs-commands
 else
-  BASEDIR         ?= $(HOME)/public_html/lfs-systemd
+  BASEDIR         ?= ~/lfs-systemd
   PDF_OUTPUT      ?= LFS-SYSD-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html
-  DUMPDIR         ?= $(HOME)/lfs-sysd-commands
+  DUMPDIR         ?= ~/lfs-sysd-commands
+endif
+
+ifndef ARCH
+  ARCH = default
+endif
+ifneq ($(ARCH), default)
+  ifneq ($(ARCH), ml_32)
+    ifneq ($(ARCH), ml_x32)
+      ifneq ($(ARCH), ml_all)
+        $(error ARCH must be either 'default' (default if unset), 'ml_32', 'ml_x32' or 'ml_all'.)
+      endif
+    endif
+  endif
 endif
 
 book: validate profile-html
@@ -44,8 +59,7 @@ book: validate profile-html
 	@echo "Copying CSS code and images..."
 	$(Q)mkdir -p $(BASEDIR)/stylesheets
 	$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-	$(Q)sed -e 's|../stylesheet|stylesheet|' \
+	$(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
-           -i $(BASEDIR)/index.html
 
 	$(Q)mkdir -p $(BASEDIR)/images
 	$(Q)cp images/*.png $(BASEDIR)/images
@@ -53,10 +67,12 @@ book: validate profile-html
 	@echo "Running Tidy and obfuscate.sh..."
 	$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
          tidy -config tidy.conf $$filename;           \
+         true;                                        \
          /bin/bash obfuscate.sh $$filename;           \
-         sed -e "s|text/html|application/xhtml+xml|g" \
+         sed -e "s@text/html@application/xhtml+xml@g" \
+             -e "s/\xa9/\©/ "                    \
              -i $$filename;                           \
-       done
+   done;
 
 	$(Q)$(MAKE) --no-print-directory wget-list md5sums
 
@@ -95,16 +111,17 @@ nochunks: validate profile-html
                 --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
                 stylesheets/lfs-nochunks.xsl           \
                 $(RENDERTMP)/lfs-html.xml
+#                $(RENDERTMP)/lfs-html2.xml
 
 	@echo "Running Tidy..."
-	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || test $$? -le 1
+	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
 
 	@echo "Running obfuscate.sh..."
-	$(Q)bash obfuscate.sh      $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+	$(Q)bash obfuscate.sh                                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-	$(Q)sed -e "s|text/html|application/xhtml+xml|g" \
+	$(Q)sed -i -e "s@text/html@application/xhtml+xml@g"  $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-           -e "s|../wget-list|wget-list|"           \
+	$(Q)sed -i -e "s@../wget-list@wget-list@"            $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-           -e "s|../md5sums|md5sums|"               \
+	$(Q)sed -i -e "s@../md5sums@md5sums@"                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-           -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+	$(Q)sed -i -e "s@\xa9@\©@"                      $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
 	@echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"
 
@@ -123,16 +140,17 @@ validate: tmpdir version
 	@echo "Adjusting for revision $(REV)..."
 	$(Q)xsltproc --nonet                               \
                 --xinclude                            \
-                --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/lfs-html2.xml   \
+                --stringparam profile.revision $(REV) \
+                --stringparam profile.arch $(ARCH)    \
                 stylesheets/lfs-xsl/profile.xsl       \
                 index.xml
 
 	@echo "Validating the book..."
-	$(Q)xmllint --nonet                            \
+	$(Q)xmllint --nonet                      \
-               --encode UTF-8                     \
+               --noent                      \
-               --postvalid                        \
+               --postvalid                  \
-               --output $(RENDERTMP)/lfs-full.xml \
+               -o $(RENDERTMP)/lfs-full.xml \
                $(RENDERTMP)/lfs-html2.xml
 
 	$(Q)rm -f appendices/*.script
@@ -147,45 +165,43 @@ profile-html:
                 stylesheets/lfs-xsl/profile.xsl      \
                 $(RENDERTMP)/lfs-full.xml
 
-DOWNLOADS_DEP = chapter03/packages.xml chapter03/patches.xml \
-                packages.ent patches.ent general.ent
-
 wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV)
-$(BASEDIR)/wget-list: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
+$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
+                      packages.ent patches.ent general.ent
 	@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
 	$(Q)mkdir -p $(BASEDIR)
-	$(Q)xsltproc --nonet                       \
+	$(Q)xsltproc --xinclude --nonet            \
-                --xinclude                    \
                 --output $(BASEDIR)/wget-list \
                 stylesheets/wget-list.xsl     \
                 chapter03/chapter03.xml
 
-$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
+$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \
-	$(Q)xsltproc --nonet                               \
+                             chapter03/chapter03.xml \
-                --xinclude                            \
+                             packages.ent patches.ent general.ent
+	$(Q)xsltproc --nonet --xinclude                   \
                 --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/wget-list.xml   \
                 stylesheets/lfs-xsl/profile.xsl       \
                 chapter03/chapter03.xml
-
+	$(Q)xsltproc --xinclude --nonet                  \
-	$(Q)xsltproc --nonet                              \
                 --output $(BASEDIR)/wget-list-$(REV) \
                 stylesheets/wget-list.xsl            \
                 $(RENDERTMP)/wget-list.xml
 
 md5sums: $(BASEDIR)/md5sums
-$(BASEDIR)/md5sums: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
+$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
+                    packages.ent patches.ent
 	@echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..."
 	$(Q)mkdir -p $(BASEDIR)
 
-	$(Q)xsltproc --nonet                               \
+	$(Q)xsltproc --nonet --xinclude                   \
-                --xinclude                            \
                 --stringparam profile.revision $(REV) \
+                --stringparam profile.arch $(ARCH)    \
                 --output $(RENDERTMP)/md5sum.xml      \
                 stylesheets/lfs-xsl/profile.xsl       \
                 chapter03/chapter03.xml
 
-	$(Q)xsltproc --nonet                     \
+	$(Q)xsltproc --xinclude --nonet         \
                 --output $(BASEDIR)/md5sums \
                 stylesheets/md5sum.xsl      \
                 $(RENDERTMP)/md5sum.xml
@@ -208,14 +224,5 @@ dump-commands: validate
 
 all: book nochunks pdf dump-commands
 
-dist:
+.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list version
-	$(Q)DIST=/tmp/LFS-RELEASE ./git-version.sh $(REV)
-	$(Q)rm -f lfs-$$(</tmp/LFS-RELEASE).tar.xz
-	$(Q)tar cJf lfs-$$(</tmp/LFS-RELEASE).tar.xz \
-		$(shell git ls-tree HEAD . --name-only -r) version.ent \
-		-C /tmp LFS-RELEASE \
-		--transform "s,^,lfs-$$(</tmp/LFS-RELEASE)/,"
-	$(Q)echo "Generated XML tarball lfs-$$(</tmp/LFS-RELEASE).tar.xz"
-
-.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list version dist
 

appendices/acknowledgments.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

appendices/acronymlist.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

appendices/creat-comm.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

appendices/dependencies.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
   <!-- Convenient entity for "Systemd" or "Udev" -->
-  <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase><phrase revision='sysv'>Udev</phrase>">
+  <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase>
-  <!ENTITY bdb "<ulink url='https://www.oracle.com/database/technologies/related/berkeleydb.html'>Berkeley DB</ulink>">
+                         <phrase revision='sysv'>Udev</phrase>">
 ]>
 
 <appendix id="appendixc" xreflabel="Appendix C">
@@ -29,7 +29,10 @@
   in addition to those on the first list, need to be available in order to run
   the test suites. The fourth list of dependencies are packages that require
   this package to be built and installed in its final location before they are
-  built and installed.</para>
+  built and installed. In most cases, this is because these packages will hard
+  code paths to binaries within their scripts. If not built in a certain order,
+  this could result in paths of /tools/bin/[binary] being placed inside scripts
+  installed to the final system. This is obviously not desirable.</para>
 
   <para>The last list of dependencies are optional packages that are not
   addressed in LFS, but could be useful to the user. These packages may have
@@ -44,7 +47,7 @@
       <segmentedlist id="acl-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Attr, Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
+          <seg>Attr, Bash, Binutils, Coreutils, GCC,  Gettext, Grep, M4, Make,
           Perl, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -106,7 +109,7 @@
       <segmentedlist id="attr-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Acl, Libcap, and Patch</seg>
+          <seg>Acl and Libcap</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -144,7 +147,7 @@
       <segmentedlist id="autoconf-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Automake and Coreutils</seg>
+          <seg>Automake</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -186,7 +189,7 @@
       <segmentedlist id="automake-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Coreutils</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -283,15 +286,14 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
           <seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC,
-          Glibc, Grep, Make, Perl, Pkgconf, Sed, Texinfo, Zlib, and
+          Glibc, Grep, Make, Perl, Sed, Texinfo, and Zlib</seg>
-          Zstd</seg>
         </seglistitem>
       </segmentedlist>
 
       <segmentedlist id="binutils-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Glibc, Zlib, and Zstd</seg>
+          <seg>Glibc and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -325,8 +327,8 @@
       <segmentedlist id="bison-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
+          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
-          Grep, M4, Make, Perl, and Sed</seg>
+          Perl, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -399,15 +401,54 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Check dependency info -->
+  <bridgehead renderas="sect2" id="check-dep">Check</bridgehead>
+
+      <segmentedlist id="check-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>Gawk, GCC, Grep, Make, Sed, and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="check-rundeps">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>Bash and Gawk</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="check-testdeps">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="check-before">
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="check-optdeps">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>
+            <ulink url='&github;/testing-cabal/subunit'>libsubunit</ulink>
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Coreutils dependency info -->
   <bridgehead renderas="sect2" id="coreutils-dep">Coreutils</bridgehead>
 
       <segmentedlist id="coreutils-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Autoconf, Automake, Bash, Binutils, Coreutils, GCC, Gettext,
+          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep,
-          Glibc, GMP, Grep, Libcap, Make, OpenSSL, Patch, Perl, Sed, and
+          Libcap, Make, OpenSSL, Patch, Perl, Sed, and Texinfo</seg>
-          Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -828,7 +869,7 @@
       <segmentedlist id="flit-core-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Packaging and Wheel</seg>
+          <seg>Wheel</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -891,7 +932,7 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
           <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-          Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch,
+          Gettext, Glibc, GMP, Grep, Libxcrypt, M4, Make, MPC, MPFR, Patch,
           Perl, Sed, Tar, Texinfo, and Zstd</seg>
         </seglistitem>
       </segmentedlist>
@@ -1003,15 +1044,7 @@
       <segmentedlist id="gettext-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
-          <seg>
+          <seg>None</seg>
-            <ulink url='&blfs-book;general/libunistring.html'>
-              libunistring
-            </ulink>
-            and
-            <ulink url='&blfs-book;general/libxml2.html'>
-              libxml2
-            </ulink>
-          </seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1196,14 +1229,14 @@
       <segmentedlist id="groff-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
-          <seg>None</seg>
+          <seg>No test suite available</seg>
         </seglistitem>
       </segmentedlist>
 
       <segmentedlist id="groff-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Man-DB</seg>
+          <seg>Man-DB and Perl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1232,7 +1265,7 @@
       <segmentedlist id="grub-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Bash, GCC, Gettext, Glibc, Xz, and Sed</seg>
+          <seg>Bash, GCC, Gettext, Glibc, Xz, and Sed.</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1448,7 +1481,7 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            &bdb;,
+            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
             <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>,
             <ulink url="&github;/libbpf/libbpf">libbpf</ulink>,
             <ulink url="&blfs-book;basicnet/libmnl.html">libmnl</ulink>, and
@@ -1458,37 +1491,37 @@
       </segmentedlist>
 
 <!-- Begin Jinja2 dependency info -->
-  <bridgehead renderas="sect2" id="jinja2-dep">Jinja2</bridgehead>
+  <bridgehead revision='systemd' renderas="sect2" id="jinja2-dep">Jinja2</bridgehead>
 
-      <segmentedlist id="jinja2-depends">
+      <segmentedlist id="jinja2-depends" revision='systemd'>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>MarkupSafe, Python, Setuptools, and Wheel</seg>
+          <seg>MarkupSafe and Python</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="jinja2-rundeps">
+      <segmentedlist id="jinja2-rundeps" revision='systemd'>
         <segtitle>&runtime;</segtitle>
         <seglistitem>
           <seg>MarkupSafe and Python</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="jinja2-testdeps">
+      <segmentedlist id="jinja2-testdeps" revision='systemd'>
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
           <seg>No test suite available</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="jinja2-before">
+      <segmentedlist id="jinja2-before" revision='systemd'>
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>&systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="jinja2-optdeps">
+      <segmentedlist id="jinja2-optdeps" revision='systemd'>
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>None</seg>
@@ -1501,7 +1534,7 @@
       <segmentedlist id="kbd-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext,
+         <seg>Bash, Binutils, Bison, Check, Coreutils, Flex, GCC, Gettext,
          Glibc, Gzip, Make, Patch, and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1530,9 +1563,7 @@
       <segmentedlist id="kbd-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
-          <seg>
+          <seg>None</seg>
-            <ulink url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>
-          </seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1571,9 +1602,7 @@
       <segmentedlist id="kmod-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
-          <seg>
+          <seg>None</seg>
-            <ulink url="https://git.sr.ht/~sircmpwn/scdoc/">scdoc</ulink> (for man pages)
-          </seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1598,7 +1627,7 @@
       <segmentedlist id="less-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
-          <seg>None</seg>
+          <seg>No test suite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1845,7 +1874,7 @@
       <segmentedlist id="libxcrypt-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Perl, Python, Shadow, and &systemd-udev;</seg>
+          <seg>GCC, Perl, Python, Shadow, and &systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1892,11 +1921,9 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;general/cpio.html">cpio</ulink>,
+            <ulink url="&blfs-book;general/cpio.html">cpio</ulink> and
             <ulink url="&blfs-book;general/llvm.html">LLVM</ulink>
-            (with Clang), and
+            (with Clang)
-	    <ulink
-  url="&blfs-book;general/rust-bindgen.html">Rust-bindgen</ulink>
           </seg>
         </seglistitem>
       </segmentedlist>
@@ -1940,44 +1967,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin LZ4 dependency info -->
-  <bridgehead renderas="sect2" id="lz4-dep">Lz4</bridgehead>
-
-      <segmentedlist id="lz4-depends">
-        <segtitle>&dependencies;</segtitle>
-        <seglistitem>
-          <seg>Bash, Binutils, Coreutils, GCC, Glibc, and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="lz4-rundeps">
-        <segtitle>&runtime;</segtitle>
-        <seglistitem>
-          <seg>Glibc</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="lz4-testdeps">
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>Python</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="lz4-before">
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>Zstd <phrase revision="systemd">and Systemd</phrase></seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="lz4-optdeps">
-        <segtitle>&external;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin M4 dependency info -->
   <bridgehead renderas="sect2" id="m4-dep">M4</bridgehead>
 
@@ -2109,7 +2098,7 @@
       <segmentedlist id="man-pages-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-         <seg>Bash, Coreutils, Make, and Sed</seg>
+         <seg>Bash, Coreutils, and Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2142,37 +2131,37 @@
       </segmentedlist>
 
 <!-- Begin MarkupSafe dependency info -->
-  <bridgehead renderas="sect2" id="markupsafe-dep">MarkupSafe</bridgehead>
+  <bridgehead renderas="sect2" id="markupsafe-dep" revision='systemd'>MarkupSafe</bridgehead>
 
-      <segmentedlist id="markupsafe-depends">
+      <segmentedlist id="markupsafe-depends" revision='systemd'>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Python, Setuptools, and Wheel</seg>
+          <seg>Python</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-rundeps">
+      <segmentedlist id="markupsafe-rundeps" revision='systemd'>
         <segtitle>&runtime;</segtitle>
         <seglistitem>
           <seg>Python</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-testdeps">
+      <segmentedlist id="markupsafe-testdeps" revision='systemd'>
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
           <seg>No test suite available</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-before">
+      <segmentedlist id="markupsafe-before" revision='systemd'>
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>Jinja2</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-optdeps">
+      <segmentedlist id="markupsafe-optdeps" revision='systemd'>
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>None</seg>
@@ -2185,7 +2174,7 @@
       <segmentedlist id="meson-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Ninja, Python, Setuptools, and Wheel</seg>
+          <seg>Ninja and Python</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2355,7 +2344,7 @@
       <segmentedlist id="ninja-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
-          <seg><ulink url="&blfs-book;general/cmake.html">cmake</ulink></seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2416,61 +2405,20 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Packaging dependency info -->
-  <bridgehead renderas="sect2" id="Packaging-dep">Packaging</bridgehead>
-
-      <segmentedlist id="packaging-depends">
-        <segtitle>&dependencies;</segtitle>
-        <seglistitem>
-          <seg>Flit-core and Python</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="packaging-rundeps">
-        <segtitle>&runtime;</segtitle>
-        <seglistitem>
-          <seg>Python</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="packaging-testdeps">
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="packaging-before">
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>Wheel</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="packaging-optdeps">
-        <segtitle>&external;</segtitle>
-        <seglistitem>
-          <seg>
-            <ulink url='&blfs-book;general/python-modules.html#pytest'>pytest</ulink>
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Patch dependency info -->
   <bridgehead renderas="sect2" id="patch-dep">Patch</bridgehead>
 
       <segmentedlist id="patch-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and
+          <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed</seg>
-          Sed</seg>
         </seglistitem>
       </segmentedlist>
 
       <segmentedlist id="patch-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Attr and Glibc</seg>
+          <seg>Glibc</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2503,7 +2451,7 @@
       <segmentedlist id="perl-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep,
+          <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep, Groff,
           Libxcrypt, Make, Sed, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
@@ -2518,7 +2466,7 @@
       <segmentedlist id="perl-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
-          <seg>Iana-Etc, Less, and Procps-ng</seg>
+          <seg>Iana-Etc, Less. and Procps-ng</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2533,7 +2481,7 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            &bdb;
+            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
           </seg>
         </seglistitem>
       </segmentedlist>
@@ -2566,11 +2514,9 @@
       <segmentedlist id="pkgconf-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Binutils,
+          <seg><phrase revision='systemd'>D-Bus, </phrase>E2fsprogs,
-          <phrase revision='systemd'>D-Bus, </phrase>
+          IProute2, Kmod, Man-DB, Procps-ng, Python,
-          E2fsprogs, IProute2, Kmod, Man-DB, Procps-ng, Python,
+		  &systemd-udev;, and Util-linux</seg>
-          &systemd-udev;, 
-          and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2620,7 +2566,7 @@
           <seg>
             <phrase revision='systemd'>None</phrase>
             <phrase revision='sysv'>
-              <ulink url='&blfs-book;general/elogind.html'>elogind</ulink>
+              <ulink url='&blfs-book;general/elogind.xml'>elogind</ulink>
             </phrase>
           </seg>
         </seglistitem>
@@ -2647,7 +2593,7 @@
       <segmentedlist id="psmisc-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
-          <seg>Expect</seg>
+          <seg>No test suite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2703,7 +2649,7 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            &bdb;,
+            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
             <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>,
             <ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and
             <ulink url="&blfs-book;general/tk.html">Tk</ulink>
@@ -2789,44 +2735,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Setuptools dependency info -->
-  <bridgehead renderas="sect2" id="setuptools-dep">Setuptools</bridgehead>
-
-      <segmentedlist id="setuptools-depends">
-        <segtitle>&dependencies;</segtitle>
-        <seglistitem>
-          <seg>Python and Wheel</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="setuptools-rundeps">
-        <segtitle>&runtime;</segtitle>
-        <seglistitem>
-          <seg>Python</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="setuptools-testdeps">
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="setuptools-before">
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>Jinja2, MarkupSafe, and Meson</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="setuptools-optdeps">
-        <segtitle>&external;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Shadow dependency info -->
   <bridgehead renderas="sect2" id="shadow-dep">Shadow</bridgehead>
 
@@ -2915,7 +2823,7 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
          <seg>Acl, Bash, Binutils, Coreutils, Diffutils, Gawk,
-         GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Libxcrypt, Lz4, Meson,
+         GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Libxcrypt, Meson,
          OpenSSL, Pkgconf, Sed, Util-linux, and Zstd</seg>
         </seglistitem>
       </segmentedlist>
@@ -2946,11 +2854,6 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            <ulink url="https://www.apparmor.net/">AppArmor</ulink>,
-            <ulink url="&github;/linux-audit/audit-userspace">
-              audit-userspace</ulink>,
-            <ulink url="&github;/scop/bash-completion">
-              bash-completion</ulink>,
             <ulink
               url="&blfs-book;postlfs/btrfs-progs.html">btrfs-progs</ulink>,
             <ulink url="&blfs-book;basicnet/curl.html">cURL</ulink>,
@@ -2958,20 +2861,20 @@
             <ulink url="&blfs-book;pst/docbook.html">docbook-xml</ulink>,
             <ulink
               url="&blfs-book;pst/docbook-xsl.html">docbook-xsl-nons</ulink>,
+            <ulink url="https://sourceware.org/elfutils/">elfutils</ulink>,
             <ulink url="&blfs-book;general/git.html">Git</ulink>,
+            <ulink
+              url="https://sourceforge.net/projects/gnu-efi/">gnu-efi</ulink>,
             <ulink url="&blfs-book;postlfs/gnutls.html">GnuTLS</ulink>,
             <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>,
-            <ulink url='https://jekyllrb.com/'>jekyll</ulink>,
             <ulink url="https://www.kernel.org/pub/linux/utils/kernel/kexec/">
               kexec-tools</ulink>,
-            <ulink url='&github;/libbpf/libbpf'>libbpf</ulink>,
-            <ulink url="https://sourceware.org/elfutils/">libdw</ulink>,
             <ulink
               url="https://developers.yubico.com/libfido2/">libfido2</ulink>,
             <ulink url="&blfs-book;general/libgcrypt.html">libgcrypt</ulink>,
             <ulink url="&blfs-book;general/libidn2.html">libidn2</ulink>,
             <ulink url="https://www.gnu.org/software/libmicrohttpd/">
-              libmicrohttpd</ulink>,
+              Libmicrohttpd</ulink>,
             <ulink
               url="&blfs-book;postlfs/libpwquality.html">libpwquality</ulink>,
             <ulink url="&blfs-book;general/libseccomp.html">libseccomp</ulink>,
@@ -2981,36 +2884,29 @@
             <ulink url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>,
             <ulink
               url="&blfs-book;general/python-modules.html#lxml">lxml</ulink>,
+            <ulink url="https://lz4.github.io/lz4/">LZ4</ulink>,
             <ulink url="&blfs-book;postlfs/make-ca.html">make-ca</ulink>,
             <ulink url="&blfs-book;postlfs/p11-kit.html">p11-kit</ulink>,
             <ulink url="&blfs-book;general/pcre2.html">PCRE2</ulink>,
-            <ulink url="&pypi-home;pefile">pefile</ulink>,
             <ulink url="&blfs-book;postlfs/polkit.html">Polkit</ulink>,
-            <ulink url='&pypi-home;/pyelftools'>pyelftools</ulink>,
             <ulink url="&blfs-book;postlfs/qemu.html">qemu</ulink>,
             <ulink url="&blfs-book;general/qrencode.html">qrencode</ulink>,
-            <ulink url="https://sourceforge.net/projects/linuxquota/"
+            <ulink url="https://sourceforge.net/projects/linuxquota/">
-              >quota-tools</ulink>,
+              quota-tools</ulink>,
-            <ulink url="https://rpm.org">rpm</ulink>,
             <ulink url="&blfs-book;basicnet/rsync.html">rsync</ulink>,
-            <ulink url="&github;/SELinuxProject/selinux">
-              SELinux</ulink>,
             <ulink url="&blfs-book;general/python-modules.html#sphinx">
               Sphinx</ulink>,
-            <ulink url="https://sourceware.org/systemtap/">
-              systemtap</ulink>,
             <ulink url="https://tpm2-tss.readthedocs.io/en/latest/">
               tpm2-tss</ulink>,
             <ulink url="&blfs-book;general/valgrind.html">Valgrind</ulink>,
-            <ulink url="https://xenproject.org">Xen</ulink>,
             and
             <ulink url="&blfs-book;postlfs/zsh.html">zsh</ulink>
           </seg>
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin SysVinit dependency info -->
+<!-- Begin Sysvinit dependency info -->
-  <bridgehead renderas="sect2" id="sysvinit-dep" revision='sysv'>SysVinit</bridgehead>
+  <bridgehead renderas="sect2" id="sysvinit-dep" revision='sysv'>Sysvinit</bridgehead>
 
       <segmentedlist id="sysvinit-depends" revision='sysv'>
         <segtitle>&dependencies;</segtitle>
@@ -3242,7 +3138,6 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;general/asciidoctor.html">Asciidoctor</ulink>,
             <ulink
               url="https://people.redhat.com/sgrubb/libcap-ng/">Libcap-NG</ulink>,
             <ulink url="&github;/openSUSE/libeconf">libeconf</ulink>,
@@ -3251,8 +3146,7 @@
             <ulink
               url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>,
             <ulink
-              url="&blfs-book;postlfs/smartmontools.html">smartmontools</ulink>,
+              url="&blfs-book;postlfs/smartmontools.html">smartmontools</ulink>, and
-            <ulink url="https://po4a.org/index.php.en">po4a</ulink>, and
             <ulink url="&blfs-book;general/slang.html">slang</ulink>
           </seg>
         </seglistitem>
@@ -3304,12 +3198,12 @@
       </segmentedlist>
 
 <!-- Begin Wheel dependency info -->
-  <bridgehead renderas="sect2" id="wheel-dep">Wheel</bridgehead>
+  <bridgehead renderas="sect2" id="wheel-dep">wheel</bridgehead>
 
       <segmentedlist id="wheel-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Python, Flit-core, and packaging</seg>
+          <seg>Python and Flit-core</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3331,7 +3225,8 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>
-            Jinja2, MarkupSafe, Meson, and Setuptools
+            <phrase revision='sysv'>None</phrase>
+            <phrase revision='systemd'>Jinja2</phrase>
           </seg>
         </seglistitem>
       </segmentedlist>
@@ -3464,7 +3359,7 @@
       <segmentedlist id="zstd-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Binutils, Coreutils, GCC, Glibc, Gzip, Lz4, Make, Xz, and Zlib</seg>
+          <seg>Binutils, Coreutils, GCC, Glibc, Gzip, Make, Xz, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3485,7 +3380,7 @@
       <segmentedlist id="zstd-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Binutils, GCC, Libelf, and &systemd-udev;</seg>
+          <seg>GCC, Libelf, and &systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3493,7 +3388,7 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            None
+            <ulink url="https://lz4.github.io/lz4/">LZ4</ulink>
           </seg>
         </seglistitem>
       </segmentedlist>

appendices/license.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

appendices/mit-lic.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

appendices/scripts.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

appendices/udev-rules.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -13,7 +13,7 @@
   <title>Udev configuration rules</title>
 
   <para>The rules in this appendix are listed for convenience.  Installation is
-  normally done via instructions in <xref linkend='ch-system-udev' role='.'/>  </para>
+  normally done via instructions in <xref linkend='ch-system-udev'/>.  </para>
 
   <sect1 id="lfsrules" role="wrap">
     <title>55-lfs.rules</title>

aux-file-data.sh

@@ -15,7 +15,7 @@ base=$(basename $bootscripts .tar.xz)
 bootsize=$(ls -l --block-size=1024 $bootscripts | cut -f5 -d" ")
 bootmd5=$(md5sum $bootscripts | cut -f1 -d" ")
 
-# Figure installed size of bootscripts
+# Figure intalled size of bootscripts
 TOPDIR=$(pwd)
 TMP_DIR=$(mktemp -d /tmp/lfsbootfiles.XXXXXX)
 pushd $TMP_DIR > /dev/null

bootscripts/ChangeLog

@@ -1,33 +1,3 @@
-2024-08-25 Xi Ruoyao <xry111@xry111.site>
-   * Remove an empty line and an outdated comment (not valid anymore after
-     /usr merge) from init-functions.
-
-2024-08-24 Andrew Kreimer <algonell@gmail.com>
-   * Fix typos.
-
-2024-08-23 Xi Ruoyao <xry111@xry111.site>
-   * In console, detect FB console by checking /sys/class/graphics/fbcon
-     instead of fb0.  The latter does not exist if CONFIG_FB=n, but
-     CONFIG_DRM_FBDEV_EMULATION=y can support a FB console without
-     CONFIG_FB.
-
-2024-07-12 Xi Ruoyao <xry111@xry111.site>
-   * In mountvirtfs, recreate /dev/fd correctly if it's already created
-     by the initramfs.
-
-2024-07-06 Bruce Dubbs <bdubbs@linuxfromscratch.org>
-   * Add logic to init-functions to only print escape sequences
-	  if stdin and stdout are connected to a terminal.
-
-2024-04-16 Bruce Dubbs <bdubbs@linuxfromscratch.org>
-   * Remove blank output line generated in ifup script when bringing
-	  up wireless interface.
-
-2023-10-04 Pierre Labastie <pierre.labastie@neuf.fr>
-   * After the changes done on 2022-03-24, several "halt stop" should
-     have been changed to "halt start". Done now. Fortunately, those
-     occur only when something wrong happens with disks or devices.
-
 2023-07-28 Xi Ruoyao <xry111@xry111.site>
    * In mountvirtfs, mount /sys/fs/cgroup for udev from systemd-254.
 
@@ -54,7 +24,7 @@
    * New semantics for K and S scripts:
      - S scripts only started if not already marked S in the previous runlevel
      - K scripts only started if not already marked K in the previous runlevel
-     - remove the convention of running S scripts with "stop" in rl 0/6
+     - remove the convention of running S scripts ith "stop" in rl 0/6
 2021-06-08 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * When shutting down the network, ignore invalid interfaces
      or interfaces that are not UP.

bootscripts/lfs/init.d/checkfs

@@ -63,7 +63,7 @@ case "${1}" in
 
          log_info_msg "Press Enter to continue..."
          wait_for_user
-         /etc/rc.d/init.d/halt start
+         /etc/rc.d/init.d/halt stop
       else
          log_success_msg2
       fi
@@ -101,7 +101,7 @@ case "${1}" in
 
       if [ "${error_value}" = 2 -o "${error_value}" = 3 ]; then
          msg="\nWARNING:\n\nFile system errors "
-         msg="${msg}were found and have been "
+         msg="${msg}were found and have been been "
          msg="${msg}corrected, but the nature of the "
          msg="${msg}errors require this system to be rebooted.\n\n"
          msg="${msg}After you press enter, "
@@ -127,7 +127,7 @@ case "${1}" in
 
          log_info_msg "Press Enter to continue..."
          wait_for_user
-         /etc/rc.d/init.d/halt start
+         /etc/rc.d/init.d/halt stop
       fi
 
       if [ "${error_value}" -ge 16 ]; then

bootscripts/lfs/init.d/console

@@ -47,7 +47,7 @@ case "${1}" in
       log_info_msg "Setting up Linux console..."
 
       # Figure out if a framebuffer console is used
-      [ -d /sys/class/graphics/fbcon ] && use_fb=1 || use_fb=0
+      [ -d /sys/class/graphics/fb0 ] && use_fb=1 || use_fb=0
 
       # Figure out the command to set the console into the
       # desired mode

bootscripts/lfs/init.d/mountvirtfs

@@ -83,7 +83,7 @@ case "${1}" in
       ln -sf /proc/self/fd/2 /dev/stderr || failed=1
 
       log_info_msg2 " ${INFO}/dev/fd"
-      ln -sfn /proc/self/fd  /dev/fd     || failed=1
+      ln -sf /proc/self/fd   /dev/fd     || failed=1
 
       if [ -e /proc/kcore ]; then
          log_info_msg2 " ${INFO}/dev/core"

bootscripts/lfs/init.d/sysklogd

@@ -7,9 +7,6 @@
 # Authors     : Gerard Beekmans - gerard@linuxfromscratch.org
 #               DJ Lucas - dj@linuxfromscratch.org
 # Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
-# Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org LFS12.1
-#               Remove kernel log daemon.  The functionality has been
-#               merged with syslogd.                
 #
 # Version     : LFS 7.0
 #
@@ -23,8 +20,8 @@
 # Should-Stop:         sendsignals
 # Default-Start:       2 3 4 5
 # Default-Stop:        0 1 6
-# Short-Description:   Starts system log daemon.
+# Short-Description:   Starts kernel and system log daemons.
-# Description:         Starts system log daemon.
+# Description:         Starts kernel and system log daemons.
 #                      /etc/fstab.
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
@@ -37,9 +34,17 @@ case "${1}" in
       parms=${SYSKLOGD_PARMS-'-m 0'}
       start_daemon /sbin/syslogd $parms
       evaluate_retval
+
+      log_info_msg "Starting kernel log daemon..."
+      start_daemon /sbin/klogd
+      evaluate_retval
       ;;
 
    stop)
+      log_info_msg "Stopping kernel log daemon..."
+      killproc /sbin/klogd
+      evaluate_retval
+
       log_info_msg "Stopping system log daemon..."
       killproc /sbin/syslogd
       evaluate_retval
@@ -60,6 +65,7 @@ case "${1}" in
 
    status)
       statusproc /sbin/syslogd
+      statusproc klogd
       ;;
 
    *)

bootscripts/lfs/init.d/udev

@@ -41,7 +41,7 @@ case "${1}" in
          log_info_msg "$msg"
          log_info_msg "Press Enter to continue..."
          wait_for_user
-         /etc/rc.d/init.d/halt start
+         /etc/rc.d/init.d/halt stop
       fi
 
       # Start the udev daemon to continually watch for, and act on,

bootscripts/lfs/lib/services/init-functions

@@ -58,21 +58,11 @@ SCRIPT_STAT="0"
 # Set any user specified environment variables e.g. HEADLESS
 [ -r /etc/sysconfig/rc.site ]  && . /etc/sysconfig/rc.site
 
-# If HEADLESS is set, use that.  
+## Screen Dimensions
-# If file descriptor 1 or 2 (stdout and stderr) is not open or
+# Find current screen size
-# does not refer to a terminal, consider the script headless.
+if [ -z "${COLUMNS}" ]; then
-[ ! -t 1 -o ! -t 2 ] && HEADLESS=${HEADLESS:-yes}
+   COLUMNS=$(stty size)
-
+   COLUMNS=${COLUMNS##* }
-if [ "x$HEADLESS" != "xyes" ]
-then 
-  ## Screen Dimensions
-  # Find current screen size
-  if [ -z "${COLUMNS}" ]; then
-    COLUMNS=$(stty size)
-    COLUMNS=${COLUMNS##* }
-  fi
-else
-   COLUMNS=80
 fi
 
 # When using remote connections, such as a serial port, stty size returns 0
@@ -457,8 +447,11 @@ pidofproc()
 
     # If a PID file is set and exists, use it.
     if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
+
         # Use the value in the first line of the pidfile
         pidlist=`/bin/head -n1 "${pidfile}"`
+        # This can optionally be written as 'sed 1q' to repalce 'head -n1'
+        # should LFS move /bin/head to /usr/bin/head
     else
         # Use pidof
         pidlist=`pidof "${program}"`
@@ -582,14 +575,9 @@ timespec()
 ################################################################################
 log_success_msg()
 {
-    if [ "x$HEADLESS" != "xyes" ]
+    /bin/echo -n -e "${BMPREFIX}${@}"
-    then 
+    /bin/echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
-      /bin/echo -n -e "${BMPREFIX}${@}"
+
-      /bin/echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
-    else
-      logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
-      /bin/echo -e "${logmessage} OK" 
-    fi
     # Strip non-printable characters from log file
     logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
 
@@ -601,13 +589,8 @@ log_success_msg()
 
 log_success_msg2()
 {
-    if [ "x$HEADLESS" != "xyes" ]
+    /bin/echo -n -e "${BMPREFIX}${@}"
-    then 
+    /bin/echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
-      /bin/echo -n -e "${BMPREFIX}${@}"
-      /bin/echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
-    else
-      echo " OK" 
-    fi
 
     echo " OK" >> ${BOOTLOG}
 
@@ -627,14 +610,8 @@ log_success_msg2()
 ################################################################################
 log_failure_msg()
 {
-    if [ "x$HEADLESS" != "xyes" ]
+    /bin/echo -n -e "${BMPREFIX}${@}"
-    then 
+    /bin/echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
-      /bin/echo -n -e "${BMPREFIX}${@}"
-      /bin/echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
-    else
-      logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
-      /bin/echo -e "${logmessage} FAIL"
-    fi
 
     # Strip non-printable characters from log file
 
@@ -647,13 +624,8 @@ log_failure_msg()
 
 log_failure_msg2()
 {
-    if [ "x$HEADLESS" != "xyes" ]
+    /bin/echo -n -e "${BMPREFIX}${@}"
-    then 
+    /bin/echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
-      /bin/echo -n -e "${BMPREFIX}${@}"
-      /bin/echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
-    else
-      echo "FAIL"
-    fi
 
     echo "FAIL" >> ${BOOTLOG}
 
@@ -671,14 +643,8 @@ log_failure_msg2()
 ################################################################################
 log_warning_msg()
 {
-    if [ "x$HEADLESS" != "xyes" ]
+    /bin/echo -n -e "${BMPREFIX}${@}"
-    then
+    /bin/echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${WARNING_SUFFIX}"
-      /bin/echo -n -e "${BMPREFIX}${@}"
-      /bin/echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${WARNING_SUFFIX}"
-    else
-      logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
-      /bin/echo -e "${logmessage} WARN"
-    fi 
 
     # Strip non-printable characters from log file
     logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
@@ -690,14 +656,8 @@ log_warning_msg()
 
 log_skip_msg()
 {
-    if [ "x$HEADLESS" != "xyes" ]
+    /bin/echo -n -e "${BMPREFIX}${@}"
-    then
+    /bin/echo -e "${CURS_ZERO}${SKIP_PREFIX}${SET_COL}${SKIP_SUFFIX}"
-      /bin/echo -n -e "${BMPREFIX}${@}"
-      /bin/echo -e "${CURS_ZERO}${SKIP_PREFIX}${SET_COL}${SKIP_SUFFIX}"
-    else
-      logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
-      /bin/echo "SKIP"
-    fi
 
     # Strip non-printable characters from log file
     logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
@@ -717,13 +677,7 @@ log_skip_msg()
 ################################################################################
 log_info_msg()
 {
-    if [ "x$HEADLESS" != "xyes" ]
+    /bin/echo -n -e "${BMPREFIX}${@}"
-    then
-      /bin/echo -n -e "${BMPREFIX}${@}"
-    else
-      logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
-      /bin/echo -n -e "${logmessage}"
-    fi
 
     # Strip non-printable characters from log file
     logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
@@ -735,13 +689,7 @@ log_info_msg()
 
 log_info_msg2()
 {
-    if [ "x$HEADLESS" != "xyes" ]
+    /bin/echo -n -e "${@}"
-    then
-      /bin/echo -n -e "${@}"
-    else
-      logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
-      /bin/echo -n -e "${logmessage}"
-    fi
 
     # Strip non-printable characters from log file
     logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`

bootscripts/lfs/sbin/ifup

@@ -110,7 +110,7 @@ for S in ${SERVICE}; do
   fi
 done
 
-#if [ "${SERVICE}" = "wpa" ]; then log_success_msg; fi
+if [ "${SERVICE}" = "wpa" ]; then log_success_msg; fi
 
 # Create/configure the interface
 for S in ${SERVICE}; do

bootscripts/lfs/sbin/ifup.8

@@ -94,7 +94,7 @@ NOTES
                  compound device such as a bridge.
 
        ONBOOT  - If set to 'yes', the specified interface is
-                 configured by the network boot script.
+                 configured by the netowrk boot script.
 
        GATEWAY - The default IP address to use for routing if
                  the destination IP address is not in a static
@@ -112,7 +112,7 @@ NOTES
                  This list is normally a single value, e.g. eth0,
                  for use with a virtual host such as kvm.
 
-       Other parameters that are service specific include:
+       Other paramters that are service specific include:
 
        ipv4-static
 
@@ -128,7 +128,7 @@ NOTES
                      additional IP addresses to a network
                      device.  Example: eth0:2 (optional)
 
-         BROADCAST - The broadcast address for this interface,
+         BROADCAST - The brodcast address for this interface,
                      e.g 192.168.1.255.  If not specified,
                      the broadcast address will be calculated
                      from the IP and PREFIX.
@@ -154,7 +154,7 @@ NOTES
          DHCP_START - Optional parameters to pass to the dhcp client
                       at startup.
 
-         DHCP_STOP  - Optional parameters to pass to the dhcp client
+         DHCP_STOP  - Optional paremeters to pass to the dhcp client
                       at shutdown.
 
          PRINTIP    - Flag to print the dhcp address to stdout

chapter01/askforhelp.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -15,7 +15,7 @@
       In case you've hit an issue building one package with the LFS
       instruction, we strongly discourage posting the issue directly onto
       the upstream support channel before discussing via a LFS support
-      channel listed in <xref linkend="ch-intro-resources" role='.'/>
+      channel listed in <xref linkend="ch-intro-resources"/>.
       Doing so is often quite inefficient because the upstream
       maintainers are rarely familiar with LFS building procedure.  Even if
       you've really hit an upstream issue, the LFS community can still help
@@ -60,7 +60,7 @@
 
     <itemizedlist>
       <listitem>
-        <para>The version of the book being used (in this case &version;)</para>
+        <para>The version of the book being used (in this case &version;<phrase arch="ml_32,ml_x32,ml_all">-multilib</phrase>)</para>
       </listitem>
       <listitem>
         <para>The host distribution and version being used to create LFS</para>
@@ -75,7 +75,7 @@
         <para>The exact error message, or a clear description of the problem</para>
       </listitem>
       <listitem>
-        <para>Note whether you have deviated from the book at all </para>
+        <para>Note whether you have deviated from the book at all</para>
       </listitem>
     </itemizedlist>
 
@@ -110,10 +110,10 @@
     type of information to include from the <command>make</command> screen
     output.</para>
 
-<screen><computeroutput>gcc -D ALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
+<screen><computeroutput>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
--D LOCALEDIR=\"/mnt/lfs/usr/share/locale\"
+-DLOCALEDIR=\"/mnt/lfs/usr/share/locale\"
--D LIBDIR=\"/mnt/lfs/usr/lib\"
+-DLIBDIR=\"/mnt/lfs/usr/lib\"
--D INCLUDEDIR=\"/mnt/lfs/usr/include\" -D HAVE_CONFIG_H -I. -I.
+-DINCLUDEDIR=\"/mnt/lfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
 -g -O2 -c getopt1.c
 gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o
 expand.o file.o function.o getopt.o implicit.o job.o main.o

chapter01/changelog.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -10,7 +10,7 @@
 
   <title>Changelog</title>
 
-  <para>This is version &version; of the Linux From Scratch book, dated
+  <para>This is version &version;<phrase arch="ml_32,ml_x32,ml_all">&version;-multilib</phrase> of the Linux From Scratch book, dated
   &releasedate;. If this book is more than six months old, a newer and better
   version is probably already available. To find out, please check one of the
   mirrors via <ulink url="&lfs-root;mirrors.html"/>.</para>
@@ -40,370 +40,562 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
     <listitem>
-      <para>2025-06-15</para>
+      <para>2023-08-15</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Update to meson-1.8.2. Fixes
+          <para>[bdubbs] - Add a patch to fix a performance regression in
-          <ulink url='&lfs-ticket-root;5743'>#5743</ulink>.</para>
+          glibc's posix_memalign() function. Fixes
+          <ulink url='&lfs-ticket-root;5315'>#5315</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to linux-6.15.2. Fixes
+          <para>[bdubbs] - Update to less-643. Fixes
-          <ulink url='&lfs-ticket-root;5725'>#5725</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5317'>#5317</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to libffi-3.5.1. Fixes
+          <para>[bdubbs] - Update to meson-1.2.1. Fixes
-          <ulink url='&lfs-ticket-root;5741'>#5741</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5314'>#5314</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to iproute2-6.15.0. Fixes
+          <para>[bdubbs] - Update to linux-6.4.10. Fixes
-          <ulink url='&lfs-ticket-root;5732'>#5732</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5313'>#5313</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to Python-3.13.5. Fixes
+          <para>[bdubbs] - Update to iana-etc-20230810.  Addresses
-          <ulink url='&lfs-ticket-root;5743'>#6743</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2025-06-04</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to ncurses-6.5-20250531. Fixes
-          <ulink url='&lfs-ticket-root;5737'>#5737</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to readline-8.3-rc2. Fixes
-          <ulink url='&lfs-ticket-root;5738'>#5738</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bash-5.3-rc2. Fixes
-          <ulink url='&lfs-ticket-root;5738'>#5738</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python-3.13.4. Fixes
-          <ulink url='&lfs-ticket-root;5739'>#6739</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2025-06-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20250519. Addresses
           <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to vim-9.1.1418. Addresses
+          <para>[rahul] - Update to pkgconf-2.0.1. Fixes
-          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5316'>#5316</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kbd-2.8.0. Fixes
-          <ulink url='&lfs-ticket-root;5736'>#5736</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to systemd-257.6. Fixes
-          <ulink url='&lfs-ticket-root;5674'>#5674</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to setuptools-80.9.0. Fixes
-          <ulink url='&lfs-ticket-root;5728'>#5728</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-1.8.1. Fixes
-          <ulink url='&lfs-ticket-root;5731'>#5731</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to automake-1.18. Fixes
-          <ulink url='&lfs-ticket-root;5734'>#5734</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update build instructions to accommodate
-          gcc-15 for bc, expect, ncurses, and gmp.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gcc-15.1.0. Fixes
-          <ulink url='&lfs-ticket-root;5707'>#5707</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to less-678. Fixes
-          <ulink url='&lfs-ticket-root;5724'>#5724</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to readline-8.3-rc1. Fixes
-          <ulink url='&lfs-ticket-root;5726'>#5726</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bash-5.3-rc1. Fixes
-          <ulink url='&lfs-ticket-root;5714'>#5714</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem> 
-      <para>2025-05-15</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to setuptools-80.7.1. Fixes
-          <ulink url='&lfs-ticket-root;5715'>#5715</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to man-pages-6.14. Fixes
-          <ulink url='&lfs-ticket-root;5720'>#5720</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to man-db-2.13.1. Fixes
-          <ulink url='&lfs-ticket-root;5719'>#5719</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to m4-1.4.20. Fixes
-          <ulink url='&lfs-ticket-root;5722'>#5722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-6.14.6. Fixes
-          <ulink url='&lfs-ticket-root;5717'>#5717</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gettext-0.25. Fixes
-          <ulink url='&lfs-ticket-root;5718'>#5718</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
 
     <listitem>
-      <para>2025-05-01</para>
+      <para>2023-08-07</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Update to vim-9.1.1353. Addresses
+          <para>[bdubbs] - Update to xz-5.4.4. Fixes
-          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5307'>#5307</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to setuptools-80.0.1. Fixes
+          <para>[bdubbs] - Update to wheel-0.41.1 (Python Module). Fixes
-          <ulink url='&lfs-ticket-root;5710'>#5710</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5311'>#5311</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to packaging-25.0. Fixes
+          <para>[bdubbs] - Update to man-pages-6.05.01. Fixes
-          <ulink url='&lfs-ticket-root;5706'>#5706</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5306'>#5306</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to meson-1.8.0. Fixes
+          <para>[bdubbs] - Update to linux-6.4.8. Fixes
-          <ulink url='&lfs-ticket-root;5713'>#5713</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5309'>#5309</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to linux-6.14.4. Fixes
+          <para>[bdubbs] - Update to iana-etc-20230804.  Addresses
-          <ulink url='&lfs-ticket-root;5709'>#5709</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20250407. Addresses
           <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to gperf-3.3. Fixes
+          <para>[rahul] - Update to pkgconf-2.0.0. Fixes
-          <ulink url='&lfs-ticket-root;5708'>#5708</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5310'>#5310</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to elfutils-0.193. Fixes
-          <ulink url='&lfs-ticket-root;5711'>#5711</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
 
     <listitem>
-      <para>2025-04-15</para>
+      <para>2023-08-01</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Update to libcap-2.76. Fixes
+          <para>[bdubbs] - Update to vim-9.0.1677.  Addresses
-          <ulink url='&lfs-ticket-root;5704'>#5704</ulink>.</para>
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to perl-5.40.2 (Security update). Fixes
+          <para>[bdubbs] - Update to openssl-3.1.2. Fixes
-          <ulink url='&lfs-ticket-root;5703'>#5703</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5305'>#5305</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Add packaging-24.2 (Python module). Needed for wheel.
+          <para>[bdubbs] - Update to man-pages-6.05. Fixes
-          </para>
+          <ulink url='&lfs-ticket-root;5303'>#5303</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to xz-5.8.1. Fixes
+          <para>[bdubbs] - Update to binutils-2.41. Fixes
-          <ulink url='&lfs-ticket-root;5694'>#5694</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5300'>#5300</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to wheel-0.46.1 (Python Module). Fixes
+          <para>[bdubbs] - Update to gmp-6.3.0. Fixes
-          <ulink url='&lfs-ticket-root;5693'>#5693</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5301'>#5301</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to sysklogd-2.7.2. Fixes
+          <para>[bdubbs] - Update to glibc-2.38. Fixes
-          <ulink url='&lfs-ticket-root;5690'>#5690</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5302'>#5302</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-07-28</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Update udev-lfs tarball to remove obsolete
+           cdrom rules and references to ISDN devices. Fixes
+          <ulink url='&lfs-ticket-root;5291'>#5291</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to Python3-3.13.3. Fixes
+          <para>[bdubbs] - Update to wheel-0.41.0 (Python Module). Fixes
-          <ulink url='&lfs-ticket-root;5697'>#5697</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5290'>#5290</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to openssl-3.5.0. Fixes
+          <para>[bdubbs] - Update to tar-1.35. Fixes
-          <ulink url='&lfs-ticket-root;5701'>#5701</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5287'>#5287</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to meson-1.7.2. Fixes
+          <para>[bdubbs] - Update to<phrase revision='sysv'> udev
-          <ulink url='&lfs-ticket-root;5691'>#5691</ulink>.</para>
+          from</phrase> systemd-254. Fixes
+          <ulink url='&lfs-ticket-root;5293'>#5293</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to linux-6.14.2. Fixes
+          <para>[bdubbs] - Update to meson-1.2.0. Fixes
-          <ulink url='&lfs-ticket-root;5680'>#5680</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5286'>#5286</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.4.7. Fixes
+          <ulink url='&lfs-ticket-root;5288'>#5288</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-13.2.0. Fixes
+          <ulink url='&lfs-ticket-root;5292'>#5292</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.45. Fixes
+          <ulink url='&lfs-ticket-root;5294'>#5294</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision='sysv'>
+      <para>2023-07-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Enable cgroup-based memory pressure information
+          in kernel, and add the cgroup file system into /etc/fstab and the
+          mountvirtfs bootscript.  This is a preparation for udev from
+          systemd-254.  Addresses
+          <ulink url='&lfs-ticket-root;5293'>#5293</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision='sysv'>
+      <para>2023-07-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Make the mountvirtfs bootscript create essential
+          symlinks in /dev.  Fixes
+          <ulink url='&lfs-ticket-root;5289'>#5289</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-07-15</para>
+      <itemizedlist>
         <listitem revision='sysv'>
-          <para>[bdubbs] - Update to libffi-3.4.8. Fixes
+          <para>[xry111] - Replace eudev-3.2.12 with udev from systemd-253.
-          <ulink url='&lfs-ticket-root;5700'>#5700</ulink>.</para>
+          Fixes <ulink url='&lfs-ticket-root;5285'>#5085</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to iproute2-6.14.0. Fixes
+          <para>[bdubbs] - Update to iana-etc-20230629.  Addresses
-          <ulink url='&lfs-ticket-root;5682'>#5682</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to gzip-1.14. Fixes
+          <para>[bdubbs] - Update to linux-6.4.3.  Fixes
-          <ulink url='&lfs-ticket-root;5699'>#5699</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5284'>#5284</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to grep-3.12. Fixes
+          <para>[bdubbs] - Update to  libxcrypt-4.4.36.  Fixes
-          <ulink url='&lfs-ticket-root;5702'>#5702</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5283'>#5283</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to gperf-3.2.1. Fixes
+          <para>[bdubbs] - Update to groff-1.23.0.  Fixes
-          <ulink url='&lfs-ticket-root;5695'>#5695</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5282'>#5282</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to gawk-5.3.2. Fixes
+          <para>[bdubbs] - Update to perl-5.38.0.  Fixes
-          <ulink url='&lfs-ticket-root;5692'>#5692</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5281'>#5281</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to diffutils-3.12. Fixes
-          <ulink url='&lfs-ticket-root;5696'>#5696</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to coreutils-9.7. Fixes
-          <ulink url='&lfs-ticket-root;5698'>#5698</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
 
     <listitem>
-      <para>2025-04-01</para>
+      <para>2023-07-02</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Update to vim-9.1.1263. Addresses
+          <para>[xry111] - Add libxcrypt-4.4.35.  Fixes
-          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5280'>#5280</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to iana-etc-20250328. Addresses
+          <para>[xry111] - Update to iproute2-6.4.0.  Fixes
-          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5277'>#5277</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to xz-5.8.0. Fixes
+          <para>[xry111] - Update to linux-6.4.1.  Fixes
-          <ulink url='&lfs-ticket-root;5684'>#5684</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5276'>#5276</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to util-linux-2.41. Fixes
-          <ulink url='&lfs-ticket-root;5648'>#5648</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tzdata-2025b. Fixes
-          <ulink url='&lfs-ticket-root;5681'>#5681</ulink>.</para>
-        </listitem>
-        <listitem revision='sysv'>
-          <para>[bdubbs] - Update to shadow-4.17.4. Fixes
-          <ulink url='&lfs-ticket-root;5678'>#5678</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to setuptools-78.1.0. Fixes
-          <ulink url='&lfs-ticket-root;5676'>#5676</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to patch-2.8. Fixes
-          <ulink url='&lfs-ticket-root;5689'>#5689</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mpfr-4.2.2. Fixes
-          <ulink url='&lfs-ticket-root;5677'>#5677</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kmod-34.2. Fixes
-          <ulink url='&lfs-ticket-root;5688'>#5688</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gdbm-1.25. Fixes
-          <ulink url='&lfs-ticket-root;5679'>#5679</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to flit_core-3.12.0. Fixes
-          <ulink url='&lfs-ticket-root;5683'>#5683</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to expat-2.7.1. Fixes
-          <ulink url='&lfs-ticket-root;5685'>#5685</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
 
     <listitem>
-      <para>2025-03-15</para>
+      <para>2023-07-01</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Update to vim-9.1.1202. Addresses
+          <para>[bdubbs] - Update to iana-etc-20230615.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vim-9.0.1671.  Addresses
           <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to iana-etc-20250304. Addresses
+          <para>[bdubbs] - Update to util-linux-2.39.1.  Addresses
+          <ulink url='&lfs-ticket-root;5278'>#5278</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.3.10.  Addresses
+          <ulink url='&lfs-ticket-root;5276'>#5276</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[rahul] - Update to kbd-2.6.1.  Fixes
+          <ulink url='&lfs-ticket-root;5279'>#5279</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.22.  Fixes
+          <ulink url='&lfs-ticket-root;5275'>#5275</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-06-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to linux-6.3.8.  Fixes
+          <ulink url='&lfs-ticket-root;5272'>#5272</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to kbd-2.6.0.  Fixes
+          <ulink url='&lfs-ticket-root;5273'>#5273</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[rahul] - Changed from pkg-config to pkgconf-1.9.5.  Fixes
+          <ulink url='&lfs-ticket-root;5274'>#5274</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-06-09</para>
+      <itemizedlist>
+        <listitem revision='systemd'>
+          <para>[bdubbs] - Update to dbus-1.14.8. Fixes 
+          <ulink url='&lfs-ticket-root;5271'>#5271</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.3.6. Fixes
+          <ulink url='&lfs-ticket-root;5269'>#5269</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python-3.11.4. Fixes
+          <ulink url='&lfs-ticket-root;5271'>#5271</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-06-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20230524.  Addresses
           <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
         </listitem>
-        <listitem revision='sysv'>
-          <para>[bdubbs] - Update to sysklogd-2.7.1. Fixes
-          <ulink url='&lfs-ticket-root;5668'>#5668</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to setuptools-76.0.0. Fixes
-          <ulink url='&lfs-ticket-root;5665'>#5665</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to pkgconf-2.4.3. Fixes
-          <ulink url='&lfs-ticket-root;5672'>#5672</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to man-pages-6.13. Fixes
-          <ulink url='&lfs-ticket-root;5673'>#5673</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-6.13.7. Fixes
-          <ulink url='&lfs-ticket-root;5664'>#5664</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.75. Fixes
-          <ulink url='&lfs-ticket-root;5667'>#5667</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kmod-34.1. Fixes
-          <ulink url='&lfs-ticket-root;5671'>#5671</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to jinja2-3.1.6. Fixes
-          <ulink url='&lfs-ticket-root;5670'>#5670</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to expat-2.7.0. Fixes
-          <ulink url='&lfs-ticket-root;5675'>#5675</ulink>.</para>
-        </listitem>
         <listitem revision='systemd'>
-          <para>[bdubbs] - Update to dbus-1.16.2. Fixes
+          <para>[bdubbs] - Update to MarkupSafe-2.1.3 (Python Module). Fixes
-          <ulink url='&lfs-ticket-root;5663'>#5663</ulink>.</para>
+          <ulink url='&lfs-ticket-root;5268'>#5268</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.3.5. Fixes
+          <ulink url='&lfs-ticket-root;5264'>#5264</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-3.1.1. Fixes
+          <ulink url='&lfs-ticket-root;5267'>#5267</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-1.1.1. Fixes
+          <ulink url='&lfs-ticket-root;5266'>#5266</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to diffutils-3.10. Fixes
+          <ulink url='&lfs-ticket-root;5262'>#5262</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-6.6.0. Fixes
+          <ulink url='&lfs-ticket-root;5263'>#5263</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision='sysv'>
+      <para>2023-05-25</para>
+      <itemizedlist>
+        <listitem revision='sysv'>
+          <para>[ken] - Remove unneeded group sgx from eudev rules.  Fixes
+          <ulink url='&lfs-ticket-root;5265'>#5265</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
 
     <listitem>
-      <para>2025-03-05</para>
+      <para>2023-05-18</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - LFS-12.3 released.</para>
+          <para>[bdubbs] - Update to util-linux-2.39.  Fixes
+          <ulink url='&lfs-ticket-root;5259'>#5259</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.3.3. Fixes
+          <ulink url='&lfs-ticket-root;5261'>#5261</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.69. Fixes
+          <ulink url='&lfs-ticket-root;5258'>#5258</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grep-3.11. Fixes
+          <ulink url='&lfs-ticket-root;5256'>#5256</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to flit_core-3.9.0. Fixes
+          <ulink url='&lfs-ticket-root;5257'>#5257</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[bdubbs] - Update to eudev-3.2.12. Fixes
+          <ulink url='&lfs-ticket-root;5260'>#5260</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-05-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to less-633.  Fixes
+          <ulink url='&lfs-ticket-root;5251'>#5251</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.3.2.  Fixes
+          <ulink url='&lfs-ticket-root;5255'>#5255</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to xz-5.4.3.  Fixes
+          <ulink url='&lfs-ticket-root;5252'>#5252</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to gawk-5.2.2.  Fixes
+          <ulink url='&lfs-ticket-root;5253'>#5253</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Fix systemd runtime issue exploited by GCC 13.
+          Fixes <ulink url='&lfs-ticket-root;5254'>#5254</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-05-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-9.0.1503.  Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20230418.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem revision='sysv'>
+          <para>[bdubbs] - Update to sysvinit-3.07.  Fixes
+          <ulink url='&lfs-ticket-root;5250'>#5250</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-6.3.0. Fixes
+          <ulink url='&lfs-ticket-root;5248'>#5248</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-13.1.0. Fixes
+          <ulink url='&lfs-ticket-root;5247'>#5247</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.36.1. Fixes
+          <ulink url='&lfs-ticket-root;5246'>#5246</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.3.1. Fixes
+          <ulink url='&lfs-ticket-root;5245'>#5245</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to coreutils-9.3. Fixes
+          <ulink url='&lfs-ticket-root;5244'>#5244</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-04-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-9.0.1452.  Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20230405.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to zstd-1.5.5. Fixes
+          <ulink url='&lfs-ticket-root;5239'>#5239</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python-3.11.3. Fixes
+          <ulink url='&lfs-ticket-root;5240'>#5240</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-1.1.0. Fixes
+          <ulink url='&lfs-ticket-root;5242'>#5242</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-6.04. Fixes
+          <ulink url='&lfs-ticket-root;5238'>#5238</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.2.11. Fixes
+          <ulink url='&lfs-ticket-root;5241'>#5241</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-03-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to linux-6.2.9 (security fix).  Fixes
+          <ulink url='&lfs-ticket-root;5230'>#5230</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to grep-3.10.  Fixes
+          <ulink url='&lfs-ticket-root;5234'>#5234</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to wheel-0.40.0.  Fixes
+          <ulink url='&lfs-ticket-root;5229'>#5229</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to bc-6.5.0.  Fixes
+          <ulink url='&lfs-ticket-root;5228'>#5228</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to texinfo-7.0.3.  Fixes
+          <ulink url='&lfs-ticket-root;5235'>#5235</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to coreutils-9.2.  Fixes
+          <ulink url='&lfs-ticket-root;5232'>#5232</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to libcap-2.68.  Fixes
+          <ulink url='&lfs-ticket-root;5236'>#5236</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to tzdata-2023c.  Fixes
+          <ulink url='&lfs-ticket-root;5237'>#5237</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to xz-5.4.2.  Fixes
+          <ulink url='&lfs-ticket-root;5233'>#5233</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to openssl-3.1.0.  Fixes
+          <ulink url='&lfs-ticket-root;5227'>#5227</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Add flit-core-3.8.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-03-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to bc-6.4.0.  Fixes
+          <ulink url='&lfs-ticket-root;5217'>#5217</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grep-3.9.  Fixes
+          <ulink url='&lfs-ticket-root;5225'>#5225</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.2.6.  Fixes
+          <ulink url='&lfs-ticket-root;5226'>#5226</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20230306.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>2023-03-04</para>
+      <itemizedlist>
+        <listitem revision='systemd'>
+          <para>[xry111] - Update to systemd-253.  Fixes
+          <ulink url='&lfs-ticket-root;5206'>#5206</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to bc-6.3.1.  Fixes
+          <ulink url='&lfs-ticket-root;5217'>#5217</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.2.2 (security fixes).  Fixes
+          <ulink url='&lfs-ticket-root;5218'>#5218</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to procps-ng-4.0.3.  Fixes
+          <ulink url='&lfs-ticket-root;5220'>#5220</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iproute2-6.2.0.  Fixes
+          <ulink url='&lfs-ticket-root;5221'>#5221</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to meson-1.0.1.  Fixes
+          <ulink url='&lfs-ticket-root;5222'>#5222</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to make-4.4.1.  Fixes
+          <ulink url='&lfs-ticket-root;5223'>#5223</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to libelf-0.189.  Fixes
+          <ulink url='&lfs-ticket-root;5224'>#5224</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Change to a better host requirements script in Chapter 2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-03-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - LFS-11.3 released.</para>
         </listitem>
       </itemizedlist>
     </listitem>

chapter01/chapter01.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter01/how.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter01/resources.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter01/whatsnew.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -11,6 +11,26 @@
 
   <title>What's new since the last release</title>
 
+  <caution>
+    <para>
+      During a development cycle of LFS, the instructions in the book is
+      often modified to adapt for a package update or take the advantage of
+      new features from updated packages.  Mixing up the instructions of
+      different versions of the LFS book can cause subtle breakages.  This
+      kind of issue is generally a result from reusing some script created
+      for a prior LFS release.  Such a reuse is strongly discouraged.  If
+      you are reusing scripts for a prior LFS release for any reason, you'll
+      need to be very careful to update the scripts to match current version
+      of the LFS book.
+    </para>
+  </caution>
+
+  <para>In the 11.4 release, <parameter>--disable-fixincludes</parameter>
+  is set for GCC.  It's a configure switch newly added in GCC 13.1 to
+  prevent GCC from <quote>fixing</quote> the system headers.  Such a
+  <quote>fix</quote> is unnecessary for a modern Linux system and may cause
+  issues if a package is updated after installing GCC.</para>
+
   <para>Here is a list of the packages updated since the previous
   release of LFS.</para>
 
@@ -35,24 +55,27 @@
     <!--<listitem>
       <para>Autoconf-&autoconf-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Automake-&automake-version;</para>
+    </listitem>-->
+    <!--<listitem>
+      <para>Bash &bash-version;</para>
+    </listitem>-->
+    <listitem>
+      <para>Bc &bc-version;</para>
     </listitem>
     <listitem>
-      <para>Bash-&bash-version;</para>
-    </listitem>
-    <!--<listitem>
-      <para>Bc-&bc-version;</para>
-    </listitem>-->
-    <!--<listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bison-&bison-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Bzip2-&bzip2-version;</para>
     </listitem>-->
+    <!--<listitem>
+      <para>Check-&check-version;</para>
+    </listitem>-->
     <listitem>
       <para>Coreutils-&coreutils-version;</para>
     </listitem>
@@ -68,15 +91,18 @@
     <!--<listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem revision="sysv">
+       <para>Udev-&systemd-version; (from systemd)</para>
+    </listitem>-->
+    <!--<listitem>
        <para>Expat-&expat-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
        <para>Expect-&expect-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
        <para>File-&file-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Findutils-&findutils-version;</para>
     </listitem>-->
@@ -84,7 +110,7 @@
       <para>Flex-&flex-version;</para>
     </listitem>-->
     <listitem>
-      <para>Flit-Core-&flit-core-version;</para>
+      <para>Flit-core-&flit-core-version;</para>
     </listitem>
     <listitem>
       <para>Gawk-&gawk-version;</para>
@@ -92,35 +118,35 @@
     <listitem>
        <para>GCC-&gcc-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
        <para>GDBM-&gdbm-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Gettext-&gettext-version;</para>
     </listitem>
-    <!--<listitem>
-      <para>Glibc-&glibc-version;</para>
-    </listitem>-->
-    <!--<listitem>
-      <para>GMP-&gmp-version;</para>
-    </listitem>-->
     <listitem>
-      <para>Gperf-&gperf-version;</para>
+      <para>Glibc-&glibc-version;</para>
     </listitem>
+    <listitem>
+      <para>GMP-&gmp-version;</para>
+    </listitem>
+    <!--<listitem>
+      <para>Gperf-&gperf-version;</para>
+    </listitem>-->
     <listitem>
       <para>Grep-&grep-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Groff-&groff-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GRUB-&grub-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Gzip-&gzip-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
-      <para>Iana-Etc-&iana-etc-version;</para>
+      <para>IANA-Etc-&iana-etc-version;</para>
     </listitem>
     <!--<listitem>
       <para>Inetutils-&inetutils-version;</para>
@@ -131,15 +157,15 @@
     <listitem>
       <para>IPRoute2-&iproute2-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem revision="systemd">
       <para>Jinja2-&jinja2-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Kbd-&kbd-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Kmod-&kmod-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Less-&less-version;</para>
     </listitem>
@@ -150,50 +176,44 @@
       <para>Libcap-&libcap-version;</para>
     </listitem>
     <listitem>
-      <para>Libelf from Elfutils-&elfutils-version;</para>
+      <para>Libelf-&elfutils-version; (from elfutils)</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Libffi-&libffi-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Libpipeline-&libpipeline-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-    <!--<listitem>
-      <para>Libxcrypt-&libxcrypt-version;</para>
-    </listitem>-->
     <listitem>
       <para>Linux-&linux-version;</para>
     </listitem>
     <!--<listitem>
-      <para>Lz4-&lz4-version;</para>
+      <para>M4-&m4-version;</para>
     </listitem>-->
     <listitem>
-      <para>M4-&m4-version;</para>
+      <para>Make-&make-version;</para>
     </listitem>
     <!--<listitem>
-      <para>Make-&make-version;</para>
-    </listitem>-->
-    <listitem>
       <para>Man-DB-&man-db-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Man-pages-&man-pages-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem revision="systemd">
       <para>MarkupSafe-&markupsafe-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Meson-&meson-version;</para>
     </listitem>
     <!--<listitem>
       <para>MPC-&mpc-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>MPFR-&mpfr-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Ncurses-&ncurses-version;</para>
     </listitem>-->
@@ -201,38 +221,35 @@
       <para>Ninja-&ninja-version;</para>
     </listitem>-->
     <listitem>
-      <para>OpenSSL-&openssl-version;</para>
+      <para>Openssl-&openssl-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Patch-&patch-version;</para>
+    </listitem>-->
+    <listitem>
+      <para>Pkgconf-&pkgconf-version;</para>
     </listitem>
     <listitem>
       <para>Perl-&perl-version;</para>
     </listitem>
     <listitem>
-      <para>Pkgconf-&pkgconf-version;</para>
-    </listitem>
-    <!--<listitem>
       <para>Procps-ng-&procps-ng-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Psmisc-&psmisc-version;</para>
     </listitem>-->
     <listitem>
       <para>Python-&python-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Readline-&readline-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Sed-&sed-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
-      <para>Setuptools-&setuptools-version;</para>
-    </listitem>
-    <listitem>
       <para>Shadow-&shadow-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>
@@ -242,42 +259,39 @@
     <!--<listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Tar-&tar-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Tcl-&tcl-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Texinfo-&texinfo-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Tzdata-&tzdata-version;</para>
     </listitem>
-    <!--<listitem revision="sysv">
-      <para>Udev from Systemd-&systemd-version;</para>
-    </listitem>-->
     <listitem>
-      <para>Util-linux-&util-linux-version;</para>
+      <para>Util-Linux-&util-linux-version;</para>
     </listitem>
     <listitem>
       <para>Vim-&vim-version;</para>
     </listitem>
     <listitem>
-      <para>Wheel-&wheel-version;</para>
+      <para>wheel-&wheel-version;</para>
     </listitem>
     <!--<listitem>
-      <para>XML::Parser-&xml-parser-version;</para>
+      <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->
     <listitem>
-      <para>Xz-&xz-version;</para>
+      <para>XZ-Utils-&xz-version;</para>
     </listitem>
     <!--<listitem>
       <para>Zlib-&zlib-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Zstd-&zstd-version;</para>
-    </listitem>-->
+    </listitem>
   </itemizedlist>
 
   <!--<itemizedlist>
@@ -293,23 +307,61 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <listitem>
+    <listitem revision="sysv">
-      <para>Packaging-&packaging-version;</para>
+       <para>Udev-&systemd-version; (from systemd)</para>
-    </listitem>
-    <listitem>
-      <para>coreutils-9.7-upstream_fix-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>perl-5.40.2-upstream_fix-1.patch</para>
     </listitem>
 
+    <listitem revision="sysv">
+      <para>Jinja2-&jinja2-version;</para>
+    </listitem>
+
+    <listitem revision="sysv">
+      <para>MarkupSafe-&markupsafe-version;</para>
+    </listitem>
+
+    <listitem>
+      <para>Libxcrypt-&libxcrypt-version;</para>
+    </listitem>
+
+    <listitem>
+      <para>Pkgconf-&pkgconf-version;</para>
+    </listitem>
+
+    <listitem>
+      <para>Flit-core-&flit-core-version;</para>
+    </listitem>
+
+    <listitem>
+      <para>&glibc-memalign-patch;</para>
+    </listitem>
+
+    <!--<listitem>
+      <para>&grub-upstream-fixes-patch;</para>
+    </listitem>-->
+
+    <!--<listitem>
+      <para>&readline-fixes-patch;</para>
+    </listitem>-->
+
+    <!--<listitem revision="systemd">
+      <para>&systemd-upstream-patch;</para>
+    </listitem>-->
   </itemizedlist>
 
   <itemizedlist>
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
+
+    <listitem revision='sysv'>
+      <para>eudev-3.2.12</para>
+    </listitem>
+
     <listitem>
-      <para>Check-0.15.2</para>
+      <para>Pkg-config-0.29.2</para>
+    </listitem>
+
+    <listitem revision='systemd'>
+      <para>systemd-252-security_fix-1.patch</para>
     </listitem>
   </itemizedlist>
 

chapter02/aboutlfs.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -8,7 +8,7 @@
 <sect1 id="ch-partitioning-aboutlfs">
   <?dbhtml filename="aboutlfs.html"?>
 
-  <title>Setting the $LFS Variable and the Umask</title>
+  <title>Setting The $LFS Variable</title>
 
   <para>Throughout this book, the environment variable <envar>LFS</envar> will
   be used several times. You should ensure that this variable is always defined
@@ -28,24 +28,8 @@
   <quote>/mnt/lfs</quote> (or whatever value the variable was set to) when it
   processes the command line.</para>
 
-  <para>Now set the file mode creation mask (umask) to
-  <literal>022</literal> in case the host distro uses a different
-  default:</para>
-
-<screen role="nodump"><userinput>umask 022</userinput></screen>
-
-  <para>Setting the umask to 022 ensures that newly created files and
-  directories are only writable by their owner, but are readable and
-  searchable (only for directories) by anyone (assuming default modes are
-  used by the <ulink role='man' url='&man;open.2'>open(2)</ulink> system
-  call, new files will end up with permission mode 644 and directories with
-  mode 755).  An overly-permissive default can leave security holes in the
-  LFS system, and an overly-restrictive default can cause strange issues
-  building or using the LFS system.</para>
-
   <caution>
-  <para>Do not forget to check that <envar>LFS</envar> is set and the
+  <para>Do not forget to check that <envar>LFS</envar> is set whenever
-  umask is set to <literal>022</literal> whenever
   you leave and reenter the current working environment (such as when doing a
   <command>su</command> to <systemitem class="username">root</systemitem> or
   another user). Check that the <envar>LFS</envar> variable is set up
@@ -55,40 +39,29 @@
 
   <para>Make sure the output shows the path to your LFS system's build
   location, which is <filename class="directory">/mnt/lfs</filename> if the
-  provided example was followed.</para>
+  provided example was followed. If the output is incorrect, use the command
+  given earlier on this  page to set <envar>$LFS</envar> to the correct
+  directory name.</para>
+  </caution>
 
-  <para>Check that the umask is set up properly with:</para>
+  <note><para>One way to ensure that the <envar>LFS</envar> variable is always
-
+  set is to edit the <filename>.bash_profile</filename> file in both your
-  <screen role="nodump"><userinput>umask</userinput></screen>
+  personal home directory and in  <filename>/root/.bash_profile</filename> and
-
+  enter the export command above.  In addition, the shell specified in the
-  <para>The output may be <computeroutput>0022</computeroutput> or
-  <computeroutput>022</computeroutput> (the number of leading zeros depends
-  on the host distro).</para>
-
-  <para>If any output of these two commands is incorrect, use the command
-  given earlier on this page to set <envar>$LFS</envar> to the correct
-  directory name and set umask to <literal>022</literal>.</para></caution>
-
-  <note><para>One way to ensure that the <envar>LFS</envar> variable and the
-  umask are always set properly is to edit the
-  <filename>.bash_profile</filename> file in both your personal home
-  directory and in  <filename>/root/.bash_profile</filename> and
-  enter the <command>export</command> and <command>umask</command> commands
-  above.  In addition, the shell specified in the
   <filename>/etc/passwd</filename> file for all users that need the
   <envar>LFS</envar> variable must be bash to ensure that the
-  <filename>.bash_profile</filename> file is incorporated as a part of
+  <filename>/root/.bash_profile</filename> file is incorporated as a part of
   the login process.</para>
 
   <para>Another consideration is the method that is used to log into the
   host system.  If logging in through a graphical display manager, the
   user's <filename>.bash_profile</filename> is not normally used when
-  a virtual terminal is started.  In this case, add the commands to
+  a virtual terminal is started.  In this case, add the export command to
   the <filename>.bashrc</filename> file for the user and
   <systemitem class="username">root</systemitem>.  In addition,
   some distributions use an "if" test, and do not run the remaining <filename>.bashrc</filename>
   instructions for a non-interactive bash invocation.  Be sure to place the
-  commands ahead of the test for non-interactive use.</para>
+  export command ahead of the test for non-interactive use.</para>
 
   </note>
 

chapter02/chapter02.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter02/creatingfilesystem.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -50,7 +50,7 @@
     </varlistentry>
   </variablelist>
 
-  <para>Other file systems, including FAT32, NTFS, JFS, and XFS are
+  <para>Other file systems, including FAT32, NTFS, ReiserFS, JFS, and XFS are
   useful for specialized purposes. More information about these file systems, 
   and many others, can be found at <ulink
   url="https://en.wikipedia.org/wiki/Comparison_of_file_systems"/>.</para>

chapter02/creatingpartition.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -40,8 +40,7 @@
   <filename class="devicefile">/dev/sda</filename> for the primary
   disk drive. Create a Linux native partition and a
   <systemitem class="filesystem">swap</systemitem> partition, if needed. Please
-  refer to <ulink role='man' url='&man;cfdisk.8'>cfdisk(8)</ulink> or
+  refer to <filename>cfdisk(8)</filename> or <filename>fdisk(8)</filename> if
-  <ulink role='man' url='&man;fdisk.8'>fdisk(8)</ulink> if
   you do not yet know how to use the programs.</para>
 
   <note><para>For experienced users, other partitioning schemes are possible.

chapter02/hostreqs.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -29,10 +29,9 @@
     minimum versions indicated. This should not be an issue for most
     modern Linux distributions. Also note that many distributions will
     place software headers into separate packages, often in the form of
-    <literal><replaceable>&lt;package-name&gt;</replaceable>-devel</literal>
+    <quote>&lt;package-name&gt;-devel</quote> or
-    or
+    <quote>&lt;package-name&gt;-dev</quote>. Be sure to install those if
-    <literal><replaceable>&lt;package-name&gt;</replaceable>-dev</literal>.
+    your distribution provides them.</para>
-    Be sure to install those if your distribution provides them.</para>
 
    <para>Earlier versions of the listed software packages may work, but have
    not been tested.</para>
@@ -55,9 +54,8 @@
       should be a link to bison or a small script that executes bison)</para>
     </listitem>
 
-    <!-- In Coreutils-8.1 the nproc program is added.  -->
     <listitem>
-      <para><emphasis role="strong">Coreutils-8.1</emphasis></para>
+      <para><emphasis role="strong">Coreutils-7.0</emphasis></para>
     </listitem>
 
     <listitem>
@@ -74,9 +72,7 @@
     </listitem>
 
     <listitem>
-      <!-- Pass 1 GCC FTBFS with GCC-5.1 because of
+      <para><emphasis role="strong">GCC-5.1</emphasis> including the C++
-           https://gcc.gnu.org/PR65801. -->
-      <para><emphasis role="strong">GCC-5.2</emphasis> including the C++
       compiler, <command>g++</command> (Versions greater than &gcc-version; are
       not recommended as they have not been tested). C and C++ standard
       libraries (with headers) must also be present so the C++ compiler can
@@ -100,12 +96,8 @@
       <xref linkend="chapter-building-system"/>, so the workarounds for
       older kernels are not enabled and the compiled
       <application>glibc</application> is slightly faster and smaller.
-      As at Dec 2024, &min-kernel; is the oldest kernel release still
+      As at June 2023, &min-kernel; is the oldest kernel release still
-      supported by the kernel developers.  Some kernel releases older than
+      supported by the kernel developers.</para>
-      &min-kernel; may be still supported by third-party teams, but they
-      are not considered official upstream kernel releases; read
-      <ulink url='https://kernel.org/category/releases.html'/> for the
-      details.</para>
 
       <para>If the host kernel is earlier than &min-kernel; you will need to replace
       the kernel with a more up-to-date version. There are two ways
@@ -153,7 +145,7 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Texinfo-5.0</emphasis></para>
+      <para><emphasis role="strong">Texinfo-4.7</emphasis></para>
     </listitem>
 
     <listitem>
@@ -181,7 +173,7 @@
   <para >To see whether your host system has all the appropriate versions, and
   the ability to compile programs, run the following commands:</para>
 
-<screen role="nodump"><?dbfo keep-together="auto"?><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
 <literal>#!/bin/bash
 # A script to list version numbers of critical development tools
 
@@ -224,16 +216,16 @@ ver_kernel()
    fi
 }
 
-# Coreutils first because --version-sort needs Coreutils >= 7.0
+# Coreutils first because-sort needs Coreutils >= 7.0
-ver_check Coreutils      sort     8.1 || bail "Coreutils too old, stop"
+ver_check Coreutils      sort     7.0 || bail "--version-sort unsupported"
 ver_check Bash           bash     3.2
 ver_check Binutils       ld       2.13.1
 ver_check Bison          bison    2.7
 ver_check Diffutils      diff     2.8.1
 ver_check Findutils      find     4.2.31
 ver_check Gawk           gawk     4.0.1
-ver_check GCC            gcc      5.2
+ver_check GCC            gcc      5.1
-ver_check "GCC (C++)"    g++      5.2
+ver_check "GCC (C++)"    g++      5.1
 ver_check Grep           grep     2.5.1a
 ver_check Gzip           gzip     1.3.12
 ver_check M4             m4       1.4.10
@@ -243,7 +235,7 @@ ver_check Perl           perl     5.8.8
 ver_check Python         python3  3.4
 ver_check Sed            sed      4.1.5
 ver_check Tar            tar      1.22
-ver_check Texinfo        texi2any 5.0
+ver_check Texinfo        texi2any 4.7
 ver_check Xz             xz       5.0.0
 ver_kernel &min-kernel;
 
@@ -265,16 +257,31 @@ echo "Compiler check:"
 if printf "int main(){}" | g++ -x c++ -
 then echo "OK:    g++ works";
 else echo "ERROR: g++ does NOT work"; fi
-rm -f a.out
+rm -f a.out</literal>
-
-if [ "$(nproc)" = "" ]; then
-   echo "ERROR: nproc is not available or it produces empty output"
-else
-   echo "OK: nproc reports $(nproc) logical cores are available"
-fi</literal>
 EOF
 
 bash version-check.sh</userinput></screen>
 
- </sect2>
+    <para arch="ml_32,ml_x32,ml_all">
+      Building multilib support requires the kernel of the host system
+      to have 32-bit emulation support included.
+    </para>
+<screen arch="ml_32,ml_x32,ml_all">Binary Emulations  ---&gt;
+    [*] IA32 Emulation
+    &lt;M&gt;   IA32 a.out support
+    [*] x32 ABI for 64-bit mode
+</screen>
+
+    <para arch="ml_32,ml_x32,ml_all">The option 'IA32 a.out support' is
+      optional. In case your kernel does not have 'x32 ABI for 64-bit mode'
+      enabled but only 'IA32 Emulation', you can continue to build your
+      system but you have to leave out any sections showing instructions
+      for building x32 objects. If neither 'IA32 Emulation' nor 
+      'x32 ABI for 64-bit mode' is enabled, you will run in errors 
+      latest when building <application>glibc</application> in Chapter 6,
+      so an upgrade of your host system kernel is required.
+    </para>
+    
+  </sect2>
+
 </sect1>

chapter02/introduction.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter02/mounting.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -16,7 +16,7 @@
   <envar>LFS</envar> environment variable described in the previous section.
   </para>
   
-  <para>Strictly speaking, one cannot <quote>mount a partition.</quote> One mounts the <emphasis>file
+  <para>Strictly speaking, one cannot "mount a partition". One mounts the <emphasis>file
   system</emphasis> embedded in that partition. But since a single partition can't contain
   more than one file system, people often speak of the partition and the
   associated file system as if they were one and the same.</para>
@@ -42,15 +42,6 @@ mount -v -t ext4 /dev/<replaceable>&lt;yyy&gt;</replaceable> $LFS/home</userinpu
   <replaceable>&lt;yyy&gt;</replaceable> with the appropriate partition
   names.</para>
 
-  <para>Set the owner and permission mode of the
-  <filename class='directory'>$LFS</filename> directory (i.e. the root
-  directory in the newly created file system for the LFS system) to
-  &root; and <literal>755</literal> in case the host distro has been
-  configured to use a different default for <command>mkfs</command>:</para>
-
-<screen role='nodump'><userinput>chown root:root $LFS
-chmod 755 $LFS</userinput></screen>
-
   <para>Ensure that this new partition is not mounted with permissions that are
   too restrictive (such as the <option>nosuid</option> or
   <option>nodev</option> options). Run the <command>mount</command> command

chapter02/stages.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -68,9 +68,8 @@
       </listitem>
 
       <listitem>
-        <para>A few operations, from <quote>Preparing Virtual Kernel File
+        <para>A few operations, from <quote>Changing Ownership</quote> to
-        Systems</quote> to
+        <quote>Entering the Chroot Environment</quote>, must be done as the
-        <quote>Entering the Chroot Environment,</quote> must be done as the
         <systemitem class="username">root</systemitem> user, with the LFS
         environment variable set for the &root; user.</para>
       </listitem>
@@ -87,7 +86,7 @@
          and, as <systemitem class="username">root</systemitem>, running the
          commands in
          <xref linkend='ch-tools-bindmount'/> and
-         <xref linkend='ch-tools-kernfsmount' role='.'/></para>
+         <xref linkend='ch-tools-kernfsmount'/>.</para>
       </listitem>
     </itemizedlist>
   </sect2>

chapter03/chapter03.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter03/introduction.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -22,9 +22,8 @@
 
   <para>For some packages, the release tarball and the (Git or SVN)
   repository snapshot tarball for that release may be published with
-  similar or even identical file names.  But the release tarball may contain
+  similar file names.  A release tarball contains generated files (for
-  some files which are essential despite not stored in the repository
+  example, a <command>configure</command> script generated by
-  (for example, a <command>configure</command> script generated by
   <command>autoconf</command>), in addition to the contents of the
   corresponding repository snapshot.  The book uses release tarballs
   whenever possible. Using a repository snapshot instead of a release

chapter03/packages.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -110,6 +110,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Check (&check-version;) - <token>&check-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&check-home;"/></para>
+        <para>Download: <ulink url="&check-url;"/></para>
+        <para>MD5 sum: <literal>&check-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Coreutils (&coreutils-version;) - <token>&coreutils-size;</token>:</term>
       <listitem>
@@ -233,6 +242,7 @@
         <para>Home page: <ulink url="&gcc-home;"/></para>
         <para>Download: <ulink url="&gcc-url;"/></para>
         <para>MD5 sum: <literal>&gcc-md5;</literal></para>
+        <para>SHA256 sum: <literal>&gcc-sha256;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -346,6 +356,7 @@
         <para>Home page: <ulink url="&inetutils-home;"/></para>
         <para>Download: <ulink url="&inetutils-url;"/></para>
         <para>MD5 sum: <literal>&inetutils-md5;</literal></para>
+        <para>SHA256 sum: <literal>&inetutils-sha256;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -367,6 +378,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry arch="ml_32,ml_x32,ml_all">
+      <term>ISL (&isl-version;) - <token>&isl-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&isl-home;"/></para>
+        <para>Download: <ulink url="&isl-url;"/></para>
+        <para>MD5 sum: <literal>&isl-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Jinja2 (&jinja2-version;) - <token>&jinja2-size;</token>:</term>
       <listitem>
@@ -480,15 +500,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Lz4 (&lz4-version;) - <token>&lz4-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&lz4-home;"/></para>
-        <para>Download: <ulink url="&lz4-url;"/></para>
-        <para>MD5 sum: <literal>&lz4-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>M4 (&m4-version;) - <token>&m4-size;</token>:</term>
       <listitem>
@@ -588,15 +599,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Packaging (&packaging-version;) - <token>&packaging-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&packaging-home;"/></para>
-        <para>Download: <ulink url="&packaging-url;"/></para>
-        <para>MD5 sum: <literal>&packaging-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Patch (&patch-version;) - <token>&patch-size;</token>:</term>
       <listitem>
@@ -677,15 +679,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Setuptools (&setuptools-version;) - <token>&setuptools-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&setuptools-home;"/></para>
-        <para>Download: <ulink url="&setuptools-url;"/></para>
-        <para>MD5 sum: <literal>&setuptools-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term>
       <listitem>
@@ -714,7 +707,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Systemd Man Pages (&systemd-version;) - <token>&systemd-man-size;</token>:</term>
+      <term>Systemd Man Pages(&systemd-version;) - <token>&systemd-man-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&systemd-home;"/></para>
         <para>Download: <ulink url="&systemd-man-url;"/></para>
@@ -730,7 +723,7 @@
 
 
     <varlistentry revision="sysv">
-      <term>SysVinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
+      <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sysvinit-home;"/></para>
         <para>Download: <ulink url="&sysvinit-url;"/></para>
@@ -822,7 +815,8 @@
         <note>
           <para>
             The version of vim changes daily. To get the latest version, go to
-            <ulink url="https://github.com/vim/vim/tags"/>.
+            <ulink url="https://github.com/vim/vim/releases">
+            https://github.com/vim/vim/tags</ulink>.
           </para>
         </note>
       </listitem>

chapter03/patches.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -25,21 +25,22 @@
         <para>MD5 sum: <literal>&autoconf-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
 
-    <varlistentry>
+<!--    <varlistentry>
-      <term>Bash Cross Compile Fix Patch - <token>&bash-crosscompile-fix-patch-size;</token>:</term>
+      <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&bash-crosscompile-fix-patch;"/></para>
+        <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&bash-crosscompile-fix-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 -->
 <!--
     <varlistentry>
-      <term>Binutils Upstream Fixes Patch - <token>&binutils-upstream-patch-size;</token>:</term>
+      <term>Binutils LTO Fix Patch - <token>&binutils-lto-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&binutils-upstream-patch;"/></para>
+        <para>Download: <ulink url="&patches-root;&binutils-lto-patch;"/></para>
-        <para>MD5 sum: <literal>&binutils-upstream-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&binutils-lto-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 -->
@@ -51,14 +52,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Coreutils Upstream Fix Patch - <token>&coreutils-upstream-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&coreutils-upstream-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-upstream-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Coreutils Internationalization Fixes Patch - <token>&coreutils-i18n-patch-size;</token>:</term>
       <listitem>
@@ -66,15 +59,15 @@
         <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
-      <term>Expect GCC15 Patch - <token>&expect-gcc15-patch-size;</token>:</term>
+      <term>Coreutils Chmod Fix Patch - <token>&coreutils-chmod-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&expect-gcc15-patch;"/></para>
+        <para>Download: <ulink url="&patches-root;&coreutils-chmod-patch;"/></para>
-        <para>MD5 sum: <literal>&expect-gcc15-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&coreutils-chmod-patch-md5;</literal></para>
       </listitem>
    </varlistentry>
-
+-->
 <!--
     <varlistentry>
       <term>Gcc glibc-2.36 Fixes Patch - <token>&gcc-upstream-fixes-patch-size;</token>:</term>
@@ -84,15 +77,14 @@
       </listitem>
     </varlistentry>
 -->
-<!--
     <varlistentry>
-      <term>Glibc Upstream Fix Patch - <token>&glibc-upstream-patch-size;</token>:</term>
+      <term>Glibc Memalign Patch - <token>&glibc-memalign-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></para>
+        <para>Download: <ulink url="&patches-root;&glibc-memalign-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&glibc-memalign-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
@@ -101,6 +93,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>GRUB Upstream Fixes Patch - <token>&grub-upstream-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&grub-upstream-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&grub-upstream-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
@@ -125,35 +125,35 @@
       </listitem>
     </varlistentry>
 -->
-
-    <varlistentry>
-      <term>Perl Upstream Fix Patch - <token>&perl-upstream-fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-upstream-fix-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-upstream-fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
 <!--
     <varlistentry>
-      <term>Python Security Fix Patch - <token>&python-security-fixes-patch-size;</token>:</term>
+      <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&python-security-fixes-patch;"/></para>
+        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
-        <para>MD5 sum: <literal>&python-security-fixes-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 -->
 
+    <varlistentry>
+      <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry revision="sysv">
-      <term>SysVinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
+      <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&sysvinit-consolidated-patch;"/></para>
         <para>MD5 sum: <literal>&sysvinit-consolidated-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+
 <!--
     <varlistentry revision="systemd">
-      <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-patch-size;</token>:</term>
+      <term>Systemd Upstream Patch - <token>&systemd-upstream-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&systemd-upstream-patch;"/></para>
         <para>MD5 sum: <literal>&systemd-upstream-patch-md5;</literal></para>

chapter04/aboutsbus.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -26,9 +26,9 @@
   unit of time.</para>
 
   <para>For example, consider a package whose compilation time is 4.5
-  SBUs. This means that if your system took 4 minutes to compile and
+  SBUs. This means that if your system took 10 minutes to compile and
   install the first pass of binutils, it will take
-  <emphasis>approximately</emphasis> 18 minutes to build the example package.
+  <emphasis>approximately</emphasis> 45 minutes to build the example package.
   Fortunately, most build times are shorter than one SBU.</para>
 
   <para>SBUs are not entirely accurate because they depend on many
@@ -36,37 +36,19 @@
   to give an estimate of how long it might take to install a package, but the
   numbers can vary by as much as dozens of minutes in some cases.</para>
 
-  <para>On some newer systems, the motherboard is capable of controlling 
-  the system clock speed. This can be controlled with a command such as
-  <command>powerprofilesctl</command>. This is not available in LFS, but 
-  may be available on the host distro. After LFS is complete, it can be
-  added to a system with the procedures at the
-  <ulink url='&blfs-book;sysutils/power-profiles-daemon.html'>
-  BLFS power-profiles-daemon</ulink> page.
-
-  Before measuring the build time of any package it is advisable to use a
-  system power profile set for maximum performance (and maximum power 
-  consumption). 
-
-  Otherwise the measured SBU value may be inaccurate because the 
-  system may react differently when building <xref linkend='ch-tools-binutils-pass1'/>
-  or other packages.
-
-  Be aware that a significant inaccuracy can still show up even if the same
-  profile is used for both packages because the system may respond slower if
-  the system is idle when starting the build procedure. Setting the power
-  profile to <quote>performance</quote> will minimize this problem.  And
-  obviously doing so will also make the system build LFS faster.</para>
-
-  <para>If <command>powerprofilesctl</command> is available, issue the
-  <command>powerprofilesctl set performance</command> command to select
-  the <literal>performance</literal> profile.  Some distros provides the
-  <command>tuned-adm</command> command for managing the profiles instead of
-  <command>powerprofilesctl</command>, on these distros issue the
-  <command>tuned-adm profile throughput-performance</command> command to
-  select the <literal>throughput-performance</literal> profile.</para>
-
   <note>
+    <para>For many modern systems with multiple processors (or cores) the
+    compilation time for a package can be reduced by performing a "parallel
+    make" by either setting an environment variable or telling the
+    <command>make</command> program how many processors are available.  For
+    instance, an Intel i5-6500 CPU can support four simultaneous processes with:</para>
+
+    <screen role="nodump"><userinput>export MAKEFLAGS='-j4'</userinput></screen>
+
+    <para>or by building with:</para>
+
+    <screen role="nodump"><userinput>make -j4</userinput></screen>
+
     <para>When multiple processors are used in this way, the SBU units in the
     book will vary even more than they normally would.  In some cases, the make
     step will simply fail.  Analyzing the output of the build process will also
@@ -74,11 +56,10 @@
     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 for all packages 
+    <para>The times presented here are based upon using four cores (-j4). The
-    (except <xref linkend='ch-tools-binutils-pass1'/> which is based on one core)
-    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>

chapter04/abouttestsuites.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter04/addinguser.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -20,8 +20,8 @@
   the installation process. As <systemitem class="username">root</systemitem>,
   issue the following commands to add the new user:</para>
 
-<screen><userinput>groupadd &lfs-groupname;
+<screen><userinput>groupadd lfs
-useradd -s /bin/bash -g &lfs-groupname; -m -k /dev/null &lfs-username;</userinput></screen>
+useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
 
   <variablelist>
     <title>This is what the command line options mean:</title>
@@ -74,16 +74,19 @@ useradd -s /bin/bash -g &lfs-groupname; -m -k /dev/null &lfs-username;</userinpu
   have a password), you need to set a password for &lfs-user;.  Issue the
   following command as the &root; user to set the password:</para>
 
-<screen role="nodump"><userinput>passwd &lfs-username;</userinput></screen>
+<screen role="nodump"><userinput>passwd lfs</userinput></screen>
 
   <para>Grant <systemitem class="username">lfs</systemitem> full access to
   all the directories under <filename class="directory">$LFS</filename> by making
   <systemitem class="username">lfs</systemitem> the owner:</para>
 
-<screen><userinput>chown -v &lfs-username; $LFS/{usr{,/*},var,etc,tools}
+<screen><userinput>chown -v lfs $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
 case $(uname -m) in
-  x86_64) chown -v &lfs-username; $LFS/lib64 ;;
+  x86_64) chown -v lfs $LFS/lib64 ;;
 esac</userinput></screen>
+<screen arch="ml_32"  ><userinput>chown -v lfs $LFS/lib32</userinput></screen>
+<screen arch="ml_x32" ><userinput>chown -v lfs $LFS/libx32</userinput></screen>
+<screen arch="ml_all" ><userinput>chown -v lfs $LFS/{lib32,libx32}</userinput></screen>
 
 <note><para>In some host systems, the following <command>su</command> command does not complete
   properly and suspends the login for the &lfs-user; user to the background.
@@ -94,12 +97,11 @@ esac</userinput></screen>
   logging in as &lfs-user; on a virtual console, or with the following
   substitute/switch user command:</para>
 
-<screen role="nodump"><userinput>su - &lfs-username;</userinput></screen>
+<screen role="nodump"><userinput>su - lfs</userinput></screen>
 
   <para>The <quote><parameter>-</parameter></quote> instructs
   <command>su</command> to start a login shell as opposed to a non-login shell.
   The difference between these two types of shells is described in detail in
-  <ulink role='man' url='&man;bash.1'>bash(1)</ulink> and <command>info
+  <filename>bash(1)</filename> and <command>info bash</command>.</para>
-  bash</command>.</para>
 
 </sect1>

chapter04/chapter04.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter04/creatingminlayout.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -30,6 +30,13 @@ done
 case $(uname -m) in
   x86_64) mkdir -pv $LFS/lib64 ;;
 esac</userinput></screen>
+<screen arch="ml_32"><userinput>mkdir -pv $LFS/usr/lib32
+ln -sv usr/lib32 $LFS/lib32</userinput></screen>
+<screen arch="ml_x32"><userinput>mkdir -pv $LFS/usr/libx32
+ln -sv usr/libx32 $LFS/libx32</userinput></screen>
+<screen arch="ml_all"><userinput>mkdir -pv $LFS/usr/lib{,x}32
+ln -sv usr/lib32 $LFS/lib32
+ln -sv usr/libx32 $LFS/libx32</userinput></screen>
 
   <para>Programs in <xref linkend="chapter-temporary-tools"/> will be compiled
   with a cross-compiler (more details can be found in section <xref

chapter04/introduction.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter04/settingenviron.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -38,7 +38,7 @@ EOF</userinput></screen>
   <filename>.bashrc</filename> file instead. Create the
   <filename>.bashrc</filename> file now:</para>
 
-<screen><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
+<screen arch="default"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
 <literal>set +h
 umask 022
 LFS=/mnt/lfs
@@ -49,6 +49,20 @@ if [ ! -L /bin ]; then PATH=/bin:$PATH; fi
 PATH=$LFS/tools/bin:$PATH
 CONFIG_SITE=$LFS/usr/share/config.site
 export LFS LC_ALL LFS_TGT PATH CONFIG_SITE</literal>
+EOF</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
+<literal>set +h
+umask 022
+LFS=/mnt/lfs
+LC_ALL=POSIX
+LFS_TGT=x86_64-lfs-linux-gnu
+LFS_TGT32=i686-lfs-linux-gnu
+LFS_TGTX32=x86_64-lfs-linux-gnux32
+PATH=/usr/bin
+if [ ! -L /bin ]; then PATH=/bin:$PATH; fi
+PATH=$LFS/tools/bin:$PATH
+CONFIG_SITE=$LFS/usr/share/config.site
+export LFS LC_ALL LFS_TGT LFS_TGT32 LFS_TGTX32 PATH</literal>
 EOF</userinput></screen>
 
   <variablelist>
@@ -76,8 +90,11 @@ EOF</userinput></screen>
     <varlistentry>
       <term><parameter>umask 022</parameter></term>
       <listitem>
-        <para>Setting the umask as we've already explained in
+  <para>Setting the user file-creation mask (umask) to 022 ensures that newly
-        <xref linkend='ch-partitioning-aboutlfs' role='.'/></para>
+  created files and directories are only writable by their owner, but are
+  readable and executable by anyone (assuming default modes are used by the
+  <function>open(2)</function> system call, new files will end up with permission
+  mode 644 and directories with mode 755).</para>
       </listitem>
     </varlistentry>
 
@@ -192,55 +209,6 @@ EOF</userinput></screen>
      completed LFS system.</para>
   </important>
 
-  <para>
-    For many modern systems with multiple processors (or cores) the
-    compilation time for a package can be reduced by performing a "parallel
-    make" by telling the make program how many processors are available via
-    a command line option or an environment variable.  For instance, an Intel
-    Core i9-13900K processor has 8 P (performance) cores and
-    16 E (efficiency) cores, and a P core can simultaneously run two threads
-    so each P core are modeled as two logical cores by the Linux kernel.
-    As the result there are 32 logical cores in total.  One obvious way to
-    use all these logical cores is allowing <command>make</command> to spawn
-    up to 32 build jobs.  This can be done by passing the
-    <parameter>-j32</parameter> option to <command>make</command>:
-  </para>
-
-  <screen role='nodump'><userinput>make -j32</userinput></screen>
-
-  <para>
-    Or set the <envar>MAKEFLAGS</envar> environment variable and its
-    content will be automatically used by <command>make</command> as
-    command line options:
-  </para>
-
-  <screen role='nodump'><userinput>export MAKEFLAGS=-j32</userinput></screen>
-
-  <important>
-    <para>
-      Never pass a <parameter>-j</parameter> option without a number to
-      <command>make</command> or set such an option in
-      <envar>MAKEFLAGS</envar>.  Doing so will allow <command>make</command>
-      to spawn infinite build jobs and cause system stability problems.
-    </para>
-  </important>
-
-  <para>
-    To use all logical cores available for building packages in
-    <xref linkend='chapter-cross-tools'/> and
-    <xref linkend='chapter-temporary-tools'/>, set <envar>MAKEFLAGS</envar>
-    now in <filename>.bashrc</filename>:
-  </para>
-
-<screen><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; "EOF"
-<literal>export MAKEFLAGS=-j<replaceable>$(nproc)</replaceable></literal>
-EOF</userinput></screen>
-
-  <para>
-    Replace <replaceable>$(nproc)</replaceable> with the number of logical
-    cores you want to use if you don't want to use all the logical cores.
-  </para>
-
   <para>Finally, to ensure the environment is fully prepared for building the
   temporary tools, force the <command>bash</command> shell to read
   the new user profile:</para>

chapter05/binutils-pass1.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-tools-binutils-pass1" role="wrap" xreflabel="binutils-pass1">
+<sect1 id="ch-tools-binutils-pass1" role="wrap">
   <?dbhtml filename="binutils-pass1.html"?>
 
   <sect1info condition="script">
@@ -70,14 +70,19 @@ cd       build</userinput></screen>
 
     <para>Now prepare Binutils for compilation:</para>
 
-    <screen><userinput remap="configure">../configure --prefix=$LFS/tools \
+    <screen arch="default"><userinput remap="configure">../configure --prefix=$LFS/tools \
+             --with-sysroot=$LFS \
+             --target=$LFS_TGT   \
+             --disable-nls       \
+             --enable-gprofng=no \
+             --disable-werror</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=$LFS/tools       \
              --with-sysroot=$LFS \
              --target=$LFS_TGT   \
              --disable-nls       \
              --enable-gprofng=no \
              --disable-werror    \
-             --enable-new-dtags  \
+             --enable-multilib</userinput></screen>
-             --enable-default-hash-style=gnu</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -134,30 +139,10 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry arch="ml_32,ml_x32,ml_all">
-        <term><parameter>--enable-new-dtags</parameter></term>
+        <term><parameter>--enable-multilib</parameter></term>
         <listitem>
-          <para>This makes the linker use the <quote>runpath</quote> tag for
+          <para>Enables multilib support.</para>
-          embedding library search paths into executables and shared libraries,
-          instead of the traditional <quote>rpath</quote> tag.  It makes
-          debugging dynamically linked executables easier and works around
-          potential issues in the test suite of some packages.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-default-hash-style=gnu</parameter></term>
-        <listitem>
-          <para>By default, the linker would generate both the GNU-style
-          hash table and the classic ELF hash table for shared libraries and
-          dynamically linked executables.  The hash tables are only intended
-          for a dynamic linker to perform symbol lookup.  On LFS the dynamic
-          linker (provided by the Glibc package) will always use the
-          GNU-style hash table which is faster to query.  So the classic
-          ELF hash table is completely useless.  This makes the linker
-          only generate the GNU-style hash table by default, so we can avoid
-          wasting time to generate the classic ELF hash table when we build
-          the packages, or wasting disk space to store it.</para>
         </listitem>
       </varlistentry>
 

chapter05/chapter05.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter05/gcc-pass1.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -62,16 +62,24 @@ mv -v gmp-&gmp-version; gmp
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>On x86_64 hosts, set the default directory name for
+    <para arch="default">On x86_64 hosts, set the default directory name for
     64-bit libraries to <quote>lib</quote>:</para>
 
-<screen><userinput remap="pre">case $(uname -m) in
+<screen arch="default"><userinput remap="pre">case $(uname -m) in
   x86_64)
     sed -e '/m64=/s/lib64/lib/' \
         -i.orig gcc/config/i386/t-linux64
  ;;
 esac</userinput></screen>
 
+    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for
+    libraries:</para>
+
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
+    -i.orig gcc/config/i386/t-linux64
+</userinput></screen>
+
     <para>The GCC documentation recommends building GCC
     in a dedicated build directory:</para>
 
@@ -80,7 +88,7 @@ cd       build</userinput></screen>
 
     <para>Prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">../configure                  \
+<screen arch="default"><userinput remap="configure">../configure                  \
     --target=$LFS_TGT         \
     --prefix=$LFS/tools       \
     --with-glibc-version=&glibc-version; \
@@ -100,6 +108,33 @@ cd       build</userinput></screen>
     --disable-libvtv          \
     --disable-libstdcxx       \
     --enable-languages=c,c++</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure" 
+    arch="ml_32">mlist=m64,m32</userinput><userinput remap="configure"
+    arch="ml_x32">mlist=m64,mx32</userinput><userinput remap="configure"
+    arch="ml_all">mlist=m64,m32,mx32</userinput>
+<userinput remap="configure">../configure                  \
+    --target=$LFS_TGT                              \
+    --prefix=$LFS/tools                            \
+    --with-glibc-version=&glibc-version;                      \
+    --with-sysroot=$LFS                            \
+    --with-newlib                                  \
+    --without-headers                              \
+    --enable-default-pie                           \
+    --enable-default-ssp                           \
+    --enable-initfini-array                        \
+    --disable-nls                                  \
+    --disable-shared                               \
+    --enable-multilib --with-multilib-list=$mlist  \
+    --disable-decimal-float                        \
+    --disable-threads                              \
+    --disable-libatomic                            \
+    --disable-libgomp                              \
+    --disable-libquadmath                          \
+    --disable-libssp                               \
+    --disable-libvtv                               \
+    --disable-libstdcxx                            \
+    --enable-languages=c,c++</userinput></screen>
+
     <variablelist>
       <title>The meaning of the configure options:</title>
 
@@ -139,7 +174,7 @@ cd       build</userinput></screen>
         <listitem>
           <para>Those switches allow GCC to compile programs with
            some hardening security features (more information on those in
-           the <xref linkend="pie-ssp-info"/> in chapter 8) by default. They
+           the <xref linkend="pie-ssp-info"/> in chapter 8) by default. The
            are not strictly needed at this stage, since the compiler will
            only produce temporary executables. But it is cleaner to have the
            temporary packages be as close as possible to the final ones.
@@ -156,13 +191,20 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry arch="default">
         <term><parameter>--disable-multilib</parameter></term>
         <listitem>
           <para>On x86_64, LFS does not support a multilib configuration.
           This switch is harmless for x86.</para>
         </listitem>
       </varlistentry>
+      <varlistentry arch="ml_32,ml_x32,ml_all">
+        <term><parameter>--enable-multilib --with-multilib-list=...</parameter></term>
+        <listitem>
+          <para>LFS canbe used to support multilib. Which they are is
+          specified in the multilib list.</para>
+        </listitem>
+      </varlistentry>
 
       <varlistentry>
         <term><parameter>--disable-threads,

chapter05/glibc.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -47,21 +47,23 @@
     for x86_64, create a compatibility symbolic link required for proper
     operation of the dynamic library loader:</para>
 
-<screen><userinput remap="pre">case $(uname -m) in
+<screen arch="default"><userinput remap="pre">case $(uname -m) in
     i?86)   ln -sfv ld-linux.so.2 $LFS/lib/ld-lsb.so.3
     ;;
     x86_64) ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
             ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3
     ;;
 esac</userinput></screen>
+<!-- no ld-linux.so.2 here as multilib is based on x86_64, not on i686 -->
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
+ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3</userinput></screen>
 
     <note>
       <para>
         The above command is correct.  The <command>ln</command> command has
         several syntactic versions, so be sure to check
-        <command>info coreutils ln</command> and <ulink role='man'
+        <command>info coreutils ln</command> and <filename>ln(1)</filename>
-        url='&man;ln.1'>ln(1)</ulink> before reporting what may appear to be
+        before reporting what may appear to be an error.
-        an error.
       </para>
     </note>
 
@@ -86,13 +88,21 @@ cd       build</userinput></screen>
 
     <para>Next, prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../configure                             \
+<screen arch="default"><userinput remap="configure">../configure                             \
       --prefix=/usr                      \
       --host=$LFS_TGT                    \
       --build=$(../scripts/config.guess) \
-      --disable-nscd                     \
+      --enable-kernel=&min-kernel;               \
-      libc_cv_slibdir=/usr/lib           \
+      --with-headers=$LFS/usr/include    \
-      --enable-kernel=&min-kernel;</userinput></screen>
+      libc_cv_slibdir=/usr/lib</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure                             \
+      --prefix=/usr                      \
+      --host=$LFS_TGT                    \
+      --build=$(../scripts/config.guess) \
+      --enable-kernel=&min-kernel;                \
+      --with-headers=$LFS/usr/include    \
+      --enable-multi-arch                \
+      libc_cv_slibdir=/usr/lib</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -116,18 +126,20 @@ cd       build</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>libc_cv_slibdir=/usr/lib</parameter></term>
+        <term><parameter>--with-headers=$LFS/usr/include</parameter></term>
         <listitem>
-          <para>This ensures that the library is installed in /usr/lib instead
+          <para>This tells Glibc to compile itself against the headers
-          of the default /lib64 on 64-bit machines.</para>
+          recently installed to the $LFS/usr/include directory, so that
+          it knows exactly what features the kernel has and can optimize
+          itself accordingly.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-nscd</parameter></term>
+        <term><parameter>libc_cv_slibdir=/usr/lib</parameter></term>
         <listitem>
-          <para>Do not build the name service cache daemon which is no 
+          <para>This ensures that the library is installed in /usr/lib instead
-          longer used.</para>
+          of the default /lib64 on 64-bit machines.</para>
         </listitem>
       </varlistentry>
 
@@ -148,8 +160,8 @@ cd       build</userinput></screen>
     Gettext package, which the host distribution should provide.</para>
 
     <note><para>There have been reports that this package may fail when
-    building as a <quote>parallel make.</quote>  If that occurs, rerun the make command
+    building as a "parallel make".  If that occurs, rerun the make command
-    with the <option>-j1</option> option.</para></note>
+    with the "-j1" option.</para></note>
 
     <para>Compile the package:</para>
 
@@ -176,9 +188,9 @@ cd       build</userinput></screen>
           packages to define the location where the package should be
           installed. If it is not set, it defaults to the root (<filename
           class="directory">/</filename>) directory. Here we specify that
-          the package is installed in <filename class="directory">
+          the package is installed in <filename class="directory">$LFS
-          $LFS</filename>, which will become the root directory in <xref linkend=
+          </filename>, which will become the root directory in <xref linkend=
-          "ch-tools-chroot" role='.'/></para>
+          "ch-tools-chroot"/>.</para>
         </listitem>
       </varlistentry>
 
@@ -189,98 +201,32 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i $LFS/usr/bin/ldd</userinput></screen>
 
-    <para>Now that our cross toolchain is in place, it is important to ensure
+    <caution>
-    that compiling and linking will work as expected. We do this by performing
+      <para>At this point, it is imperative to stop and ensure that the basic
-    some sanity checks:</para>
+      functions (compiling and linking) of the new toolchain are working as
+      expected. To perform a sanity check, run the following commands:</para>
 
-<screen><userinput>echo 'int main(){}' | $LFS_TGT-gcc -x c - -v -Wl,--verbose &amp;&gt; dummy.log
+<screen><userinput>echo 'int main(){}' | $LFS_TGT-gcc -xc -
-readelf -l a.out | grep ': /lib'</userinput></screen>
+readelf -l a.out | grep ld-linux</userinput></screen>
 
-  <para>There should be no errors,
+      <para>If everything is working correctly, there should be no errors,
-  and the output of the last command will be (allowing for
+      and the output of the last command will be of the form:</para>
-  platform-specific differences in the dynamic linker name):</para>
 
 <screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
 
-  <para>Note that this path should not contain
+      <para arch="default">Note that for 32-bit machines, the interpreter name will be
-  <filename class='directory'>/mnt/lfs</filename> (or the value of
+      <filename>/lib/ld-linux.so.2</filename>.</para>
-  the <envar>LFS</envar> variable if you used a different one).  The path is
-  resolved when the compiled program is executed, and that should only happen
-  after we enter the chroot environment where the kernel would consider
-  <filename class='directory'>$LFS</filename> as the root directory
-  (<filename class='directory'>/</filename>).</para>
 
-  <para>Now make sure that we're set up to use the correct start files:</para>
+      <para>If the output is not as shown above, or there is no output at all,
+      then something is wrong. Investigate and retrace the steps to find out
+      where the problem is and correct it. This issue must be resolved before
+      continuing.</para>
 
-<screen><userinput>grep -E -o "$LFS/lib.*/S?crt[1in].*succeeded" dummy.log</userinput></screen>
+      <para>Once all is well, clean up the test file:</para>
 
-  <para>The output of the last command should be:</para>
+<screen><userinput>rm -v a.out</userinput></screen>
 
-<screen><computeroutput>/mnt/lfs/lib/../lib/Scrt1.o succeeded
+    </caution>
-/mnt/lfs/lib/../lib/crti.o succeeded
-/mnt/lfs/lib/../lib/crtn.o succeeded</computeroutput></screen>
-
-  <para>Verify that the compiler is searching for the correct header
-  files:</para>
-
-<screen><userinput>grep -B3 "^ $LFS/usr/include" dummy.log</userinput></screen>
-
-  <para>This command should return the following output:</para>
-
-<screen><computeroutput>#include &lt;...&gt; search starts here:
- /mnt/lfs/tools/lib/gcc/x86_64-lfs-linux-gnu/&gcc-version;/include
- /mnt/lfs/tools/lib/gcc/x86_64-lfs-linux-gnu/&gcc-version;/include-fixed
- /mnt/lfs/usr/include</computeroutput></screen>
-
-   <para>Again, the directory named after your target triplet may be
-   different than the above, depending on your system architecture.</para>
-
-  <para>Next, verify that the new linker is being used with the correct search paths:</para>
-
-<screen><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
-
-  <para>References to paths that have components with '-linux-gnu' should
-  be ignored, but otherwise the output of the last command should be:</para>
-
-<screen><computeroutput>SEARCH_DIR("=/mnt/lfs/tools/x86_64-lfs-linux-gnu/lib64")
-SEARCH_DIR("=/usr/local/lib64")
-SEARCH_DIR("=/lib64")
-SEARCH_DIR("=/usr/lib64")
-SEARCH_DIR("=/mnt/lfs/tools/x86_64-lfs-linux-gnu/lib")
-SEARCH_DIR("=/usr/local/lib")
-SEARCH_DIR("=/lib")
-SEARCH_DIR("=/usr/lib");</computeroutput></screen>
-
-   <para>A 32-bit system may use a few other directories, but anyway
-   the important facet here is all the paths should begin with an equal sign
-   (<literal>=</literal>), which would be replaced with the sysroot
-   directory that we've configured for the linker.</para>
-
-  <para>Next make sure that we're using the correct libc:</para>
-
-<screen><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
-
-  <para>The output of the last command should be:</para>
-
-<screen><computeroutput>attempt to open /mnt/lfs/usr/lib/libc.so.6 succeeded</computeroutput></screen>
-
-  <para>Make sure GCC is using the correct dynamic linker:</para>
-
-<screen><userinput>grep found dummy.log</userinput></screen>
-
-  <para>The output of the last command should be (allowing for
-  platform-specific differences in dynamic linker name):</para>
-
-<screen><computeroutput>found ld-linux-x86-64.so.2 at /mnt/lfs/usr/lib/ld-linux-x86-64.so.2</computeroutput></screen>
-
-  <para>If the output does not appear as shown above or is not received
-  at all, then something is seriously wrong. Investigate and retrace the
-  steps to find out where the problem is and correct it.  Any
-  issues should be resolved before continuing with the process.</para>
-
-  <para>Once everything is working correctly, clean up the test files:</para>
-
-<screen><userinput>rm -v a.out dummy.log</userinput></screen>
 
     <note><para>Building the packages in the next chapter will serve as an
     additional check that the toolchain has been built properly. If some
@@ -296,6 +242,148 @@ SEARCH_DIR("=/usr/lib");</computeroutput></screen>
 -->
   </sect2>
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  <sect2 arch="ml_32,ml_all">
+    <title>Building Glibc - 32bit</title>
+
+    <para>Now recompile for m32. The extracted source can be
+    reused but needs to be cleaned before installing the m32
+    version of Glibc.</para>
+
+    <para>Clear the build directory and remove artefacts from
+    previous build:</para>
+      
+<screen><userinput remap="pre">make clean
+find .. -name "*.a" -delete</userinput></screen>
+
+    <para>Configure Glibc for m32 with the following commands:</para>
+
+<screen><userinput remap="configure">CC="$LFS_TGT-gcc -m32" \
+CXX="$LFS_TGT-g++ -m32" \
+../configure                             \
+      --prefix=/usr                      \
+      --host=$LFS_TGT32                  \
+      --build=$(../scripts/config.guess) \
+      --enable-kernel=&min-kernel;                \
+      --with-headers=$LFS/usr/include    \
+      --enable-multi-arch                \
+      --libdir=/usr/lib32                \
+      --libexecdir=/usr/lib32            \
+      libc_cv_slibdir=/usr/lib32</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+cp -a DESTDIR/usr/lib32 $LFS/usr/
+install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \
+               $LFS/usr/include/gnu/
+ln -svf ../lib32/ld-linux.so.2 $LFS/lib/ld-linux.so.2</userinput></screen>
+
+
+    <caution>
+      <para>At this point, it is imperative to stop and ensure that the basic
+      functions (compiling and linking) of the new toolchain are working as
+      expected. To perform a sanity check, run the following commands:</para>
+
+<screen><userinput>echo 'int main(){}' &gt; dummy.c
+$LFS_TGT-gcc -m32 dummy.c
+readelf -l a.out | grep '/ld-linux'</userinput></screen>
+
+      <para>If everything is working correctly, there should be no errors,
+      and the output of the last command will be of the form:</para>
+
+<screen><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
+
+      <para>If the output is not shown as above or there was no output at all,
+      then something is wrong. Investigate and retrace the steps to find out
+      where the problem is and correct it. This issue must be resolved before
+      continuing on.</para>
+
+      <para>Once all is well, clean up the test files:</para>
+
+<screen><userinput>rm -v dummy.c a.out</userinput></screen>
+
+    </caution>
+
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_x32,ml_all">
+    <title>Building Glibc - x32bit</title>
+
+    <para>Now recompile for mx32. The extracted source can be
+    reused but needs to be cleaned before installing the mx32
+    version of Glibc.</para>
+
+    <para>Clear the build directory and remove artefacts from
+    previous build:</para>
+      
+<screen><userinput remap="pre">make clean
+find .. -name "*.a" -delete</userinput></screen>
+
+    <para>Configure Glibc for mx32 with the following commands:</para>
+
+<screen><userinput remap="configure">CC="$LFS_TGT-gcc -mx32" \
+CXX="$LFS_TGT-g++ -mx32" \
+../configure                             \
+      --prefix=/usr                      \
+      --host=$LFS_TGTX32                 \
+      --build=$(../scripts/config.guess) \
+      --enable-kernel=&min-kernel;                \
+      --with-headers=$LFS/usr/include    \
+      --enable-multi-arch                \
+      --libdir=/usr/libx32               \
+      --libexecdir=/usr/libx32           \
+      libc_cv_slibdir=/usr/libx32</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+cp -a DESTDIR/usr/libx32 $LFS/usr/
+install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \
+               $LFS/usr/include/gnu/
+ln -svf ../libx32/ld-linux-x32.so.2 $LFS/lib/ld-linux-x32.so.2</userinput></screen>
+
+    <caution>
+      <para>At this point, it is imperative to stop and ensure that the basic
+      functions (compiling and linking) of the new toolchain are working as
+      expected. To perform a sanity check, run the following commands:</para>
+
+<screen><userinput>echo 'int main(){}' &gt; dummy.c
+$LFS_TGT-gcc -mx32 dummy.c
+readelf -l a.out | grep '/ld-linux-x32'</userinput></screen>
+
+      <para>If everything is working correctly, there should be no errors,
+      and the output of the last command will be of the form:</para>
+
+<screen><computeroutput>[Requesting program interpreter: /libx32/ld-linux-x32.so.2]</computeroutput></screen>
+
+      <para>If the output is not shown as above or there was no output at all,
+      then something is wrong. Investigate and retrace the steps to find out
+      where the problem is and correct it. This issue must be resolved before
+      continuing on.</para>
+
+      <para>Once all is well, clean up the test files:</para>
+
+<screen><userinput>rm -v dummy.c a.out</userinput></screen>
+
+    </caution>
+
+  </sect2><!-- mx32 -->
+
   <sect2 role="content">
     <title/>
 

chapter05/introduction.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter05/libstdc++.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -60,13 +60,21 @@ cd       build</userinput></screen>
 
     <para>Prepare Libstdc++ for compilation:</para>
 
-<screen><userinput remap="configure">../libstdc++-v3/configure      \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../libstdc++-v3/configure           \
-    --host=$LFS_TGT            \
+    --host=$LFS_TGT                 \
-    --build=$(../config.guess) \
+    --build=$(../config.guess)      \
-    --prefix=/usr              \
+    --prefix=/usr                   \
-    --disable-multilib         \
+    --enable-multilib               \
-    --disable-nls              \
+    --disable-nls                   \
-    --disable-libstdcxx-pch    \
+    --disable-libstdcxx-pch         \
+    --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
+<screen arch="default"><userinput remap="configure">../libstdc++-v3/configure           \
+    --host=$LFS_TGT                 \
+    --build=$(../config.guess)      \
+    --prefix=/usr                   \
+    --disable-multilib              \
+    --disable-nls                   \
+    --disable-libstdcxx-pch         \
     --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
 
     <variablelist>
@@ -81,6 +89,13 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry arch="ml_32,ml_x32,ml_all">
+        <term><parameter>--enable-multilib</parameter></term>
+        <listitem>
+          <para>Enable building multilib objects.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--disable-libstdcxx-pch</parameter></term>
         <listitem>
@@ -124,7 +139,7 @@ cd       build</userinput></screen>
     <para>Remove the libtool archive files because they are harmful for
     cross-compilation:</para>
 
-<screen><userinput remap="install">rm -v $LFS/usr/lib/lib{stdc++{,exp,fs},supc++}.la</userinput></screen>
+<screen><userinput remap="install">rm -v $LFS/usr/lib/lib{stdc++,stdc++fs,supc++}.la</userinput></screen>
 
   </sect2>
 

chapter05/libxcrypt.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-tools-libxcrypt" role="wrap">
+  <?dbhtml filename="libxcrypt.html"?>
+
+  <sect1info condition="script">
+    <productname>libxcrypt</productname>
+    <productnumber>&libxcrypt-version;</productnumber>
+    <address>&libxcrypt-url;</address>
+  </sect1info>
+
+  <title>Libxcrypt-&libxcrypt-version;</title>
+
+  <indexterm zone="ch-tools-libxcrypt">
+    <primary sortas="a-Libxcrypt">Libxcrypt</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/libxcrypt.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&libxcrypt-fin-sbu;</seg>
+        <seg>&libxcrypt-fin-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libxcrypt</title>
+
+    <para>Prepare Libxcrypt for compilation:</para>
+
+<screen><userinput remap="configure">./configure --target=$LFS_TGT            \
+            --prefix=/usr                \
+            --enable-hashes=strong,glibc \
+            --enable-obsolete-api=no     \
+            --disable-static             \
+            --disable-failure-tokens</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-hashes=strong,glibc</parameter></term>
+        <listitem>
+          <para>Build strong hash algorithms recommended for security use
+          cases, and the hash algorithms provided by traditional Glibc
+          <systemitem class='library'>libcrypt</systemitem> for
+          compatibility.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-obsolete-api=no</parameter></term>
+        <listitem>
+          <para>Disable obsolete API functions.  They are not needed for
+          a modern Linux system built from source.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-failure-tokens</parameter></term>
+        <listitem>
+          <para>Disable failure token feature.  It's needed for
+          compatibility with the traditional hash libraries of some
+          platforms, but a Linux system based on Glibc does not need
+          it.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+
+  </sect2>
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  <sect2 arch="ml_32,ml_all" role="installation">
+    <title>Installation of Libxcrypt - 32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare File for compilation:</para>
+
+<screen><userinput remap="configure">CC="gcc -m32" \
+./configure --target=$LFS_TGT32          \
+            --prefix=/usr                \
+            --host=i686-pc-linux-gnu     \
+            --libdir=/usr/lib32          \
+            --enable-hashes=strong,glibc \
+            --enable-obsolete-api=glibc  \
+            --disable-static             \
+            --disable-failure-tokens</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">cp -av .libs/libcrypt.so* $LFS/usr/lib32/ &amp;&amp;
+make DESTDIR=$LFS install-pkgconfigDATA &amp;&amp;
+ln -svf libxcrypt.pc $LFS/usr/lib32/pkgconfig/libcrypt.pc</userinput></screen>
+
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit  -->
+  <!-- - - - - - - - - - -->
+  <sect2 arch="ml_x32,ml_all" role="installation">
+    <title>Installation of Libxcrypt - x32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare File for compilation:</para>
+
+<screen><userinput remap="configure">CC="gcc -mx32" \
+./configure --target=$LFS_TGT32           \
+            --prefix=/usr                 \
+            --host=x86_64-pc-linux-gnux32 \
+            --libdir=/usr/libx32          \
+            --enable-hashes=strong,glibc  \
+            --enable-obsolete-api=glibc   \
+            --disable-static              \
+            --disable-failure-tokens</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">cp -av .libs/libcrypt.so* $LFS/usr/libx32/ &amp;&amp;
+make DESTDIR=$LFS install-pkgconfigDATA &amp;&amp;
+ln -svf libxcrypt.pc $LFS/usr/libx32/pkgconfig/libcrypt.pc</userinput></screen>
+
+  </sect2><!-- mx32 -->
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in
+    <xref linkend="contents-libxcrypt" role="."/></para>
+
+  </sect2>
+</sect1>

chapter05/linux-headers.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/bash.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -42,11 +42,7 @@
 
   <sect2 role="installation">
     <title>Installation of Bash</title>
-<!--
-    <para>First, fix a problem related to cross compilation and gcc-15:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&bash-crosscompile-fix-patch;</userinput></screen>
--->
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                      \

chapter06/binutils-pass2.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -43,19 +43,13 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
 
-    <!-- Don't remove this until Binutils upstream resolves this issue.
+    <!-- Don't remove this until Binutils upstream updates the libtool
-         We can test by building Binutils on a complete system with
+         copy.  On some host distros the issue doesn't show up.  -->
-         zlib (libz.so) installed, passing enable-shared and
+    <para>Binutils ships an outdated copy of libtool in the tarball.  It lacks
-         without-system-zlib.  If the resulted libctf.so still links against
+    sysroot support, so the produced binaries will be mistakenly linked to
-         libz.so (check with readelf -d) despite we are saying
+    libraries from the host distro.  Work around this issue:</para>
-         without-system-zlib, then the issue is still unresolved.  -->
-    <para>Binutils building system relies on an shipped libtool copy to link against
-    internal static libraries, but the libiberty and zlib copies shipped
-    in the package do not use libtool.  This inconsistency may cause
-    produced binaries mistakenly linked against libraries from the host
-    distro.  Work around this issue:</para>
 
-<screen><userinput remap="pre">sed '6031s/$add_dir//' -i ltmain.sh</userinput></screen>
+<screen><userinput remap="pre">sed '6009s/$add_dir//' -i ltmain.sh</userinput></screen>
 
     <para>Create a separate build directory again:</para>
 
@@ -64,7 +58,16 @@ cd       build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../configure                   \
+<screen arch="default"><userinput remap="configure">../configure                   \
+    --prefix=/usr              \
+    --build=$(../config.guess) \
+    --host=$LFS_TGT            \
+    --disable-nls              \
+    --enable-shared            \
+    --enable-gprofng=no        \
+    --disable-werror           \
+    --enable-64-bit-bfd</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure                   \
     --prefix=/usr              \
     --build=$(../config.guess) \
     --host=$LFS_TGT            \
@@ -73,8 +76,7 @@ cd       build</userinput></screen>
     --enable-gprofng=no        \
     --disable-werror           \
     --enable-64-bit-bfd        \
-    --enable-new-dtags         \
+    --enable-multilib</userinput></screen>
-    --enable-default-hash-style=gnu</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>
@@ -96,6 +98,13 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry arch="ml_32,ml_x32,ml_all">
+        <term><parameter>--enable-multilib</parameter></term>
+        <listitem>
+          <para>Enables multilib support in bintutils.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>

chapter06/chapter06.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/coreutils.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -43,13 +43,17 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
+<!--
+<screen><userinput remap="configure">export gl_cv_macro_MB_CUR_MAX_good=y</userinput></screen>
+-->
     <para>Prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                     \
             --host=$LFS_TGT                   \
             --build=$(build-aux/config.guess) \
             --enable-install-program=hostname \
-            --enable-no-install-program=kill,uptime</userinput></screen>
+            --enable-no-install-program=kill,uptime \
+            gl_cv_macro_MB_CUR_MAX_good=y</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -63,6 +67,13 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><envar>gl_cv_macro_MB_CUR_MAX_good=y</envar></term>
+        <listitem>
+          <para>This is needed to work around an issue in the gnulib copy
+          shipped by the package which would break cross compilation.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>

chapter06/diffutils.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -47,36 +47,8 @@
 
     <screen><userinput remap="configure">./configure --prefix=/usr   \
             --host=$LFS_TGT \
-            gl_cv_func_strcasecmp_works=y \
             --build=$(./build-aux/config.guess)</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <!-- https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d9083a4cc638cf9c7dfc3cc534a7c6b4debf50ab -->
-        <term><parameter>gl_cv_func_strcasecmp_works=y</parameter></term>
-        <listitem>
-          <para>This option specify the result of a check for the
-          <function>strcasecmp</function>.  The check requires running a
-          compiled C program, and this is impossible during
-          cross-compilation because in general a cross-compiled program
-          cannot run on the host distro.  Normally for such a check the
-          <command>configure</command> script would use a fall-back value
-          for cross-compilation, but the fall-back value for this check is
-          absent and the <command>configure</command> script would have no
-          value to use and error out.  The upstream has already fixed the
-          issue, but to apply the fix we'd need to run
-          <command>autoconf</command> that the host distro may lack.  So
-          we just specify the check result (<literal>y</literal> as we know
-          the <function>strcasecmp</function> function in
-          Glibc-&glibc-version; works fine) instead, then
-          <command>configure</command> will just use the specified value and
-          skip the check.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>

chapter06/file.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -78,6 +78,11 @@ popd</userinput></screen>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess)</userinput></screen>
 
+<!-- devs: if using - -build here, the build system wants to compile
+     the signature file with "file" on the build system, but stops if it is not
+     the same version. One possibility would be to build "file" on the build
+     system first, but it is simpler to have the system think it is not
+     cross-compiling, and use the just built "file". -->
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make FILE_COMPILE=$(pwd)/build/src/file</userinput></screen>

chapter06/findutils.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/gawk.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/gcc-pass2.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -57,16 +57,23 @@ mv -v gmp-&gmp-version; gmp
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>If building on x86_64, change the default directory name for 64-bit
+
+    <para arch="default">If building on x86_64, change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 
-<screen><userinput remap="pre">case $(uname -m) in
+<screen arch="default"><userinput remap="pre">case $(uname -m) in
   x86_64)
-    sed -e '/m64=/s/lib64/lib/' \
+    sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64
-        -i.orig gcc/config/i386/t-linux64
   ;;
 esac</userinput></screen>
 
+    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for the
+    libraries:</para>
+
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
+    -i.orig gcc/config/i386/t-linux64</userinput></screen>
+
     <para>Override the building rule of libgcc and libstdc++ headers, to
     allow building these libraries with POSIX threads support:</para>
 
@@ -83,24 +90,46 @@ cd       build</userinput></screen>
 
     <para>Now prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">../configure                   \
+<screen arch="default"><userinput remap="configure">../configure                                       \
-    --build=$(../config.guess) \
+    --build=$(../config.guess)                     \
-    --host=$LFS_TGT            \
+    --host=$LFS_TGT                                \
-    --target=$LFS_TGT          \
+    --target=$LFS_TGT                              \
-    --prefix=/usr              \
+    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc      \
-    --with-build-sysroot=$LFS  \
+    --prefix=/usr                                  \
-    --enable-default-pie       \
+    --with-build-sysroot=$LFS                      \
-    --enable-default-ssp       \
+    --enable-default-pie                           \
-    --disable-nls              \
+    --enable-default-ssp                           \
-    --disable-multilib         \
+    --disable-nls                                  \
-    --disable-libatomic        \
+    --disable-multilib                             \
-    --disable-libgomp          \
+    --disable-libatomic                            \
-    --disable-libquadmath      \
+    --disable-libgomp                              \
-    --disable-libsanitizer     \
+    --disable-libquadmath                          \
-    --disable-libssp           \
+    --disable-libsanitizer                         \
-    --disable-libvtv           \
+    --disable-libssp                               \
-    --enable-languages=c,c++   \
+    --disable-libvtv                               \
-    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc</userinput></screen>
+    --enable-languages=c,c++</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure" 
+    arch="ml_32">mlist=m64,m32</userinput><userinput remap="configure"
+    arch="ml_x32">mlist=m64,mx32</userinput><userinput remap="configure"
+    arch="ml_all">mlist=m64,m32,mx32</userinput>
+<userinput remap="configure">../configure                                       \
+    --build=$(../config.guess)                     \
+    --host=$LFS_TGT                                \
+    --target=$LFS_TGT                              \
+    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc      \
+    --prefix=/usr                                  \
+    --with-build-sysroot=$LFS                      \
+    --enable-default-pie                           \
+    --enable-default-ssp                           \
+    --disable-nls                                  \
+    --enable-multilib --with-multilib-list=$mlist  \
+    --disable-libatomic                            \
+    --disable-libgomp                              \
+    --disable-libquadmath                          \
+    --disable-libsanitizer                         \
+    --disable-libssp                               \
+    --disable-libvtv                               \
+    --enable-languages=c,c++</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title><!-- WIP -->
@@ -124,8 +153,8 @@ cd       build</userinput></screen>
           <para>We are cross-compiling GCC, so it's impossible to build
           target libraries (<filename class="libraryfile">libgcc</filename>
           and <filename class="libraryfile">libstdc++</filename>) with the
-          GCC binaries compiled in this pass&mdash;those binaries won't run
+          previously compiled GCC binaries&mdash;those binaries won't run on the
-          on the host.  The GCC build system will attempt to use the host's
+          host.  The GCC build system will attempt to use the host's
           C and C++ compilers as a workaround by default.
           Building the GCC target libraries with a different
           version of GCC is not supported, so using the host's compilers may cause
@@ -138,11 +167,10 @@ cd       build</userinput></screen>
         <term><parameter>LDFLAGS_FOR_TARGET=...</parameter></term>
         <listitem>
           <para>Allow <filename class="libraryfile">libstdc++</filename> to
-          use the <filename class="libraryfile">libgcc</filename> being
+          use the shared <filename class="libraryfile">libgcc</filename> being
-          built in this pass, instead of the previous version built in
+          built in this pass, instead of the static version that was built in GCC
-          <xref linkend='ch-tools-gcc-pass1'/>.  The previous version cannot
+          pass 1. This is necessary to support C++ exception
-          properly support C++ exception handling because it was built
+          handling.</para>
-          without libc support.</para>
         </listitem>
       </varlistentry>
 
@@ -150,10 +178,12 @@ cd       build</userinput></screen>
         <term><parameter>--disable-libsanitizer</parameter></term>
         <listitem>
           <para>Disable GCC sanitizer runtime libraries.  They are not
-          needed for the temporary installation.  In
+          needed for the temporary installation.  This switch is necessary
-          <xref linkend='ch-tools-gcc-pass1'/> it was implied by
+          to build GCC without
-          <parameter>--disable-libstdcxx</parameter>, and now we can
+          <systemitem class='library'>libcrypt</systemitem> installed for
-          explicitly pass it.</para>
+          the target.  In <xref linkend='ch-tools-gcc-pass1'/> it was
+          implied by <parameter>--disable-libstdcxx</parameter>, but now we
+          have to explicitly pass it.</para>
         </listitem>
       </varlistentry>
 

chapter06/grep.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/gzip.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/introduction.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -26,6 +26,6 @@
   may render your computer unusable.
   This whole chapter must be done as user <systemitem
   class="username">lfs</systemitem>, with the environment as described in
-  <xref linkend="ch-preps-settingenviron" role='.'/></para>
+  <xref linkend="ch-preps-settingenviron"/>.</para>
 
 </sect1>

chapter06/m4.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/make.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -45,9 +45,23 @@
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr   \
+            --without-guile \
             --host=$LFS_TGT \
             --build=$(build-aux/config.guess)</userinput></screen>
 
+    <variablelist>
+      <title>The meaning of the new configure option:</title>
+
+      <varlistentry>
+        <term><parameter>--without-guile</parameter></term>
+        <listitem>
+          <para>Although we are cross-compiling, configure tries to use
+          guile from the build host if it finds it. This makes compilation
+          fail, so this switch prevents using it.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>

chapter06/ncurses.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -43,17 +43,18 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>First, run the following commands to build the <quote>tic</quote>
+    <para>First, ensure that <command>gawk</command> is found first during configuration:</para>
-      program on the build host. We install it in
+
-      <filename class="directory">$LFS/tools</filename>, so that it is found
+<screen><userinput remap="pre">sed -i s/mawk// configure</userinput></screen>
-      in the <envar>PATH</envar> when needed:</para>
+
+    <para>Then, run the following commands to build the <quote>tic</quote>
+    program on the build host:</para>
 
 <screen><userinput remap="pre">mkdir build
 pushd build
-  ../configure --prefix=$LFS/tools AWK=gawk
+  ../configure
   make -C include
   make -C progs tic
-  install progs/tic $LFS/tools/bin
 popd</userinput></screen>
 
     <para>Prepare Ncurses for compilation:</para>
@@ -69,7 +70,7 @@ popd</userinput></screen>
             --without-debug              \
             --without-ada                \
             --disable-stripping          \
-            AWK=gawk</userinput></screen>
+            --enable-widec</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>
@@ -77,7 +78,7 @@ popd</userinput></screen>
       <varlistentry>
         <term><parameter>--with-manpage-format=normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses from installing compressed manual
+          <para>This prevents Ncurses installing compressed manual
           pages, which may happen if the host distribution itself
           has compressed manual pages.</para>
         </listitem>
@@ -93,7 +94,7 @@ popd</userinput></screen>
       <varlistentry>
         <term><parameter>--without-normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses from building and installing static C
+          <para>This prevents Ncurses building and installing static C
           libraries.</para>
         </listitem>
       </varlistentry>
@@ -101,7 +102,7 @@ popd</userinput></screen>
       <varlistentry>
         <term><parameter>--without-debug</parameter></term>
         <listitem>
-          <para>This prevents Ncurses from building and installing debug
+          <para>This prevents Ncurses building and installing debug
           libraries.</para>
         </listitem>
       </varlistentry>
@@ -133,15 +134,19 @@ popd</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>AWK=gawk</parameter></term>
+        <term><parameter>--enable-widec</parameter></term>
         <listitem>
-          <para>This switch prevents the building system from using the
+          <para>This switch causes wide-character libraries (e.g., <filename
-          <command>mawk</command> program from the host.
+          class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
-          Some<!-- FIXME vauge --> versions of <command>mawk</command> can
+          to be built instead of normal ones (e.g., <filename
-          cause this package to fail to build.  <!-- It seems happened in 2015,
+          class="libraryfile">libncurses.so.&ncurses-version;</filename>).
-          is there any updated into? --></para>
+          These wide-character libraries are usable in both multibyte and
+          traditional 8-bit locales, while normal libraries work properly
+          only in 8-bit locales. Wide-character and normal libraries are
+          source-compatible, but not binary-compatible.</para>
         </listitem>
       </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
@@ -150,37 +155,33 @@ popd</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR=$LFS install
+<screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
-ln -sv libncursesw.so $LFS/usr/lib/libncurses.so
+echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
-sed -e 's/^#if.*XOPEN.*$/#if 1/' \
+<!--
-    -i $LFS/usr/include/curses.h</userinput></screen>
+    <para>Remove an unneeded static library not handled by
+    <command>configure</command>:</para>
 
+<screen><userinput remap="install">rm -v $LFS/usr/lib/libncurses++w.a</userinput></screen>
+-->
     <variablelist>
       <title>The meaning of the install options:</title>
 
       <varlistentry>
-        <term><command>ln -sv libncursesw.so $LFS/usr/lib/libncurses.so</command></term>
+        <term><parameter>TIC_PATH=$(pwd)/build/progs/tic</parameter></term>
         <listitem>
-          <para>The <filename>libncurses.so</filename> library is needed by
+          <para>We need to pass the path of the newly built
-          a few packages we will build soon. We create this symlink to use
+          <command>tic</command> program that runs on the building machine, so
-          <filename>libncursesw.so</filename> as a replacement.</para>
+          the terminal database can be created without errors.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><command>sed -e 's/^#if.*XOPEN.*$/#if 1/' ...</command></term>
+        <term><command>echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</command></term>
         <listitem>
-          <para>The header file <filename>curses.h</filename> contains
+          <para>The <filename>libncurses.so</filename> library is needed by
-          the definition of various Ncurses data structures.  With different
+          a few packages we will build soon. We create this small linker
-          preprocessor macro definitions two different sets of the data
+          script, as this is what is done in <xref
-          structure definition may be used: the 8-bit definition is
+          linkend="chapter-building-system"/>.</para>
-          compatible with <filename>libncurses.so</filename> and the
-          wide-character definition is compatible with
-          <filename>libncursesw.so</filename>.  Since we are using
-          <filename>libncursesw.so</filename> as a replacement of
-          <filename>libncurses.so</filename>, edit the header file so it
-          will always use the wide-character data structure definition
-          compatible with <filename>libncursesw.so</filename>.</para>
         </listitem>
       </varlistentry>
 
@@ -188,6 +189,86 @@ sed -e 's/^#if.*XOPEN.*$/#if 1/' \
 
   </sect2>
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  <sect2 arch="ml_32,ml_all">
+    <title>Building Ncurses - 32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare Ncurses for compilation:</para>
+
+<screen><userinput remap="configure">CC="$LFS_TGT-gcc -m32"              \
+CXX="$LFS_TGT-g++ -m32"             \
+./configure --prefix=/usr           \
+            --host=$LFS_TGT32       \
+            --build=$(./config.guess)    \
+            --libdir=/usr/lib32     \
+            --mandir=/usr/share/man \
+            --with-shared           \
+            --without-normal        \
+            --with-cxx-shared       \
+            --without-debug         \
+            --without-ada           \
+            --disable-stripping     \
+            --enable-widec</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
+ln -s libncursesw.so DESTDIR/usr/lib32/libcursesw.so
+cp -Rv DESTDIR/usr/lib32/* $LFS/usr/lib32
+rm -rf DESTDIR</userinput></screen>
+
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+  <sect2 arch="ml_x32,ml_all">
+    <title>Building Ncurses - x32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare Ncurses for compilation:</para>
+
+<screen><userinput remap="configure">CC="$LFS_TGT-gcc -mx32"             \
+CXX="$LFS_TGT-g++ -mx32"            \
+./configure --prefix=/usr           \
+            --host=$LFS_TGTX32      \
+            --build=$(./config.guess)    \
+            --libdir=/usr/libx32    \
+            --mandir=/usr/share/man \
+            --with-shared           \
+            --without-normal        \
+            --with-cxx-shared       \
+            --without-debug         \
+            --without-ada           \
+            --disable-stripping     \
+            --enable-widec</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
+ln -s libncursesw.so DESTDIR/usr/libx32/libcursesw.so
+cp -Rv DESTDIR/usr/libx32/* $LFS/usr/libx32
+rm -rf DESTDIR</userinput></screen>
+
+  </sect2><!-- mx32 -->
+
   <sect2 role="content">
     <title/>
 

chapter06/patch.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/sed.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter06/tar.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -45,8 +45,8 @@
 
     <para>Prepare Tar for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr   \
+<screen><userinput remap="configure">./configure --prefix=/usr                     \
-            --host=$LFS_TGT \
+            --host=$LFS_TGT                   \
             --build=$(build-aux/config.guess)</userinput></screen>
 
     <para>Compile the package:</para>

chapter06/xz.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter07/bison.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter07/changingowner.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -33,9 +33,14 @@
   user <systemitem class="username">root</systemitem> by running the following
   command:</para>
 
-<screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,var,etc,tools}
+<screen><userinput>chown -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
 case $(uname -m) in
-  x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;;
+  x86_64) chown -R root:root $LFS/lib64 ;;
 esac</userinput></screen>
 
+  <para arch="ml_32,ml_x32,ml_all">Some more directories exists for
+  multilib support. Change their ownership, too:</para>
+<screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">chown -R root:root $LFS/lib32</userinput>
+<userinput arch="ml_x32,ml_all">chown -R root:root $LFS/libx32</userinput></screen>
+  
 </sect1>

chapter07/chapter07.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter07/chroot.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -23,20 +23,8 @@
     TERM="$TERM"                \
     PS1='(lfs chroot) \u:\w\$ ' \
     PATH=/usr/bin:/usr/sbin     \
-    MAKEFLAGS="-j<replaceable>$(nproc)</replaceable>"      \
-    TESTSUITEFLAGS="-j<replaceable>$(nproc)</replaceable>" \
     /bin/bash --login</userinput></screen>
 
-  <para>
-    If you don't want to use all available logical cores, replace
-    <replaceable>$(nproc)</replaceable> with the number of logical cores you
-    want to use for building packages in this chapter and the following
-    chapters.  The test suites of some packages (notably Autoconf, Libtool,
-    and Tar) in &ch-final; are not affected by <envar>MAKEFLAGS</envar>, they
-    use a <envar>TESTSUITEFLAGS</envar> environment variable instead. We
-    set that here as well for running these test suites with multiple cores.
-  </para>
-
   <para>The <parameter>-i</parameter> option given to the <command>env</command>
   command will clear all the variables in the chroot environment. After that, only
   the <envar>HOME</envar>, <envar>TERM</envar>, <envar>PS1</envar>, and
@@ -59,7 +47,7 @@
   in the <envar>PATH</envar>. This means that the cross toolchain will no longer be
   used.</para>
 
-  <para>Also note that the <command>bash</command> prompt will say
+  <para>Note that the <command>bash</command> prompt will say
   <computeroutput>I have no name!</computeroutput> This is normal because the
   <filename>/etc/passwd</filename> file has not been created yet.</para>
 

chapter07/cleanup.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -23,7 +23,10 @@
     libltdl, and it's known that some .la files can cause BLFS package
     failures.  Remove those files now:</para>
 
-<screen><userinput>find /usr/{lib,libexec} -name \*.la -delete</userinput></screen>
+<screen><userinput>find /usr/{lib,libexec} -name \*.la -delete</userinput><userinput arch="ml_32">
+find /usr/lib32 -name \*.la -delete</userinput><userinput arch="ml_x32">
+find /usr/libx32 -name \*.la -delete</userinput><userinput arch="ml_all">
+find /usr/lib{,x}32 -name \*.la -delete</userinput></screen>
 
     <para>
       The current system size is now about 3 GB, however
@@ -88,8 +91,7 @@
         make sure you have set <envar>LFS</envar>.
      </para>
      <para>
-       This has been discussed in
+        This has been discussed in <xref linkend='ch-partitioning-aboutlfs'/>.
-       <xref linkend='ch-partitioning-aboutlfs' role='.'/>
       </para>
     </important>
 

chapter07/createfiles.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -107,6 +107,7 @@ dialout:x:10:
 audio:x:11:
 video:x:12:
 utmp:x:13:
+usb:x:14:
 cdrom:x:15:
 adm:x:16:
 messagebus:x:18:
@@ -134,6 +135,7 @@ dialout:x:10:
 audio:x:11:
 video:x:12:
 utmp:x:13:
+usb:x:14:
 cdrom:x:15:
 adm:x:16:
 messagebus:x:18:
@@ -180,11 +182,7 @@ EOF</userinput></screen>
   <systemitem class="groupname">nogroup</systemitem> to avoid an
   unnamed ID.  But other distros may treat this ID differently, so any
   portable program should not depend on this assignment.</para>
-<!--
-  <para>Some packages need a locale.</para>
 
-<screen><userinput>localedef -i C -f UTF-8 C.UTF-8</userinput></screen>
--->
   <para>Some tests in <xref linkend="chapter-building-system"/> need a regular
   user. We add this user here and delete this account at the end of that
   chapter.</para>
@@ -219,23 +217,8 @@ chmod -v 600  /var/log/btmp</userinput></screen>
   failed login attempts.  The <filename>/var/log/btmp</filename> file records
   the bad login attempts.</para>
 
-  <!-- systemd no longer creates this -->
+  <note><para>The <filename>/run/utmp</filename> file records the users that
-  <note revision='sysv'><para>The <filename>/run/utmp</filename> file
+  are currently logged in.  This file is created dynamically in the boot
-  records the users that are currently logged in.  This file is created
+  scripts.</para></note>
-  dynamically in the boot scripts.</para></note>
-
-  <!-- AFAIK they are not vital for system function, users requiring such
-       info should rely on systemd-logind or elogind or some custom PAM
-       module.  Maybe we can stop to create them at all.  -->
-  <note>
-    <para>
-      The <phrase revision='sysv'><filename>utmp</filename>,
-      </phrase><filename>wtmp</filename>, <filename>btmp</filename>, and
-      <filename>lastlog</filename> files use 32-bit integers for timestamps
-      and they'll be fundamentally broken after year 2038.  Many packages
-      have stopped using them and other packages are going to stop using
-      them.  It is probably best to consider them deprecated.
-    </para>
-  </note>
 
 </sect1>

chapter07/creatingdirs.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -28,7 +28,6 @@
 mkdir -pv /lib/firmware
 mkdir -pv /media/{floppy,cdrom}
 mkdir -pv /usr/{,local/}{include,src}
-mkdir -pv /usr/lib/locale
 mkdir -pv /usr/local/{bin,lib,sbin}
 mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
 mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
@@ -42,6 +41,9 @@ ln -sfv /run/lock /var/lock
 install -dv -m 0750 /root
 install -dv -m 1777 /tmp /var/tmp</userinput></screen>
 
+  <para arch="ml_32,ml_x32,ml_all">Required directories for multilib
+  support has already been created while previous installation steps.</para>
+
   <para>Directories are, by default, created with permission mode 755, but
   this is not desirable everywhere. In the commands above, two
   changes are made&mdash;one to the home directory of user <systemitem

chapter07/gettext.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter07/introduction.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter07/kernfs.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -63,14 +63,11 @@
 
       <para>Now mount the remaining virtual kernel file systems:</para>
 
-      <!-- Do not put any option after $LFS/${mountpoint} or jhalfs cannot
+<screen><userinput>mount -v --bind /dev/pts $LFS/dev/pts
-           handle it! -->
-
-<screen><userinput>mount -vt devpts devpts -o gid=5,mode=0620 $LFS/dev/pts
 mount -vt proc proc $LFS/proc
 mount -vt sysfs sysfs $LFS/sys
 mount -vt tmpfs tmpfs $LFS/run</userinput></screen>
-
+<!--
     <variablelist>
       <title>The meaning of the mount options for devpts:</title>
 
@@ -98,12 +95,11 @@ mount -vt tmpfs tmpfs $LFS/run</userinput></screen>
       </varlistentry>
 
     </variablelist>
-
+-->
       <para>In some host systems, <filename>/dev/shm</filename> is a
-      symbolic link to a directory, typically
+      symbolic link to <filename class="directory">/run/shm</filename>.
-      <filename class="directory">/run/shm</filename>.
       The /run tmpfs was mounted above so in this case only a
-      directory needs to be created with the correct permissions.</para>
+      directory needs to be created.</para>
 
       <para>In other host systems <filename>/dev/shm</filename> is a mount point 
       for a tmpfs. In that case the mount of /dev above will only create
@@ -111,9 +107,9 @@ mount -vt tmpfs tmpfs $LFS/run</userinput></screen>
       we must explicitly mount a tmpfs:</para>
 
 <screen><userinput>if [ -h $LFS/dev/shm ]; then
-  install -v -d -m 1777 $LFS$(realpath /dev/shm)
+  mkdir -pv $LFS/$(readlink $LFS/dev/shm)
 else
-  mount -vt tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm
+  mount -t tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm
 fi</userinput></screen>
 
   </sect2>

chapter07/perl.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -45,20 +45,19 @@
 
     <para>Prepare Perl for compilation:</para>
 
-    <screen><userinput remap="configure">sh Configure -des                                         \
+    <screen><userinput remap="configure">sh Configure -des                                        \
-             -D prefix=/usr                               \
+             -Dprefix=/usr                               \
-             -D vendorprefix=/usr                         \
+             -Dvendorprefix=/usr                         \
-             -D useshrplib                                \
+             -Duseshrplib                                \
-             -D privlib=/usr/lib/perl5/&perl-version-min;/core_perl     \
+             -Dprivlib=/usr/lib/perl5/&perl-version-min;/core_perl     \
-             -D archlib=/usr/lib/perl5/&perl-version-min;/core_perl     \
+             -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl     \
-             -D sitelib=/usr/lib/perl5/&perl-version-min;/site_perl     \
+             -Dsitelib=/usr/lib/perl5/&perl-version-min;/site_perl     \
-             -D sitearch=/usr/lib/perl5/&perl-version-min;/site_perl    \
+             -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl    \
-             -D vendorlib=/usr/lib/perl5/&perl-version-min;/vendor_perl \
+             -Dvendorlib=/usr/lib/perl5/&perl-version-min;/vendor_perl \
-             -D vendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl</userinput></screen>
+             -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the Configure options:</title>
+      <title>The meaning of the new Configure options:</title>
-
       <varlistentry>
         <term><parameter>-des</parameter></term>
         <listitem>
@@ -68,35 +67,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>-D vendorprefix=/usr</parameter></term>
-        <listitem>
-          <para>This ensures <command>perl</command> knows how to
-          tell packages where they should install their Perl modules.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>-D useshrplib</parameter></term>
-        <listitem>
-          <para>Build <systemitem class='library'>libperl</systemitem>
-          needed by some Perl modules as a shared library, instead of
-          a static library.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>-D privlib,-D archlib,-D sitelib,...</parameter></term>
-        <listitem>
-          <para>These settings define where Perl looks for installed
-          modules. The LFS editors chose to put them in a directory structure
-          based on the MAJOR.MINOR version of Perl (&perl-version-min;) which
-          allows upgrading Perl to newer patch levels (the patch level is
-          the last dot separated part in the full version string like
-          &perl-version;) without reinstalling all of the modules.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
     <para>Compile the package:</para>

chapter07/python.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -44,18 +44,17 @@
     <title>Installation of Python</title>
 
     <note>
-      <para>There are two package files whose name starts with the
+      <para>There are two package files whose name starts with
-      <quote>python</quote> prefix. The one to extract from is
+      <quote>python</quote>. The one to extract from is
       <filename>Python-&python-version;.tar.xz</filename> (notice the
       uppercase first letter).</para>
     </note>
 
     <para>Prepare Python for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr       \
+<screen><userinput remap="configure">./configure --prefix=/usr   \
-            --enable-shared     \
+            --enable-shared \
-            --without-ensurepip \
+            --without-ensurepip</userinput></screen>
-            --without-static-libpython</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
@@ -75,13 +74,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--without-static-libpython</parameter></term>
-        <listitem>
-          <para>This switch prevents building a large, but unneeded, static
-          library.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>
@@ -91,9 +83,9 @@
     <note>
       <para>
         Some Python 3 modules can't be built now because the dependencies
-        are not installed yet. For the <filename>ssl</filename> module,
+        are not installed yet. The building system still attempts to build
-        a message <computeroutput>Python requires a OpenSSL 1.1.1 or
+        them however, so the compilation of some files will fail and the
-        newer</computeroutput> is outputted.
+        compiler message may seem to indicate <quote>fatal error</quote>.
         The message should be ignored.  Just make sure the toplevel
         <command>make</command> command has not failed.  The optional
         modules are not needed now and they will be built in

chapter07/texinfo.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter07/util-linux.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -51,20 +51,19 @@
 
     <para>Prepare Util-linux for compilation:</para>
 
-    <screen><userinput remap="configure">./configure --libdir=/usr/lib     \
+<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
-            --runstatedir=/run    \
+            --libdir=/usr/lib    \
-            --disable-chfn-chsh   \
+            --runstatedir=/run   \
-            --disable-login       \
+            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
-            --disable-nologin     \
+            --disable-chfn-chsh  \
-            --disable-su          \
+            --disable-login      \
-            --disable-setpriv     \
+            --disable-nologin    \
-            --disable-runuser     \
+            --disable-su         \
-            --disable-pylibmount  \
+            --disable-setpriv    \
-            --disable-static      \
+            --disable-runuser    \
-            --disable-liblastlog2 \
+            --disable-pylibmount \
-            --without-python      \
+            --disable-static     \
-            ADJTIME_PATH=/var/lib/hwclock/adjtime \
+            --without-python</userinput></screen>
-            --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -127,6 +126,88 @@
 
   </sect2>
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
+    <title>Installation of Util-linux - 32-bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare Util-linux for compilation:</para>
+
+<screen><userinput remap="configure">CC="gcc -m32" \
+./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
+            --libdir=/usr/lib32      \
+            --host=i686-pc-linux-gnu \
+            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
+            --disable-chfn-chsh  \
+            --disable-login      \
+            --disable-nologin    \
+            --disable-su         \
+            --disable-setpriv    \
+            --disable-runuser    \
+            --disable-pylibmount \
+            --disable-static     \
+            --without-python     \
+            runstatedir=/run</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+rm -rf DESTDIR</userinput></screen>
+
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
+    <title>Installation of Util-linux - x32-bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare Util-linux for compilation:</para>
+
+<screen><userinput remap="configure">CC="gcc -mx32" \
+./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
+            --libdir=/usr/libx32 \
+            --host=x86_64-pc-linux-gnux32 \
+            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
+            --disable-chfn-chsh  \
+            --disable-login      \
+            --disable-nologin    \
+            --disable-su         \
+            --disable-setpriv    \
+            --disable-runuser    \
+            --disable-pylibmount \
+            --disable-static     \
+            --without-python     \
+            runstatedir=/run</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+rm -rf DESTDIR</userinput></screen>
+
+  </sect2><!-- mx32 -->
+
   <sect2 role="content">
     <title/>
 

chapter08/aboutdebug.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">

chapter08/acl.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -44,8 +44,8 @@
 
     <para>Prepare Acl for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr    \
+<screen><userinput remap="configure">./configure --prefix=/usr         \
-            --disable-static \
+            --disable-static      \
             --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -53,13 +53,10 @@
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>The Acl tests must be run on a filesystem that supports access
-    controls.  To test the results, issue:</para>
+    controls, but not until the <application>Coreutils</application> package has been built,
-
+    using the <application>Acl</application> libraries.  If desired, return to this package
-<screen><userinput remap="test">make check</userinput></screen>
+    and run <command>make check</command> after the <application>Coreutils</application>
-
+    package has been built.</para>
-    <para>One test named <filename>test/cp.test</filename> is known to
-    fail because <application>Coreutils</application> is not built with
-    the <application>Acl</application> support yet.</para>
 
     <para>Install the package:</para>
 
@@ -67,6 +64,70 @@
 
   </sect2>
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
+    <title>Installation of Acl - 32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare Xz for compilation:</para>
+
+<screen><userinput remap="configure">CC="gcc -m32" ./configure \
+    --prefix=/usr         \
+    --disable-static      \
+    --libdir=/usr/lib32   \
+    --libexecdir=/usr/lib32   \
+    --host=i686-pc-linux-gnu</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+rm -rf DESTDIR</userinput></screen>
+
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
+    <title>Installation of Acl - x32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare Xz for compilation:</para>
+
+<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
+    --prefix=/usr          \
+    --disable-static       \
+    --libdir=/usr/libx32   \
+    --libexecdir=/usr/libx32   \
+    --host=x86_64-pc-linux-gnux32</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+rm -rf DESTDIR</userinput></screen>
+
+  </sect2><!-- mx32 -->
+
   <sect2 id="contents-acl" role="content">
     <title>Contents of Acl</title>
 

chapter08/attr.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -64,6 +64,70 @@
 
   </sect2>
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
+    <title>Installation of Attr - 32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare Attr for compilation:</para>
+
+<screen><userinput remap="configure">CC="gcc -m32" ./configure \
+    --prefix=/usr         \
+    --disable-static      \
+    --sysconfdir=/etc     \
+    --libdir=/usr/lib32   \
+    --host=i686-pc-linux-gnu</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+rm -rf DESTDIR</userinput></screen>
+
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
+    <title>Installation of Attr - x32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make distclean</userinput></screen>
+
+    <para>Prepare Attr for compilation:</para>
+
+<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
+    --prefix=/usr          \
+    --disable-static       \
+    --sysconfdir=/etc      \
+    --libdir=/usr/libx32   \
+    --host=x86_64-pc-linux-gnux32</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+rm -rf DESTDIR</userinput></screen>
+
+  </sect2><!-- mx32 -->
+
   <sect2 id="contents-attr" role="content">
     <title>Contents of Attr</title>
 

chapter08/autoconf.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -41,6 +41,12 @@
   <sect2 role="installation">
     <title>Installation of Autoconf</title>
 
+    <para>First, fix several problems with the tests caused by bash-5.2 and later:</para>
+
+    <screen><userinput remap="pre">sed -e 's/SECONDS|/&amp;SHLVL|/'               \
+    -e '/BASH_ARGV=/a\        /^SHLVL=/ d' \
+    -i.orig tests/local.at</userinput></screen>
+
     <para>Prepare Autoconf for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
@@ -55,6 +61,17 @@
     To run the tests anyway, issue:</para>
  -->
 <screen><userinput remap="test">make check</userinput></screen>
+<!--
+    <para>This takes a long time, about &autoconf-fin-sbu-tests; SBUs. In addition,
+    several tests are skipped that use Automake. For full test coverage,
+    Autoconf can be re-tested after Automake has been installed.  In addition,
+    two tests fail due to changes in libtool-2.4.3 and later.</para>
+-->
+    <note><para>The test time for autoconf can be reduced significantly on a
+    system with multiple cores.  To do this, append
+    <command>TESTSUITEFLAGS=-j&lt;N&gt;</command> to the line above.  For
+    instance, using -j4 can reduce the test time by over 60
+    percent.</para></note>
 
     <para>Install the package:</para>
 
@@ -136,7 +153,7 @@
           <para>Helps to create a <filename>configure.in</filename> file for a
           software package; it examines the source files in a directory tree,
           searching them for common portability issues, and creates a
-          <filename>configure.scan</filename> file that serves as a
+          <filename>configure.scan</filename> file that serves as as a
           preliminary <filename>configure.in</filename> file for the
           package</para>
           <indexterm zone="ch-system-autoconf autoscan">

chapter08/automake.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -53,14 +53,13 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>Using four parallel jobs speeds up the tests, even on systems with
+    <para> Using the -j4 make option speeds up the tests, even on systems with
-    less logical cores, due to internal delays in individual tests.  To test
+    only one processor, due to internal delays in individual tests.  To test
     the results, issue:</para>
 
-<screen><userinput remap="test">make <replaceable>-j$(($(nproc)&gt;4?$(nproc):4))</replaceable> check</userinput></screen>
+<screen><userinput remap="test">make -j4 check</userinput></screen>
 
-    <para>Replace <replaceable>$((...))</replaceable> with the number of
+    <para>The test t/subobj.sh is known to fail.</para>
-    logical cores you want to use if you don't want to use all.</para>
 
     <para>Install the package:</para>
 

chapter08/bash.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -71,7 +71,7 @@
 
     <para>To prepare the tests, ensure that the <systemitem class="username">tester</systemitem> user can write to the sources tree:</para>
 
-<screen><userinput remap="test">chown -R tester .</userinput></screen>
+<screen><userinput remap="test">chown -Rv tester .</userinput></screen>
 
     <para>The test suite of this package is designed to be run as a non-&root;
     user who owns the terminal connected to standard input.  To satisfy the
@@ -79,7 +79,7 @@
     <application>Expect</application> and run the tests as the <systemitem
     class="username">tester</systemitem> user:</para>
 
-<screen><userinput remap="test">su -s /usr/bin/expect tester &lt;&lt; "EOF"
+<screen><userinput remap="test">su -s /usr/bin/expect tester &lt;&lt; EOF
 set timeout -1
 spawn make tests
 expect eof

chapter08/bc.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -43,15 +43,15 @@
 
     <para>Prepare Bc for compilation:</para>
 
-<screen><userinput remap="configure">CC='gcc -std=c99' ./configure --prefix=/usr -G -O3 -r</userinput></screen>
+<screen><userinput remap="configure">CC=gcc ./configure --prefix=/usr -G -O3 -r</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
-        <term><parameter>CC=gcc -std=c99</parameter></term>
+        <term><parameter>CC=gcc</parameter></term>
         <listitem>
-          <para>This parameter specifies the compiler and C standard to use.</para>
+          <para>This parameter specifies the compiler to use.</para>
         </listitem>
       </varlistentry>
 

chapter08/binutils.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -49,19 +49,36 @@ cd       build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../configure --prefix=/usr       \
+<screen arch="default"><userinput remap="configure">../configure --prefix=/usr       \
              --sysconfdir=/etc   \
+             --enable-gold       \
+             --enable-ld=default \
+             --enable-plugins    \
+             --enable-shared     \
+             --disable-werror    \
+             --enable-64-bit-bfd \
+             --with-system-zlib</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr       \
+             --sysconfdir=/etc   \
+             --enable-gold       \
              --enable-ld=default \
              --enable-plugins    \
              --enable-shared     \
              --disable-werror    \
              --enable-64-bit-bfd \
-             --enable-new-dtags  \
              --with-system-zlib  \
-             --enable-default-hash-style=gnu</userinput></screen>
+             --enable-multilib</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the new configure parameters:</title>
+      <title>The meaning of the configure parameters:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-gold</parameter></term>
+        <listitem>
+          <para>Build the gold linker and install it as ld.gold (alongside the
+          default linker).</para>
+        </listitem>
+      </varlistentry>
 
       <varlistentry>
         <term><parameter>--enable-ld=default</parameter></term>
@@ -78,6 +95,21 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--enable-64-bit-bfd</parameter></term>
+        <listitem>
+           <para>Enables 64-bit support (on hosts with narrower word sizes).
+           May not be needed on 64-bit systems, but does no harm.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry arch="ml_32,ml_x32,ml_all">
+        <term><parameter>--enable-multilib</parameter></term>
+        <listitem>
+          <para>Enables multilib support in bintutils.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--with-system-zlib</parameter></term>
         <listitem>
@@ -127,14 +159,19 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">grep '^FAIL:' $(find -name '*.log')</userinput></screen>
 
+    <para>Twelve tests fail in the gold test suite when the
+    <option>--enable-default-pie</option> and
+    <option>--enable-default-ssp</option> options are passed to GCC.</para>
+
+    <para>Three tests in the gprofng suite are also known to fail.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
 
-    <para>Remove useless static libraries and other files:</para>
+    <para>Remove useless static libraries:</para>
 
-<screen><userinput remap="install">rm -rfv /usr/lib/lib{bfd,ctf,ctf-nobfd,gprofng,opcodes,sframe}.a \
+<screen><userinput remap="install">rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,gprofng,opcodes,sframe}.a</userinput></screen>
-        /usr/share/doc/gprofng/</userinput></screen>
 
   </sect2>
 
@@ -147,7 +184,7 @@ cd       build</userinput></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>addr2line, ar, as, c++filt, dwp, elfedit, gprof, gprofng, ld, ld.bfd, nm,
+        <seg>addr2line, ar, as, c++filt, dwp, elfedit, gprof, gprofng, ld, ld.bfd, ld.gold, nm,
         objcopy, objdump, ranlib, readelf, size, strings, and strip</seg>
         <seg>libbfd.so, libctf.so, libctf-nobfd.so, libgprofng.so,
         libopcodes.so, and libsframe.so</seg>
@@ -257,6 +294,17 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="ld.gold">
+        <term><command>ld.gold</command></term>
+        <listitem>
+          <para>A cut down version of ld that only supports the
+          elf object file format</para>
+          <indexterm zone="ch-system-binutils ld.gold">
+            <primary sortas="b-ld.gold">ld.gold</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ld.bfd">
         <term><command>ld.bfd</command></term>
         <listitem>

chapter08/bison.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -48,7 +48,7 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue:</para>
+    <para>To test the results (about 5.5 SBU), issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
 

chapter08/bzip2.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -103,6 +103,60 @@ done</userinput></screen>
 
   </sect2>
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
+    <title>Installation of Bzip2 - 32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make clean</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">sed -e "s/^CC=.*/CC=gcc -m32/" -i Makefile{,-libbz2_so}
+make -f Makefile-libbz2_so
+make libbz2.a</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 /usr/lib32/libbz2.so.1.0.8
+ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so
+ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so.1
+ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so.1.0
+install -Dm644 libbz2.a /usr/lib32/libbz2.a</userinput></screen>
+
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
+    <title>Installation of Bzip2 - x32bit</title>
+
+    <para>Clean previous build:</para>
+
+<screen><userinput remap="pre">make clean</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">sed -e "s/^CC=.*/CC=gcc -mx32/" -i Makefile{,-libbz2_so}
+make -f Makefile-libbz2_so
+make libbz2.a</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 /usr/libx32/libbz2.so.1.0.8
+ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so
+ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so.1
+ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so.1.0
+install -Dm644 libbz2.a /usr/libx32/libbz2.a</userinput></screen>
+
+  </sect2><!-- mx32 -->
+
   <sect2 id="contents-bzip2" role="content">
     <title>Contents of Bzip2</title>
 

chapter08/chapter08.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -19,7 +19,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lz4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zstd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
@@ -30,17 +29,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="isl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcrypt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
@@ -60,17 +60,16 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libelf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flit-core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="packaging.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wheel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="setuptools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>

chapter08/check.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-check" role="wrap">
+  <?dbhtml filename="check.html"?>
+
+  <sect1info condition="script">
+    <productname>check</productname>
+    <productnumber>&check-version;</productnumber>
+    <address>&check-url;</address>
+  </sect1info>
+
+  <title>Check-&check-version;</title>
+
+  <indexterm zone="ch-system-check">
+    <primary sortas="a-Check">Check</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Check is a unit testing framework for C.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&check-fin-sbu;</seg>
+        <seg>&check-fin-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Check</title>
+
+    <para>Prepare Check for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
+
+    <para>Build the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Compilation is now complete.  To run the Check test suite, issue the
+    following command:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
+<!--    <para>Note that the Check test suite may take a relatively long
+    (up to 4 SBU) time.</para>
+-->
+    <para>Install the package:</para>
+
+    <screen><userinput remap="install">make docdir=/usr/share/doc/check-&check-version; install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-check" role="content">
+    <title>Contents of Check</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <segtitle>Installed library</segtitle>
+
+      <seglistitem>
+        <seg>checkmk</seg>
+        <seg>libcheck.so</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="checkmk">
+        <term><command>checkmk</command></term>
+        <listitem>
+          <para>Awk script for generating C unit tests for use with the Check
+          unit testing framework</para>
+          <indexterm zone="ch-system-check checkmk">
+            <primary sortas="b-checmk">checkmk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcheck">
+        <term><filename class="libraryfile">libcheck.so</filename></term>
+        <listitem>
+          <para>Contains functions that allow Check to be called from a test
+          program</para>
+          <indexterm zone="ch-system-check libcheck">
+            <primary sortas="c-libcheck">libcheck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

chapter08/cleanup.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -12,7 +12,7 @@
 
   <para>Finally, clean up some extra files left over from running tests:</para>
 
-  <screen><userinput>rm -rf /tmp/{*,.*}</userinput></screen>
+<screen><userinput>rm -rf /tmp/*</userinput></screen>
 
   <para>There are also several files in the /usr/lib and /usr/libexec
   directories with a file name extension of .la. These are "libtool archive"
@@ -21,7 +21,9 @@
   by libltdl, and it's known that some .la files can break BLFS package
   builds.  Remove those files now:</para>
 
-<screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
+<screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput><userinput arch="ml_32,ml_all">
+find /usr/lib32 -name \*.la -delete</userinput><userinput arch="ml_x32,ml_all">
+find /usr/libx32 -name \*.la -delete</userinput></screen>
 
    <para>For more information about libtool archive files, see the <ulink
    url="&blfs-book;introduction/la-files.html">BLFS section "About Libtool

chapter08/coreutils.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>First, apply a patch for a security problem identified upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-upstream-patch;</userinput></screen>
-
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch fixes
     this non-compliance and other internationalization-related bugs.</para>
@@ -57,37 +53,29 @@
       those bugs are reproducible without this patch.</para>
     </note>
 
+    <!-- https://bugs.gnu.org/62403 -->
+<!--
+    <para>Fix a bug in checksum utilities causing failed checks not
+    reported correctly:</para>
+
+<screen><userinput remap="pre">sed '/if ( ! match/s/ed_checksums//' -i src/digest.c</userinput></screen>
+-->
     <para>Now prepare Coreutils for compilation:</para>
 
-<screen><userinput remap="configure">autoreconf -fv
+<screen><userinput remap="configure">autoreconf -fiv
-automake -af
 FORCE_UNSAFE_CONFIGURE=1 ./configure \
             --prefix=/usr            \
             --enable-no-install-program=kill,uptime</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the commands and configure options:</title>
+      <title>The meaning of the configure options:</title>
 
       <varlistentry>
-        <term><command>autoreconf -fv</command></term>
+        <term><command>autoreconf</command></term>
         <listitem>
           <para>The patch for internationalization has modified the
           build system, so the configuration files must
-          be regenerated.  Normally we would use the
+          be regenerated.</para>
-          <parameter>-i</parameter> option to update the standard
-          auxiliary files, but for this package it does not work because
-          <filename>configure.ac</filename> specified an old gettext
-          version.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>automake -af</command></term>
-        <listitem>
-	  <para>The automake auxiliary files were not updated by
-	  <command>autoreconf</command> due to the missing
-	  <parameter>-i</parameter> option.  This command updates them
-	  to prevent a build failure.</para>
         </listitem>
       </varlistentry>
 
@@ -133,21 +121,16 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
     <para>Fix some of the permissions so that the non-&root; user can
     compile and run the tests:</para>
 
-<screen><userinput remap="test">chown -R tester . </userinput></screen>
+<screen><userinput remap="test">chown -Rv tester . </userinput></screen>
 
-    <!-- To editors: in jhalfs the standard input is always piped to "make"
+    <para>Now run the tests:</para>
-         so the test failures are not reproducible in jhalfs even if
-         running the build in a PTY.  Don't use jhalfs to test if we can
-         remove < /dev/null.  -->
-    <para>Now run the tests (using <filename>/dev/null</filename> for the
-    standard input, or two tests may be broken if building LFS in a
-    graphical terminal or a session in SSH or GNU Screen because the
-    standard input is connected to a PTY from host distro, and the device
-    node for such a PTY cannot be accessed from the LFS chroot
-    environment):</para>
 
-<screen><userinput remap="test">su tester -c "PATH=$PATH make -k RUN_EXPENSIVE_TESTS=yes check" \
+<screen><userinput remap="test">su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
-   &lt; /dev/null</userinput></screen>
+
+<!-- Sometimes skipped, but if not it may fail.
+     Please DO NOT remove or comment out this unless we can fully
+     understand it!  -->
+    <para>The test-getlogin test may fail in the LFS chroot environment.</para>
 
     <para>Remove the temporary group:</para>
 
@@ -1278,8 +1261,8 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
       <varlistentry id="yes">
         <term><command>yes</command></term>
         <listitem>
-          <para>Repeatedly outputs <literal>y</literal> or a given string,
+          <para>Repeatedly outputs <quote>y</quote>, or a given string, until
-          until killed</para>
+          killed</para>
           <indexterm zone="ch-system-coreutils yes">
             <primary sortas="b-yes">yes</primary>
           </indexterm>