Changeset ae7b9ed

Timestamp:

08/24/2024 05:03:57 PM (3 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/arm64

Children:

f4f58d4

Parents:

8467fab (diff), 54c0a86 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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

Files:

• bootscripts/ChangeLog (modified) (1 diff)
• bootscripts/lfs/init.d/console (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter06/gcc-pass2.xml (modified) (1 diff)
• chapter08/kmod.xml (modified) (1 diff)
• chapter09/systemd-custom.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

bootscripts/ChangeLog

@@ +1 @@
+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

bootscripts/lfs/init.d/console

@@ -48 +48 @@
 
       # 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

chapter01/changelog.xml

@@ -42 +42 @@
 
     <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

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

chapter06/gcc-pass2.xml

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

chapter08/kmod.xml

@@ -81 +81 @@
         </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>

chapter09/systemd-custom.xml

@@ -103 +103 @@
 <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

packages.ent

@@ -382 +382 @@
 <!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">