From e5338216f06703f1a58721d52d849265de43d78e Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 19 Nov 2024 22:28:24 -0600
Subject: [PATCH 1/9] Remove unneeded PATH entries.

---
 chapter11/afterlfs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml
index 633a782df..88a3c0114 100644
--- a/chapter11/afterlfs.xml
+++ b/chapter11/afterlfs.xml
@@ -168,7 +168,7 @@ EOF</command></screen>
     </para>
 
 <screen><command>alias lfs='sudo /usr/sbin/chroot /mnt/lfs /usr/bin/env -i HOME=/root TERM="$TERM" PS1="\u:\w\\\\$ "
-PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login'</command></screen>
+PATH=/usr/bin:/usr/sbin /bin/bash --login'</command></screen>
 
      <para>
        This alias is a little tricky because of the quoting and levels of

From e5cc8213aafbe19f073345a4f5dbad05a6ed4a2d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 28 Nov 2024 12:50:41 -0600
Subject: [PATCH 2/9] Typo

---
 chapter08/iproute2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml
index 8a6755f3d..c010ee2ed 100644
--- a/chapter08/iproute2.xml
+++ b/chapter08/iproute2.xml
@@ -274,7 +274,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
           <para>Traffic control for Quality of Service
           (QoS) and Class of Service (CoS) implementations</para>
 
-          <para><command>tc qdisc</command> allows users to set up the queueing
+          <para><command>tc qdisc</command> allows users to set up the queuing
           discipline</para>
 
           <para><command>tc class</command> allows users to set up classes based

From ea48456403283120cd3c74357b46c6aae7bcdb2d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 30 Nov 2024 09:49:34 -0600
Subject: [PATCH 3/9] Update to iana-etc-20241122. Update to file-5.46. Update
 to iproute2-6.12.0. Update to libtool-2.5.4. Update to linux-6.12.1. Update
 to setuptools-75.6.0 (Python Module). Update to wheel-0.45.1 (Python Module).

---
 chapter01/changelog.xml | 34 +++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  |  4 ++--
 chapter08/iproute2.xml  |  4 ++--
 packages.ent            | 44 ++++++++++++++++++++---------------------
 4 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0beb04d7b..cdb245999 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,40 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-12-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20241122. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.46. Fixes
+          <ulink url='&lfs-ticket-root;5601'>#5601</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-6.12.0. Fixes
+          <ulink url='&lfs-ticket-root;5597'>#5597</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libtool-2.5.4. Fixes
+          <ulink url='&lfs-ticket-root;5598'>#5598</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.12.1. Fixes
+          <ulink url='&lfs-ticket-root;5596'>#5586</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to setuptools-75.6.0 (Python Module). Fixes
+          <ulink url='&lfs-ticket-root;5599'>#5599</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to wheel-0.45.1 (Python Module). Fixes
+          <ulink url='&lfs-ticket-root;5600'>#5600</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-11-15</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index bf699eef3..65de020ec 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -77,9 +77,9 @@
     <!--<listitem>
        <para>Expect-&expect-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
        <para>File-&file-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Findutils-&findutils-version;</para>
     </listitem>-->
diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml
index c010ee2ed..50fec36aa 100644
--- a/chapter08/iproute2.xml
+++ b/chapter08/iproute2.xml
@@ -274,11 +274,11 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
           <para>Traffic control for Quality of Service
           (QoS) and Class of Service (CoS) implementations</para>
 
-          <para><command>tc qdisc</command> allows users to set up the queuing
+          <para><command>tc qdisc</command> allows users to set up the queueing
           discipline</para>
 
           <para><command>tc class</command> allows users to set up classes based
-          on the queuing discipline scheduling</para>
+          on the queueing discipline scheduling</para>
 
           <para><command>tc filter</command> allows users to set up the QoS/CoS
           packet filtering</para>
diff --git a/packages.ent b/packages.ent
index d8aa85732..f90f8fae7 100644
--- a/packages.ent
+++ b/packages.ent
@@ -172,10 +172,10 @@
 <!ENTITY expect-tmp-du "3.9 MB">
 <!ENTITY expect-tmp-sbu "0.2 SBU">
 
-<!ENTITY file-version "5.45">
-<!ENTITY file-size "1,218 KB">
+<!ENTITY file-version "5.46">
+<!ENTITY file-size "1,283 KB">
 <!ENTITY file-url "https://astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "26b2a96d4e3a8938827a1e572afd527a">
