Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

6 files changed, 30 insertions, 22 deletions

diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml
index 192eed8c1..862d2605c 100644
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -93,8 +93,11 @@
       <para>The reason for the kernel version requirement is that we specify
       that version when building <application>glibc</application> in
       <xref linkend="chapter-cross-tools"/> and
-      <xref linkend="chapter-building-system"/>,
-      at the recommendation of the developers.</para>
+      <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 June 2023, &min-kernel; is the oldest kernel release still
+      supported by the kernel developers.</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
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 66526ba4c..14f1fac6c 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -89,7 +89,7 @@ cd       build</userinput></screen>
       --prefix=/usr                      \
       --host=$LFS_TGT                    \
       --build=$(../scripts/config.guess) \
-      --enable-kernel=&min-kernel;                \
+      --enable-kernel=&min-kernel;               \
       --with-headers=$LFS/usr/include    \
       libc_cv_slibdir=/usr/lib</userinput></screen>
 
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index d094aed7f..5b9b56840 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -76,7 +76,7 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="configure">../configure --prefix=/usr                            \
              --disable-werror                         \
-             --enable-kernel=&min-kernel;                      \
+             --enable-kernel=&min-kernel;                     \
              --enable-stack-protector=strong          \
              --with-headers=/usr/include              \
              libc_cv_slibdir=/usr/lib</userinput></screen>
diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml
index f5e50524b..7104d9cba 100644
--- a/chapter08/pkgmgt.xml
+++ b/chapter08/pkgmgt.xml
@@ -86,12 +86,12 @@
       </listitem>
 
       <listitem><para>If a package is (directly or indirectly) linked to both
-      the old and new versions of a shared library (for example, the package
+      the old and new names of a shared library (for example, the package
       links to both <filename class='libraryfile'>libfoo.so.2</filename> and
       <filename class='libraryfile'>libbar.so.1</filename>, while the latter
       links to <filename class='libraryfile'>libfoo.so.3</filename>), the
       package may malfunction because the different revisions of the shared
-      library present conflicting locations for some symbol names. This can be
+      library present incompatible definitions for some symbol names. This can be
       caused by recompiling some, but not all, of the packages linked to the
       old shared library after the package providing the shared library is
       upgraded.  To avoid the issue, users will need to rebuild every package
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 52f96d768..c8b12e4d9 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -169,23 +169,24 @@ General architecture-dependent options  ---&gt;
    [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
    [*] Stack Protector buffer overflow detection [CONFIG_STACKPROTECTOR]
    [*]   Strong Stack Protector [CONFIG_STACKPROTECTOR_STRONG]
-Networking support  ---&gt;
-  Networking options  ---&gt;
-   &lt;*&gt; The IPv6 protocol [CONFIG_IPV6]
+[*] Networking support  ---&gt;   [CONFIG_NET]
+   Networking options  ---&gt;
+      [*] TCP/IP networking [CONFIG_INET]
+      &lt;*&gt;   The IPv6 protocol [CONFIG_IPV6]
 Device Drivers  ---&gt;
-  Generic Driver Options  ---&gt;
-   [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
-   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
-   [*]   Automount devtmpfs at /dev, after the kernel mounted the rootfs [CONFIG_DEVTMPFS_MOUNT]
-   Firmware Loader ---&gt;
-      [ ] Enable the firmware sysfs fallback mechanism [CONFIG_FW_LOADER_USER_HELPER]
-  Firmware Drivers   ---&gt;
-   [*] Export DMI identification via sysfs to userspace [CONFIG_DMIID]
-  Graphics support ---&gt;
-   Frame buffer Devices ---&gt;
-      &lt;*&gt; Support for frame buffer devices ---&gt;
-   Console display driver support ---&gt;
-      [*] Framebuffer Console support [CONFIG_FRAMEBUFFER_CONSOLE]
+   Generic Driver Options  ---&gt;
+      [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
+      [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
+      [*]   Automount devtmpfs at /dev, after the kernel mounted the rootfs [CONFIG_DEVTMPFS_MOUNT]
+      Firmware Loader ---&gt;
+         [ ] Enable the firmware sysfs fallback mechanism [CONFIG_FW_LOADER_USER_HELPER]
+   Firmware Drivers   ---&gt;
+      [*] Export DMI identification via sysfs to userspace [CONFIG_DMIID]
+   Graphics support ---&gt;
+      Frame buffer Devices ---&gt;
+         &lt;*&gt; Support for frame buffer devices ---&gt;
+      Console display driver support ---&gt;
+         [*] Framebuffer Console support [CONFIG_FRAMEBUFFER_CONSOLE]
 File systems  ---&gt;
    [*] Inotify support for userspace [CONFIG_INOTIFY_USER]
        Pseudo filesystems  ---&gt;
diff --git a/general.ent b/general.ent
index 912a360d6..a222812e9 100644
--- a/general.ent
+++ b/general.ent
@@ -91,7 +91,11 @@
 <!ENTITY livecd-root     "&lfs-root;livecd/">
 <!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
+
+<!-- 4.14 EOL is Jan 2024
+     so for LFS 11.5 we may consider moving to 4.19 -->
 <!ENTITY min-kernel      "4.14">
+
 <!--
 <!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
 <!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">