From 10aa6482f7121b12c7c6d2ca415e687a5e6c3d0a Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 18 Aug 2024 14:47:14 -0500 Subject: [PATCH 1/6] Move glibc-2.39-upstream_fix patch in what's new from Added: to Removed: --- chapter01/whatsnew.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 614ea5c9d..14cc9fe47 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -294,9 +294,6 @@ Lz4-&lz4-version; - - glibc-2.39-upstream_fix-1.patch - @@ -304,6 +301,9 @@ bash-5.2.21-upstream_fixes-1.patch + + glibc-2.39-upstream_fix-1.patch + readline-8.2-upstream_fixes-3.patch From 837731717d2a62c84fc2bfb81f8ae61e1c8e7396 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 18 Aug 2024 20:02:08 -0500 Subject: [PATCH 2/6] Minor grammar change. --- chapter08/kmod.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index 912fe07a0..5b4ab4fb3 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -80,7 +80,7 @@ --disable-manpages - This option disables generating the manpages which + This option disables generating the man pages which requires an external program. From 217802b9c0b9115c508ade1fe541d9c895d47328 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 18 Aug 2024 21:03:47 +0800 Subject: [PATCH 3/6] gcc-pass2: Fix description of LDFLAGS_FOR_TARGET= Pass 2 libstdc++ still links to libgcc.a even with LDFLAGS_FOR_TARGET=, despite this libgcc.a is from pass 2 instead of pass 1. The difference between pass 2 libgcc and pass 1 libgcc is Glibc wasn't installed when the pass 1 libgcc was built. This difference causes both consequences (1) pass 1 libgcc lacks shared library and (2) pass 1 libgcc cannot support C++ EH, but it's not (1) causing (2). --- chapter06/gcc-pass2.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml index 6ca5a0fa2..6d0098c80 100644 --- a/chapter06/gcc-pass2.xml +++ b/chapter06/gcc-pass2.xml @@ -138,10 +138,11 @@ cd build LDFLAGS_FOR_TARGET=... Allow libstdc++ to - use the shared libgcc 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. + use the libgcc being + built in this pass, instead of the previous version built in + . The previous version cannot + properly support C++ exception handling because it was built + without libc support. From d1ccec207ff286042f513e6bd591ea90c68ae933 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 19 Aug 2024 13:56:23 +0800 Subject: [PATCH 4/6] whatsnew: Remove glibc-2.39-upstream_fixes-1.patch entry It's added after 12.1 release and removed before 12.2 release, so when we compare 12.1 and 12.2 it's neither added nor removed and it just seems never existed. --- chapter01/whatsnew.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 14cc9fe47..c807fa15d 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -301,9 +301,6 @@ bash-5.2.21-upstream_fixes-1.patch - - glibc-2.39-upstream_fix-1.patch - readline-8.2-upstream_fixes-3.patch From db7bf1f8e956146af90bd17631b2d702a120a11a Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Mon, 19 Aug 2024 09:55:19 -0500 Subject: [PATCH 5/6] systemd configuration: adjust some wording --- chapter09/systemd-custom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter09/systemd-custom.xml b/chapter09/systemd-custom.xml index 742983e44..bb8285b31 100644 --- a/chapter09/systemd-custom.xml +++ b/chapter09/systemd-custom.xml @@ -102,7 +102,7 @@ EOF q /tmp 1777 root root 10d - 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 From 54c0a86cd0018e94b4db71caf36ca09f84154aa0 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 23 Aug 2024 19:23:13 +0800 Subject: [PATCH 6/6] bootscripts: console: Fix fb console detection If CONFIG_FB is not set but CONFIG_DRM_FBDEV_EMULATION is set to y, on a DRM-drived graphic card (anything from AMD/ATI, Intel, or NVIDIA in recent 20 years) we'd be using a fb console but without /sys/class/graphics/fb0. Then the script won't run setfont for VT 2-6. Check /sys/class/graphics/fbcon instead of /sys/class/graphics/fb0 to fix the issue. Closes: https://lists.linuxfromscratch.org/sympa/arc/lfs-support/2024-08/msg00001.html Reported-by: Alan Ianson --- bootscripts/ChangeLog | 6 ++++++ bootscripts/lfs/init.d/console | 2 +- chapter01/changelog.xml | 11 +++++++++++ packages.ent | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 558230238..d3a7ed661 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,9 @@ +2024-08-23 Xi Ruoyao + * 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 * In mountvirtfs, recreate /dev/fd correctly if it's already created by the initramfs. diff --git a/bootscripts/lfs/init.d/console b/bootscripts/lfs/init.d/console index a5338cc71..9409e4757 100644 --- a/bootscripts/lfs/init.d/console +++ b/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 diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 4e420b168..7f58d2d3b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,17 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-08-23 + + + [xry111] - Update to lfs-bootscripts-20240823, to fix an + issue causing VT 2-6 not affected by the FONT= setting in + /etc/sysconfig/console. + + + + 2024-08-17 diff --git a/packages.ent b/packages.ent index d95e49225..86242dd7d 100644 --- a/packages.ent +++ b/packages.ent @@ -381,7 +381,7 @@ - +