+<!ENTITY file-md5 "459da2d4b534801e2e2861611d823864">
 <!ENTITY file-home "https://www.darwinsys.com/file/">
 <!ENTITY file-tmp-du "37 MB">
 <!ENTITY file-tmp-sbu "0.1 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20241024">
-<!ENTITY iana-etc-size "590 KB">
+<!ENTITY iana-etc-version "20241122">
+<!ENTITY iana-etc-size "591 KB">
 <!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
-<!ENTITY iana-etc-md5 "831a1b8f20a53da822d9ae84e311daac">
+<!ENTITY iana-etc-md5 "38064a8e7c2233e23911ef9d39360584">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.8 MB">
 <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@@ -341,10 +341,10 @@
 <!ENTITY intltool-fin-du "1.5 MB">
 <!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "6.11.0">
-<!ENTITY iproute2-size "903 KB">
+<!ENTITY iproute2-version "6.12.0">
+<!ENTITY iproute2-size "904 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "9d7927e8e5ca301bd14990f64ad44a8c">
+<!ENTITY iproute2-md5 "bc789bd210bc5d1ca6c64ea1c87d6979">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-fin-du "17 MB">
 <!ENTITY iproute2-fin-sbu "0.1 SBU">
@@ -413,10 +413,10 @@
 <!ENTITY libpipeline-fin-du "9.7 MB">
 <!ENTITY libpipeline-fin-sbu "0.1 SBU">
 
-<!ENTITY libtool-version "2.5.3">
-<!ENTITY libtool-size "1,026 KB">
+<!ENTITY libtool-version "2.5.4">
+<!ENTITY libtool-size "1,033 KB">
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.xz">
-<!ENTITY libtool-md5 "e42b7d9ab875f1d013bba3cdb8a59b58">
+<!ENTITY libtool-md5 "22e0a29df8af5fdde276ea3a7d351d30">
 <!ENTITY libtool-home "&gnu-software;libtool/">
 <!ENTITY libtool-fin-du "45 MB">
 <!ENTITY libtool-fin-sbu "0.8 SBU">
@@ -430,13 +430,13 @@
 <!ENTITY libxcrypt-fin-sbu "0.1 SBU">
 
 <!ENTITY linux-major-version "6">
-<!ENTITY linux-minor-version "11">
-<!ENTITY linux-patch-version "8">
+<!ENTITY linux-minor-version "12">
+<!ENTITY linux-patch-version "1">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "143,543 KB">
+<!ENTITY linux-size "144,446 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "17ecb0bd378614376a59b2cc8682ea4d">
+<!ENTITY linux-md5 "f541bbef36e51ba1e7165137fe1186db">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 : 
  minimum is allnoconfig 
@@ -637,10 +637,10 @@
 <!ENTITY sed-fin-du "30 MB">
 <!ENTITY sed-fin-sbu "0.3 SBU">
 
-<!ENTITY setuptools-version "75.5.0">
-<!ENTITY setuptools-size "1,305 KB">
+<!ENTITY setuptools-version "75.6.0">
+<!ENTITY setuptools-size "1,307 KB">
 <!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz">
-<!ENTITY setuptools-md5 "d0f75eec03606aadda1e8eb07ee9b0d7">
+<!ENTITY setuptools-md5 "94458e508bd8e9dc6e6d097fc8747cf0">
 <!ENTITY setuptools-home "&pypi-home;/setuptools/">
 <!ENTITY setuptools-fin-du "35 MB">
 <!ENTITY setuptools-fin-sbu "less than 0.1 SBU">
@@ -767,10 +767,10 @@
 <!ENTITY vim-fin-du "245 MB">
 <!ENTITY vim-fin-sbu "2.9 SBU">
 
-<!ENTITY wheel-version "0.45.0">
-<!ENTITY wheel-size "105 KB">
+<!ENTITY wheel-version "0.45.1">
+<!ENTITY wheel-size "106 KB">
 <!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
-<!ENTITY wheel-md5 "3d1f79ff04a1252fa709dec58aa7249b">
+<!ENTITY wheel-md5 "dddc505d0573d03576c7c6c5a4fe0641">
 <!ENTITY wheel-home "&pypi-home;/wheel/">
 <!ENTITY wheel-fin-du "1.5 MB">
 <!ENTITY wheel-fin-sbu "less than 0.1 SBU">

