Merge remote-tracking branch 'origin/trunk' into xry111/arm64

bootscripts/ChangeLog

@@ -1,3 +1,9 @@
+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.

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/fb0 ] && use_fb=1 || use_fb=0
+      [ -d /sys/class/graphics/fbcon ] && use_fb=1 || use_fb=0
 
       # Figure out the command to set the console into the
       # desired mode

chapter01/changelog.xml

@@ -40,6 +40,17 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-08-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to lfs-bootscripts-20240823, to fix an
+          issue causing VT 2-6 not affected by the FONT= setting in
+          /etc/sysconfig/console.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-08-17</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -294,9 +294,6 @@
     <listitem>
       <para>Lz4-&lz4-version;</para>
     </listitem>
-    <listitem>
-      <para>glibc-2.39-upstream_fix-1.patch</para>
-    </listitem>
   </itemizedlist>
 
   <itemizedlist>

chapter06/gcc-pass2.xml

@@ -134,10 +134,11 @@ cd       build</userinput></screen>
         <term><parameter>LDFLAGS_FOR_TARGET=...</parameter></term>
         <listitem>
           <para>Allow <filename class="libraryfile">libstdc++</filename> to
-          use the shared <filename class="libraryfile">libgcc</filename> being
+          use the <filename class="libraryfile">libgcc</filename> being
-          built in this pass, instead of the static version that was built in GCC
+          built in this pass, instead of the previous version built in
-          pass 1. This is necessary to support C++ exception
+          <xref linkend='ch-tools-gcc-pass1'/>.  The previous version cannot
-          handling.</para>
+          properly support C++ exception handling because it was built
+          without libc support.</para>
         </listitem>
       </varlistentry>
 

chapter08/kmod.xml

@@ -80,7 +80,7 @@
           <parameter>--disable-manpages</parameter>
         </term>
         <listitem>
-          <para>This option disables generating the manpages which
+          <para>This option disables generating the man pages which
           requires an external program.</para>
         </listitem>
       </varlistentry>

chapter09/systemd-custom.xml

@@ -102,7 +102,7 @@ EOF</userinput></screen>
 
 <screen role="nodump">q /tmp 1777 root root 10d</screen>
 
-      The type field, q, discusses creating a subvolume with quotas which
+      The type field, q, indicates the creation of a subvolume with quotas which
       is really only applicable to btrfs filesystems.  It references type v
       which in turn references type d (directory). This then creates the
       specified directory if it is not present and adjusts the permissions

packages.ent

@@ -381,7 +381,7 @@
 <!ENTITY less-fin-du "14 MB">
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20240717">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20240823">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">