From 93bffa3abf3ea177e1eed0d1461388de1c967651 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 9 Aug 2024 15:49:05 +0800 Subject: [PATCH 01/14] Regenerate kernel configuration with Linux 6.10.2 source Now all DRM drivers are entries in the DRM submenu. --- chapter10/kernel/kernel.version | 2 +- chapter10/kernel/systemd.xml | 4 ++-- chapter10/kernel/sysv.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version index dd0026fc1..22cb9e553 100644 --- a/chapter10/kernel/kernel.version +++ b/chapter10/kernel/kernel.version @@ -1 +1 @@ -6.8.9 +6.10.2 diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml index 4960796ef..271744b65 100644 --- a/chapter10/kernel/systemd.xml +++ b/chapter10/kernel/systemd.xml @@ -45,8 +45,8 @@ Graphics support ---> < /*/M> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---> ... [DRM] - # If [DRM] is selected as * or M, this must be selected: - [ /*] Enable legacy fbdev support for your modesetting driver + # If [DRM] is selected as * or M, this must be selected: + [ /*] Enable legacy fbdev support for your modesetting driver ... [DRM_FBDEV_EMULATION] Console display driver support ---> # If [DRM] is selected as * or M, this must be selected: diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml index 25cb0c2a6..451898a21 100644 --- a/chapter10/kernel/sysv.xml +++ b/chapter10/kernel/sysv.xml @@ -31,8 +31,8 @@ Graphics support ---> < /*/M> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---> ... [DRM] - # If [DRM] is selected as * or M, this must be selected: - [ /*] Enable legacy fbdev support for your modesetting driver + # If [DRM] is selected as * or M, this must be selected: + [ /*] Enable legacy fbdev support for your modesetting driver ... [DRM_FBDEV_EMULATION] Console display driver support ---> # If [DRM] is selected as * or M, this must be selected: From a18957940ced92d374e4e41e7eefb982d5c55749 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Fri, 9 Aug 2024 17:01:15 +0300 Subject: [PATCH 02/14] docs: fix a typo In section "5.3. GCC-13.2.0 - Pass 1", the string "The are not strictly needed" should have "They". Fix that. --- chapter05/gcc-pass1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 7f33e5215..6ea6d48b6 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -139,7 +139,7 @@ cd build Those switches allow GCC to compile programs with some hardening security features (more information on those in - the in chapter 8) by default. The + the in chapter 8) by default. They are not strictly needed at this stage, since the compiler will only produce temporary executables. But it is cleaner to have the temporary packages be as close as possible to the final ones. From aa00b47601b96634dff68eb62242d8c7eda4ac79 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 12 Aug 2024 19:19:32 +0800 Subject: [PATCH 03/14] build: Use -r for git ls-tree in make dist Without this we may pack things like *.swp into the tarball. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6247b294d..52034319c 100644 --- a/Makefile +++ b/Makefile @@ -212,7 +212,7 @@ dist: $(Q)DIST=/tmp/LFS-RELEASE ./git-version.sh $(REV) $(Q)rm -f lfs-$$( Date: Tue, 13 Aug 2024 09:16:25 +0200 Subject: [PATCH 04/14] Fix missing attribute 'revision' --- chapter10/kernel/systemd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml index 271744b65..a03c67402 100644 --- a/chapter10/kernel/systemd.xml +++ b/chapter10/kernel/systemd.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -General setup ---> +General setup ---> [ ] Compile the kernel with warnings as errors [WERROR] CPU/Task time and stats accounting ---> [*] Pressure stall information tracking [PSI] From 1e2c41871f37792e59ea5d3ca823bee9536edd3d Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 13 Aug 2024 16:52:16 +0800 Subject: [PATCH 05/14] kernel: Really fix missing revision attribute --- chapter10/kernel/systemd.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter10/kernel/systemd.toml b/chapter10/kernel/systemd.toml index cfb8bf8f1..bfe7a1b40 100644 --- a/chapter10/kernel/systemd.toml +++ b/chapter10/kernel/systemd.toml @@ -25,12 +25,12 @@ TMPFS='*' TMPFS_POSIX_ACL='*' CGROUP_SCHED='* ' +revision='systemd' + [RT_GROUP_SCHED] value = ' ' comment = 'This may cause some systemd features malfunction' -revision='systemd' - [DRM_FBDEV_EMULATION] value = ' *' comment = 'If [DRM] is selected as * or M, this must be selected' From a1a1f9f4debaf5d10083a55d6c67d5b99eec3097 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 14 Aug 2024 10:34:56 -0500 Subject: [PATCH 06/14] Package updates. Update to iana-etc-20240806. Update to pkgconf-2.3.0. Update to python3-3.12.5. Update to linux-6.10.4. --- chapter01/changelog.xml | 22 +++++ chapter08/coreutils.xml | 2 +- packages.ent | 209 ++++++++++++++++++++-------------------- 3 files changed, 128 insertions(+), 105 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f3eafe40d..daa0d45cb 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,28 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-08-15 + + + [bdubbs] - Update to iana-etc-20240806. Addresses + #5006. + + + [bdubbs] - Update to pkgconf-2.3.0. Fixes + #5537. + + + [bdubbs] - Update to python3-3.12.5. Fixes + #5538. + + + [bdubbs] - Update to linux-6.10.4. Fixes + #5539. + + + + 2024-08-05 diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index ca02058b5..181153d1d 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -122,7 +122,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ remove < /dev/null. --> Now run the tests (using /dev/null for the standard input, or two tests may be broken if building LFS in a - graphical terminal or a session in SSH or GNU Screen etc. because the + graphical terminal or a session in SSH or GNU Screen because the standard input is connected to a PTY from host distro, and the device node for such a PTY cannot be accessed from the LFS chroot environment): diff --git a/packages.ent b/packages.ent index 843d8d0a5..a7f30cf39 100644 --- a/packages.ent +++ b/packages.ent @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -44,8 +44,8 @@ - - + + @@ -55,7 +55,7 @@ - + @@ -70,12 +70,12 @@ - + - - + + - + @@ -86,7 +86,7 @@ - + @@ -101,18 +101,18 @@ - - + + - + - - + + @@ -128,7 +128,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -145,15 +145,15 @@ - - + + - + @@ -187,10 +187,10 @@ - - - - + + + + @@ -216,25 +216,25 @@ - + - - - - - - + + + + + + - + @@ -243,25 +243,25 @@ - + - + - - + + - - + + @@ -317,10 +317,10 @@ - + - + @@ -354,7 +354,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -378,7 +378,7 @@ - + @@ -403,14 +403,14 @@ - + - + @@ -419,24 +419,24 @@ - + - + - + - + - + - + - + - + - - - - + + + + - - + + @@ -642,7 +642,7 @@ - + @@ -650,7 +650,7 @@ - + @@ -658,13 +658,14 @@ - + - + @@ -683,7 +684,7 @@ - + @@ -694,7 +695,7 @@ - + @@ -705,8 +706,8 @@ - - + + @@ -739,9 +740,9 @@ - + - + @@ -763,8 +764,8 @@ - - + + @@ -787,9 +788,9 @@ - + - + @@ -809,6 +810,6 @@ - - + + From 4c522f377577a217106d9b3fcd2ab63c9fbf8823 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sat, 17 Aug 2024 16:08:56 -0500 Subject: [PATCH 07/14] Package updates. Update to setuptools-72.2.0. Update to kmod-33. Update to binutils-2.43.1. Update to linux-6.10.5. --- appendices/dependencies.xml | 4 +++- chapter01/changelog.xml | 22 ++++++++++++++++++++++ chapter08/kmod.xml | 23 +++++++++++++++++------ packages.ent | 22 +++++++++++----------- 4 files changed, 53 insertions(+), 18 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 27a7e2a57..fdd1f0f05 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1615,7 +1615,9 @@ &external; - None + + scdoc (for man pages) + diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index daa0d45cb..4e420b168 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,28 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-08-17 + + + [bdubbs] - Update to setuptools-72.2.0. Fixes + #5542. + + + [bdubbs] - Update to kmod-33. Fixes + #5540. + + + [bdubbs] - Update to binutils-2.43.1. Fixes + #5543. + + + [bdubbs] - Update to linux-6.10.5. Fixes + #5541. + + + + 2024-08-15 diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index 6c875caed..912fe07a0 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -43,12 +43,13 @@ Prepare Kmod for compilation: -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-openssl \ - --with-xz \ - --with-zstd \ - --with-zlib +./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-openssl \ + --with-xz \ + --with-zstd \ + --with-zlib \ + --disable-manpages The meaning of the configure options: @@ -74,6 +75,16 @@ + + + --disable-manpages + + + This option disables generating the manpages which + requires an external program. + + + Compile the package: diff --git a/packages.ent b/packages.ent index a7f30cf39..022333993 100644 --- a/packages.ent +++ b/packages.ent @@ -65,10 +65,10 @@ - - + + - + @@ -365,10 +365,10 @@ - - + + - + @@ -431,12 +431,12 @@ - + - + - + - - + + From 10aa6482f7121b12c7c6d2ca415e687a5e6c3d0a Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 18 Aug 2024 14:47:14 -0500 Subject: [PATCH 09/14] 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 10/14] 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 11/14] 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 12/14] 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 13/14] 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 14/14] 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 @@ - +