From fdf21dccbab633957d3f46ce79f6f037f51229ad Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 30 Oct 2024 19:38:59 +0800
Subject: [PATCH 4/9] drm-panic: kernel: Enable SimpleDRM

Currently on a LFS system booted via legacy BIOS (intead of UEFI), the
users can make two different configurations:

1. The DRM driver for the GPU is built as a module.  Then before the
   module is loaded (i.e. the root fs is properly mounted) the kernel
   messages are displayed via the VGA console.
2. The DRM driver for the GPU is built into the kernel image.  Then the
   kernel messages are displayed via the DRM-emulated framebuffer
   console since a very early stage (before the root fs is properly
   mounted).

When the system is booted via UEFI, we use SimpleDRM on the EFI
framebuffer for displaying kernel messages, thus it's always the case 2.

Both are not good for diagnostic in case the root fs cannot be mounted
properly (it's very frequent on lfs-support):

- With 1 the VGA console can only fit 80x24 characters, so the relevent
  information is often flushed away.
- With 2 the panic message is often displayed improperly when a DRM
  driver is running.

The "DRM panic" feature introduced since Linux 6.11 (but it'll only
become usable for LFS since Linux 6.12) can fix the case 2, while case
1 just cannot be fixed.  So start to make LFS booted via legacy BIOS
to use method 2 now, then we can enable DRM panic and fix this
long-standing issue.
---
 chapter10/kernel.xml            |  4 ++--
 chapter10/kernel/kernel.version |  2 +-
 chapter10/kernel/systemd.toml   | 14 +++++---------
 chapter10/kernel/systemd.xml    | 10 +++++-----
 chapter10/kernel/sysv.toml      | 14 +++++---------
 chapter10/kernel/sysv.xml       | 11 ++++++-----
 6 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 4eb87a17b..8155f735c 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -282,8 +282,8 @@
         <listitem>
           <para>These are needed to display the Linux console on a
           GPU driven by a DRI (Direct Rendering Infrastructure) driver.
-          If <option>CONFIG_DRM</option> (Direct Rendering Manager) is
-          enabled, you should enable these two options as well or you'll see
+          As <option>CONFIG_DRM</option> (Direct Rendering Manager) is
+          enabled, we should enable these two options as well or we'll see
           a blank screen once the DRI driver is loaded.</para>
         </listitem>
       </varlistentry>
diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version
index 22cb9e553..ff61e1868 100644
--- a/chapter10/kernel/kernel.version
+++ b/chapter10/kernel/kernel.version
@@ -1 +1 @@
-6.10.2
+6.12.1
diff --git a/chapter10/kernel/systemd.toml b/chapter10/kernel/systemd.toml
index bfe7a1b40..649df88d4 100644
--- a/chapter10/kernel/systemd.toml
+++ b/chapter10/kernel/systemd.toml
@@ -13,7 +13,11 @@ STACKPROTECTOR_STRONG='*'
 UEVENT_HELPER=' '
 DEVTMPFS='*'
 DEVTMPFS_MOUNT='*'
-DRM=' *M'
+SYSFB_SIMPLEFB='*'
+DRM='*'
+DRM_FBDEV_EMULATION='*'
+DRM_SIMPLEDRM='*'
+FRAMEBUFFER_CONSOLE='*'
 NET='*'
 INET='*'
 IPV6='*'
@@ -30,11 +34,3 @@ revision='systemd'
 [RT_GROUP_SCHED]
 value = ' '
 comment = 'This may cause some systemd features malfunction'
-
-[DRM_FBDEV_EMULATION]
-value = ' *'
-comment = 'If [DRM] is selected as * or M, this must be selected'
-
-[FRAMEBUFFER_CONSOLE]
-value = ' *'
-comment = 'If [DRM] is selected as * or M, this must be selected'
diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml
index a03c67402..beff1eb2d 100644
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@ -42,15 +42,15 @@
                                                     ...  [FW_LOADER_USER_HELPER]
   <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
     [*] <emphasis role='blue'>E</emphasis>xport DMI identification via sysfs to userspace                 [DMIID]
+    [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
+    &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-      # If [DRM] is selected as * or M, this must be selected:
-      [ /*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+      [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                       ...  [DRM_FBDEV_EMULATION]
+      &lt;*&gt; <emphasis role='blue'>S</emphasis>imple framebuffer driver                              [DRM_SIMPLEDRM]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
-      # If [DRM] is selected as * or M, this must be selected:
-      [ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                    [FRAMEBUFFER_CONSOLE]
+      [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]
 
 <emphasis role='blue'>F</emphasis>ile systems ---&gt;
   [*] <emphasis role='blue'>I</emphasis>notify support for userspace                               [INOTIFY_USER]
diff --git a/chapter10/kernel/sysv.toml b/chapter10/kernel/sysv.toml
index 3f8d2e93c..5f6812821 100644
--- a/chapter10/kernel/sysv.toml
+++ b/chapter10/kernel/sysv.toml
@@ -12,14 +12,10 @@ STACKPROTECTOR_STRONG='*'
 UEVENT_HELPER=' '
 DEVTMPFS='*'
 DEVTMPFS_MOUNT='*'
-DRM=' *M'
+SYSFB_SIMPLEFB='*'
+DRM='*'
+DRM_FBDEV_EMULATION='*'
+DRM_SIMPLEDRM='*'
+FRAMEBUFFER_CONSOLE='*'
 
 revision='sysv'
-
-[DRM_FBDEV_EMULATION]
-value = ' *'
-comment = 'If [DRM] is selected as * or M, this must be selected'
-
-[FRAMEBUFFER_CONSOLE]
-value = ' *'
-comment = 'If [DRM] is selected as * or M, this must be selected'
diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml
index 451898a21..0c1d05e5a 100644
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@ -28,12 +28,13 @@
     [*] M<emphasis role='blue'>a</emphasis>intain a devtmpfs filesystem to mount at /dev               [DEVTMPFS]
     [*]   <emphasis role='blue'>A</emphasis>utomount devtmpfs at /dev, after the kernel mounted the rootfs
                                                            ...  [DEVTMPFS_MOUNT]
+  <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
+    [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
+    &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-      # If [DRM] is selected as * or M, this must be selected:
-      [ /*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+      [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                       ...  [DRM_FBDEV_EMULATION]
+      &lt;*&gt; <emphasis role='blue'>S</emphasis>imple framebuffer driver                              [DRM_SIMPLEDRM]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
-      # If [DRM] is selected as * or M, this must be selected:
-      [ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                    [FRAMEBUFFER_CONSOLE]</screen>
+      [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]</screen>

From 33c17d128bdf1f3a10e086b2b13a1ec655bcf7ed Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 30 Oct 2024 19:59:56 +0800
Subject: [PATCH 5/9] drm-panic: grub: Set up the VESA framebuffer for the
 kernel

In the previous commit we've enabled the kernel to use the SimpleDRM
driver on the VESA framebuffer.  Now provide the VESA framebuffer to the
kernel.
---
 chapter10/grub.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/chapter10/grub.xml b/chapter10/grub.xml
index 1706ccb3c..00be1d6c0 100644
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@ -135,6 +135,7 @@ set timeout=5
 insmod part_gpt
 insmod ext2
 set root=(hd0,2)
+set gfxpayload=1024x768x32
 
 menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
         linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
@@ -159,6 +160,14 @@ EOF</userinput></screen>
       be needed with some rare configurations.
     </para>
 
+    <para>
+      The <command>set gfxpayload=1024x768x32</command> command sets the
+      resolution and color depth of the VESA framebuffer to be passed to the
+      kernel.  It's necessary for the kernel SimpleDRM driver to use the
+      VESA framebuffer.  You can use a different resolution or color depth
+      value which better suits for your monitor.
+    </para>
+
     <note><para>From <application>GRUB</application>'s perspective, the
     kernel files are relative to the partition used.  If you
     used a separate /boot partition, remove /boot from the above

From 2349341e3e641bb87b879d5547fc4c4a6275e713 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 1 Dec 2024 17:30:51 +0800
Subject: [PATCH 6/9] drm-panic: kernel: Enable DRM_PANIC

Since the previous commit, we've ensured the kernel displaying via DRM
even in the early stage.  Now enable DRM_PANIC so the kernel will
correctly show the last lines of the kernel messages in case a panic
happens.

Tested with an incorrect root= line in 3 configurations:

- A QEMU VM booted via BIOS
- A real machine booted via BIOS
- A real machine booted via UEFI

And in all configurations the panic message is correctly dumped.
In 1024x768 we can get 48 lines (twice of 24 lines in VGA console).
---
 chapter10/kernel/systemd.toml | 2 ++
 chapter10/kernel/systemd.xml  | 7 +++++--
 chapter10/kernel/sysv.toml    | 2 ++
 chapter10/kernel/sysv.xml     | 7 +++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/chapter10/kernel/systemd.toml b/chapter10/kernel/systemd.toml
index 649df88d4..387a74b66 100644
--- a/chapter10/kernel/systemd.toml
+++ b/chapter10/kernel/systemd.toml
@@ -15,6 +15,8 @@ DEVTMPFS='*'
 DEVTMPFS_MOUNT='*'
 SYSFB_SIMPLEFB='*'
 DRM='*'
+DRM_PANIC='*'
+DRM_PANIC_SCREEN='kmsg'
 DRM_FBDEV_EMULATION='*'
 DRM_SIMPLEDRM='*'
 FRAMEBUFFER_CONSOLE='*'
diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml
index beff1eb2d..0525fbd0a 100644
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@ -46,9 +46,12 @@
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
     &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-      [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+      [*]    <emphasis role='blue'>D</emphasis>isplay a user-friendly message when a kernel panic occurs
+                                                                ...  [DRM_PANIC]
+      (kmsg)   <emphasis role='blue'>P</emphasis>anic screen formatter                         [DRM_PANIC_SCREEN]
+      [*]    <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                       ...  [DRM_FBDEV_EMULATION]
-      &lt;*&gt; <emphasis role='blue'>S</emphasis>imple framebuffer driver                              [DRM_SIMPLEDRM]
+      &lt;*&gt;    <emphasis role='blue'>S</emphasis>imple framebuffer driver                           [DRM_SIMPLEDRM]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
       [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]
 
diff --git a/chapter10/kernel/sysv.toml b/chapter10/kernel/sysv.toml
index 5f6812821..c8267a303 100644
--- a/chapter10/kernel/sysv.toml
+++ b/chapter10/kernel/sysv.toml
@@ -14,6 +14,8 @@ DEVTMPFS='*'
 DEVTMPFS_MOUNT='*'
 SYSFB_SIMPLEFB='*'
 DRM='*'
+DRM_PANIC='*'
+DRM_PANIC_SCREEN='kmsg'
 DRM_FBDEV_EMULATION='*'
 DRM_SIMPLEDRM='*'
 FRAMEBUFFER_CONSOLE='*'
diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml
index 0c1d05e5a..f90164d65 100644
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@ -33,8 +33,11 @@
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
     &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-      [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+      [*]    <emphasis role='blue'>D</emphasis>isplay a user-friendly message when a kernel panic occurs
+                                                                ...  [DRM_PANIC]
+      (kmsg)   <emphasis role='blue'>P</emphasis>anic screen formatter                         [DRM_PANIC_SCREEN]
+      [*]    <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                       ...  [DRM_FBDEV_EMULATION]
-      &lt;*&gt; <emphasis role='blue'>S</emphasis>imple framebuffer driver                              [DRM_SIMPLEDRM]
+      &lt;*&gt;    <emphasis role='blue'>S</emphasis>imple framebuffer driver                           [DRM_SIMPLEDRM]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
       [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]</screen>

From 5ee35073fbe1229ed984514c6ac1496c5224e20c Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 30 Oct 2024 20:51:59 +0800
Subject: [PATCH 7/9] drm-panic: kernel: Explain DRM panic settings

---
 chapter10/kernel.xml | 65 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 8155f735c..e078e136d 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -272,6 +272,71 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>
+          <parameter>
+            Display a user-friendly message when a kernel panic occurs
+          </parameter>
+        </term>
+        <listitem>
+          <para>This will make the kernel correctly display the message
+          in case a kernel panic happens and a running DRM driver
+          supports to do so.  Without this, it would be more
+          difficult to diagnose a panic: if no DRM driver is running,
+          we'd be on the VGA console which can only hold 24 lines and
+          the relevent kernel message is often flushed away; if a DRM
+          driver is running, the display is often completely messed up
+          on panic.  As of Linux-6.12, none of the dedicated drivers for
+          mainstream GPU models really supports this, but it's supported by
+          the <quote>Simple framebuffer driver</quote> which runs on the
+          VESA (or EFI) framebuffer before the dedicated GPU driver is
+          loaded.  If the dedicated GPU driver is built as a module
+          (instead of a part of the kernel image) and no initramfs is
+          used, this functionality will work just fine before the root
+          file system is mounted and it's already enough for providing
+          information about most LFS configuration errors causing a
+          panic (for example, an incorrect <parameter>root=</parameter>
+          setting in <xref linkend='ch-bootable-grub'/>).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <parameter>
+            Panic screen formatter
+          </parameter>
+        </term>
+        <listitem>
+          <para>Set this <literal>kmsg</literal> to make sure the last
+          kernel messages lines are displayed when a kernel panic happens.
+          The default, <literal>user</literal>, would make the kernel show
+          only a <quote>user friendly</quote> panic message which is not
+          helpful on diagnostic.  The third choice,
+          <literal>qr_code</literal>, would make the kernel to compress
+          the last kernel message lines into a QR code and display it.
+          The QR code can hold more message lines than plain text and it
+          can be decoded with an external device (like a smart phone).
+          But it requires a Rust compiler that LFS does not provide.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <parameter>
+            Mark VGA/VBE/EFI FB as generic system framebuffer
+          </parameter> and
+          <parameter>Simple framebuffer driver</parameter>
+        </term>
+        <listitem>
+          <para>These allow to use the VESA framebuffer (or the EFI
+          framebuffer if booting the LFS system via UEFI) as a DRM device.
+          The VESA framebuffer will be set up by GRUB (or the EFI
+          framebuffer will be set up by the UEFI firmware), so the DRM panic
+          handler can function before the GPU-specific DRM driver is
+          loaded.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>
           <parameter>

From 79648bf7701a5208d86da279f00e7839dab93fe4 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Thu, 5 Dec 2024 21:47:05 +0800
Subject: [PATCH 8/9] kernel: Fix a typo (#5606)

---
 chapter10/kernel.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index e078e136d..971703466 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -284,7 +284,7 @@
           supports to do so.  Without this, it would be more
           difficult to diagnose a panic: if no DRM driver is running,
           we'd be on the VGA console which can only hold 24 lines and
-          the relevent kernel message is often flushed away; if a DRM
+          the relevant kernel message is often flushed away; if a DRM
           driver is running, the display is often completely messed up
           on panic.  As of Linux-6.12, none of the dedicated drivers for
           mainstream GPU models really supports this, but it's supported by

From c87106896ce3cfa4e7a1751240400318b8dd7fb7 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 6 Dec 2024 17:05:02 +0800
Subject: [PATCH 9/9] English grammar fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Suggested-by: †KJM† <biz@k-1.me>
---
 chapter08/e2fsprogs.xml           | 2 +-
 chapter11/afterlfs.xml            | 2 +-
 part3intro/toolchaintechnotes.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index c5718c191..d99922610 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -146,7 +146,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
     <para>
       <filename>/etc/mke2fs.conf</filename> contains the default value of
       various command line options of <command>mke2fs</command>.  You may
-      edit the file to make the default values suitable for your need.
+      edit the file to make the default values suitable for your needs.
       For example, some utilities (not in LFS or BLFS) cannot recognize a
       <systemitem class='filesystem'>ext4</systemitem> file system with
       <literal>metadata_csum_seed</literal> feature enabled.
diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml
index 88a3c0114..bfd6b084f 100644
--- a/chapter11/afterlfs.xml
+++ b/chapter11/afterlfs.xml
@@ -54,7 +54,7 @@
      <para>
         In addition to the above, there is a set of applications for system
         management for all kinds of systems. These applications are all in the
-        BLFS book. Not all packages are needed in every environments. For
+        BLFS book. Not all packages are needed in every environment. For
         example <ulink url="&blfs-book;basicnet/dhcpcd.html">dhcpcd</ulink>, is
         not normally appropriate for a server and <ulink
         url="&blfs-book;basicnet/wireless_tools.html">wireless_tools</ulink>,
diff --git a/part3intro/toolchaintechnotes.xml b/part3intro/toolchaintechnotes.xml
index 3714596fc..1dad94103 100644
--- a/part3intro/toolchaintechnotes.xml
+++ b/part3intro/toolchaintechnotes.xml
@@ -360,7 +360,7 @@ checking what linker to use... /mnt/lfs/tools/i686-lfs-linux-gnu/bin/ld</compute
     <para>Next comes glibc. The most important
     considerations for building glibc are the compiler, binary tools, and
     kernel headers. The compiler and binary tools are generally not an issue
-    since glibc will always those relating to the <parameter>--host</parameter>
+    since glibc will always use those relating to the <parameter>--host</parameter>
     parameter passed to its configure script; e.g., in our case, the compiler
     will be <command>$LFS_TGT-gcc</command> and the <command>readelf</command>
     tool will be <command>$LFS_TGT-readelf</command>. The kernel headers can