From ce203670071d5d4ee277f84eb8a4e1934f8def63 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 1 Feb 2025 20:12:49 +0800 Subject: [PATCH 01/18] stages: "Changing Ownership" shouldn't be executed resuming an interrupted build Before we added "--from lfs", it'll break a half-baken LFS system. After we added "--from lfs", it has no effect. --- chapter02/stages.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chapter02/stages.xml b/chapter02/stages.xml index 287aa43f4..f3215035d 100644 --- a/chapter02/stages.xml +++ b/chapter02/stages.xml @@ -68,7 +68,8 @@ - A few operations, from Changing Ownership to + A few operations, from Preparing Virtual Kernel File + Systems to Entering the Chroot Environment, must be done as the root user, with the LFS environment variable set for the &root; user. From aef7c6efd65de51752da917b697caa7ee4d5b825 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 1 Feb 2025 23:48:59 +0800 Subject: [PATCH 02/18] acl: Run the test suite There's only one test failure due to the temporary coreutils, thus I don't think it's a reason strong enough to skip the entire test suite. --- chapter08/acl.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/chapter08/acl.xml b/chapter08/acl.xml index adef493f1..63892d68e 100644 --- a/chapter08/acl.xml +++ b/chapter08/acl.xml @@ -53,10 +53,13 @@ make The Acl tests must be run on a filesystem that supports access - controls, but not until the Coreutils package has been built, - using the Acl libraries. If desired, return to this package - and run make check after the Coreutils - package has been built. + controls. To test the results, issue: + +make check + + One test named test/cp.test is known to + fail because Coreutils is not built with + the Acl support yet. Install the package: From 4f401fb372e0c3bc222e3e6165a5ecf5019c80f2 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 2 Feb 2025 20:02:39 -0600 Subject: [PATCH 03/18] Package updates. Update to vim-9.1.1071. Update to iana-etc-20250123. Update to binutils-2.44.0. Update to coreutils-9.6. Update to e2fsprogs-1.47.2. Update to glibc-2.41. Update to iproute2-6.13.0. Update to libxcrypt-4.4.38. Update to linux-6.13.1. Update to man-pages-6.10. Update to meson-1.7.0. Update to perl-5.40.1. Update to tcl8.6.16. Update to tzdata2025a. Update to xz-5.6.4. --- chapter01/changelog.xml | 66 ++++++++++++++++++++++++++ chapter01/whatsnew.xml | 24 +++++----- chapter03/patches.xml | 4 +- chapter06/binutils-pass2.xml | 2 +- chapter07/createfiles.xml | 4 +- chapter08/binutils.xml | 4 +- chapter08/coreutils.xml | 11 ++++- chapter08/perl.xml | 5 -- chapter08/tcl.xml | 4 +- packages.ent | 90 ++++++++++++++++++------------------ patches.ent | 7 +-- 11 files changed, 146 insertions(+), 75 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 13865692e..68977df08 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,72 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2025-02-02 + + + [bdubbs] - Update to vim-9.1.1071. Addresses + #4500. + + + [bdubbs] - Update to iana-etc-20250123. Addresses + #5006. + + + [bdubbs] - Update to binutils-2.44.0. Fixes + #5634. + + + [bdubbs] - Update to coreutils-9.6. Fixes + #5628. + + + [bdubbs] - Update to e2fsprogs-1.47.2. Fixes + #5637. + + + [bdubbs] - Update to glibc-2.41. Fixes + #5638. + + + [bdubbs] - Update to iproute2-6.13.0. Fixes + #5631. + + + [bdubbs] - Update to libxcrypt-4.4.38. Fixes + #5626. + + + [bdubbs] - Update to linux-6.13.1. Fixes + #5629. + + + [bdubbs] - Update to man-pages-6.10. Fixes + #5632. + + + [bdubbs] - Update to meson-1.7.0. Fixes + #5636. + + + [bdubbs] - Update to perl-5.40.1. Fixes + #5630. + + + [bdubbs] - Update to tcl8.6.16. Fixes + #5635. + + + [bdubbs] - Update to tzdata2025a. Fixes + #5627. + + + [bdubbs] - Update to xz-5.6.4. Fixes + #5633. + + + + 2025-01-15 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 269fd8ab7..0bdf95c70 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -44,9 +44,9 @@ Bc-&bc-version; - + @@ -56,9 +56,9 @@ - + @@ -68,9 +68,9 @@ - + Expat-&expat-version; @@ -101,9 +101,9 @@ Gettext-&gettext-version; - + @@ -182,9 +182,9 @@ Man-DB-&man-db-version; - + MarkupSafe-&markupsafe-version; @@ -209,9 +209,9 @@ - + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 1956d39f5..dd592f663 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -35,7 +35,7 @@ --> - + Bzip2 Documentation Patch - &bzip2-docs-patch-size;: diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml index fb54becb0..a1892a1aa 100644 --- a/chapter06/binutils-pass2.xml +++ b/chapter06/binutils-pass2.xml @@ -55,7 +55,7 @@ produced binaries mistakenly linked against libraries from the host distro. Work around this issue: -sed '6009s/$add_dir//' -i ltmain.sh +sed '6031s/$add_dir//' -i ltmain.sh Create a separate build directory again: diff --git a/chapter07/createfiles.xml b/chapter07/createfiles.xml index 856ef0dbe..8f97c2d3e 100644 --- a/chapter07/createfiles.xml +++ b/chapter07/createfiles.xml @@ -180,11 +180,11 @@ EOF nogroup to avoid an unnamed ID. But other distros may treat this ID differently, so any portable program should not depend on this assignment. - + Some tests in need a regular user. We add this user here and delete this account at the end of that chapter. diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index 2c28df6f1..6717543da 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -40,13 +40,13 @@ Installation of Binutils - + The Binutils documentation recommends building Binutils in a dedicated build directory: diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index 181153d1d..70eb1e318 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -55,7 +55,8 @@ Now prepare Coreutils for compilation: -autoreconf -fiv +autoreconf -fv +automake -af FORCE_UNSAFE_CONFIGURE=1 ./configure \ --prefix=/usr \ --enable-no-install-program=kill,uptime @@ -72,6 +73,14 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ + + automake + + Work around a problem with an older versions of autotools. + + + + FORCE_UNSAFE_CONFIGURE=1 diff --git a/chapter08/perl.xml b/chapter08/perl.xml index df9489d37..0d2937e05 100644 --- a/chapter08/perl.xml +++ b/chapter08/perl.xml @@ -40,12 +40,7 @@ Installation of Perl - This version of Perl builds the Compress::Raw::Zlib and Compress::Raw::BZip2 modules. By default Perl will use an internal copy of the sources for the build. diff --git a/chapter08/tcl.xml b/chapter08/tcl.xml index 28eac584b..0905af0d4 100644 --- a/chapter08/tcl.xml +++ b/chapter08/tcl.xml @@ -3,8 +3,8 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ %general-entities; - - + + ]> diff --git a/packages.ent b/packages.ent index 6ee85b754..618fdbf01 100644 --- a/packages.ent +++ b/packages.ent @@ -65,10 +65,10 @@ - - + + - + @@ -104,10 +104,10 @@ - - + + - + @@ -140,10 +140,10 @@ - - + + - + @@ -255,10 +255,10 @@ - - + + - + @@ -317,10 +317,10 @@ - + - + @@ -341,10 +341,10 @@ - - + + - + @@ -421,22 +421,22 @@ - + - + - - + + - + - + - + - + @@ -783,10 +783,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index 0c1b18d0c..c90d38120 100644 --- a/patches.ent +++ b/patches.ent @@ -7,16 +7,17 @@ --> + - - + + From 5112b5ee91ab704f654aa7df923419b51cd54d26 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 4 Feb 2025 13:36:03 +0800 Subject: [PATCH 04/18] glibc: upgrade: Note that "fixed" headers may need to be removed --- chapter08/glibc.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 959c21038..14f0f5a66 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -317,6 +317,15 @@ install -vm755 dest/usr/lib/*.so.* /usr/lib the locales. Once they are finished, reboot the system immediately. + + + When the system has successfully rebooted, if you are running + a LFS system prior to 12.0 (exclusive) where GCC was not built + with the --disable-fixincludes option, + remove the stale fixed copies of the Glibc headers: + + + rm -rfv $(dirname $(gcc -print-libgcc-file-name))/include-fixed/* Install the package: From 40ca48d44fb8794633a466015ab5b34f978bf2c6 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 6 Feb 2025 10:44:28 +0800 Subject: [PATCH 05/18] binutils: Drop stale references to gold I'm surprised --enable-gold doesn't cause an error when the tarball does not contain gold. --- chapter08/binutils.xml | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index 6717543da..70f6bd026 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -57,7 +57,6 @@ cd build ../configure --prefix=/usr \ --sysconfdir=/etc \ - --enable-gold \ --enable-ld=default \ --enable-plugins \ --enable-shared \ @@ -70,14 +69,6 @@ cd build The meaning of the new configure parameters: - - --enable-gold - - Build the gold linker and install it as ld.gold (alongside the - default linker). - - - --enable-ld=default @@ -142,12 +133,6 @@ cd build grep '^FAIL:' $(find -name '*.log') - Twelve tests fail in the gold test suite when the - and - options are passed to GCC. - - - Install the package: make tooldir=/usr install @@ -167,7 +152,7 @@ cd build Installed directory - addr2line, ar, as, c++filt, dwp, elfedit, gprof, gprofng, ld, ld.bfd, ld.gold, nm, + addr2line, ar, as, c++filt, dwp, elfedit, gprof, gprofng, ld, ld.bfd, nm, objcopy, objdump, ranlib, readelf, size, strings, and strip libbfd.so, libctf.so, libctf-nobfd.so, libgprofng.so, libopcodes.so, and libsframe.so @@ -277,17 +262,6 @@ cd build - - ld.gold - - A cut down version of ld that only supports the - elf object file format - - ld.gold - - - - ld.bfd From 94dc9c26d2ee84c7d81b785d2d9124d630e2ca17 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 8 Feb 2025 08:42:47 +0800 Subject: [PATCH 06/18] Revert "Fix cmds installing python docs (permissions)" This reverts commit dc8572f2413a4d25444bb1237ea2a01dfba60429. The permission issue seems fixed upstream: after I untar the tarball with --no-same-owner --no-same-permissions as root, all files are 644 and all directories are 755 (proven via find -type f -not -perm 644 and find -type d -not -perm 755). --- chapter08/python.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/chapter08/python.xml b/chapter08/python.xml index 75f18945f..ebda61181 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -162,21 +162,21 @@ EOF install -v -dm755 /usr/share/doc/python-&python-version;/html -tar --no-same-owner \ - -xvf ../python-&python-version;-docs-html.tar.bz2 -cp -R --no-preserve=mode python-&python-version;-docs-html/* \ - /usr/share/doc/python-&python-version;/html +tar --strip-components=1 \ + --no-same-owner \ + --no-same-permissions \ + -C /usr/share/doc/python-&python-version;/html \ + -xvf ../python-&python-version;-docs-html.tar.bz2 The meaning of the documentation install commands: - (tar) and (cp) + and Ensure the installed files have the correct ownership and permissions. Without these options, tar - will install the package files with the upstream creator's values - and files would have restrictive permissions. + will install the package files with the upstream creator's values. From 3f2235c907b373df5ae9512e1e9ada97443d9427 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 8 Feb 2025 09:17:21 +0800 Subject: [PATCH 07/18] coreutils: Better explain the autoreconf and automake commands --- chapter08/coreutils.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index 70eb1e318..1acad31ca 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -62,22 +62,28 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ --enable-no-install-program=kill,uptime - The meaning of the configure options: + The meaning of the commands and configure options: - autoreconf + autoreconf -fv The patch for internationalization has modified the build system, so the configuration files must - be regenerated. + be regenerated. Normally we would use the + -i option to update the standard + auxilary files, but for this package it does not work because + configure.ac specified an old gettext + version. - automake + automake -af - Work around a problem with an older versions of autotools. - + The automake auxilary files were not updated by + autoreconf due to the missing + -i option. This command updates them + to prevent a build failure. From cb1b56efce6ba83f916bcb5da854045f10054ad5 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 8 Feb 2025 09:50:39 +0800 Subject: [PATCH 08/18] coreutils: Remove outdated known failures They seem fixed with 9.6. --- chapter08/coreutils.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index 1acad31ca..dfe6d0da5 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -149,12 +149,6 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ groupdel dummy - - Two tests, tests/cp/preserve-mode.sh and - tests/mv/acl.sh, are known to - fail in the chroot environment, but pass in a complete system. - - Install the package: make install From 611c87328f72d70664664874cbc62b2ffecac8ce Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 10 Feb 2025 18:32:32 +0800 Subject: [PATCH 09/18] glibc: Update total test number for 2.41 release --- chapter08/glibc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 14f0f5a66..79137416f 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -152,7 +152,7 @@ esac You may see some test failures. The Glibc test suite is somewhat dependent on the host system. A few failures out of - over 5000 tests can generally be ignored. This is a list of the + over 6000 tests can generally be ignored. This is a list of the most common issues seen for recent versions of LFS: From 581ee1a9e887d33fbb813fbb46d0ced30ffebcba Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 10 Feb 2025 21:29:48 +0800 Subject: [PATCH 10/18] ninja: Add --verbose Some user using a slow system complained (off-list) to me that the long no-output period seemed like a hang (esp. combined with the warning about missing re2c). Also explain the "basic functionality test" is already done, so no need to run "./ninja" again for testing. --- chapter08/ninja.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/chapter08/ninja.xml b/chapter08/ninja.xml index 5bccea1ea..6850d06a0 100644 --- a/chapter08/ninja.xml +++ b/chapter08/ninja.xml @@ -67,7 +67,7 @@ Build Ninja with: -python3 configure.py --bootstrap +python3 configure.py --bootstrap --verbose The meaning of the build option: @@ -80,10 +80,20 @@ + + --verbose + + This parameter makes configure.py show + the progress building Ninja. + + + The package tests cannot run in the chroot environment. They require - cmake. + cmake. But the basic + function of this package is already tested by rebuilding itself + (with the --bootstrap option) anyway. + + 2025-02-13 + + + [bdubbs] - Update to vim-9.1.1106. Addresses + #4500. + + + [bdubbs] - Update to diffutils-3.11. Fixes + #5639. + + + [bdubbs] - Update to libffi-3.4.7. Fixes + #5642. + + + [bdubbs] - Update to linux-6.13.2. Fixes + #5643. + + + [bdubbs] - Update to Python3-3.13.2. Fixes + #5640. + + + [bdubbs] - Update to sysvinit-3.14. Fixes + #5641. + + + + 2025-02-02 @@ -414,7 +444,7 @@ [bdubbs] - Update to tcl9.0.0. Fixes #5570. - + [bdubbs] - Update to linux-6.11.1. Fixes #5556. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 0bdf95c70..481d326fd 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -65,9 +65,9 @@ D-Bus-&dbus-version; - + E2fsprogs-&e2fsprogs-version; @@ -155,9 +155,9 @@ Libelf from Elfutils-&elfutils-version; - + Libpipeline-&libpipeline-version; diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index 70f6bd026..5ea6c1b41 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -40,13 +40,7 @@ Installation of Binutils - The Binutils documentation recommends building Binutils in a dedicated build directory: @@ -137,9 +131,10 @@ cd build make tooldir=/usr install - Remove useless static libraries: + Remove useless static libraries and other files: -rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,gprofng,opcodes,sframe}.a +rm -rfv /usr/lib/lib{bfd,ctf,ctf-nobfd,gprofng,opcodes,sframe}.a \ + /usr/share/doc/gprofng/ diff --git a/chapter08/procps.xml b/chapter08/procps.xml index 8dccfd697..eb7d277dc 100644 --- a/chapter08/procps.xml +++ b/chapter08/procps.xml @@ -91,7 +91,8 @@ su tester -c "PATH=$PATH make check" One test named ps with output flag bsdtime,cputime,etime,etimes is known to fail if the host kernel is not built with - CONFIG_BSD_PROCESS_ACCT enabled. + CONFIG_BSD_PROCESS_ACCT enabled. In + addition, one pgrep test may fail in the chroot environment. Install the package: diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml index 648b204b5..8ea9132b9 100644 --- a/chapter08/util-linux.xml +++ b/chapter08/util-linux.xml @@ -128,6 +128,11 @@ su tester -c "make -k check" enabled. + + Two other tests, lsfd: SOURCE column and utmp: last, are known to + fail in the chroot environment. + + Install the package: make install diff --git a/chapter08/vim.xml b/chapter08/vim.xml index 3da3bc4b6..6e018ac41 100644 --- a/chapter08/vim.xml +++ b/chapter08/vim.xml @@ -80,9 +80,11 @@ sed '/test_glvs/d' -i src/testdir/Make_all.mak cause issues with the settings of the current terminal (especially while we are overriding the TERM variable to satisfy some assumptions of the test suite). The problem can be - avoided by redirecting the output to a log file as shown above. A - successful test will result in the words ALL - DONE in the log file at completion. + avoided by redirecting the output to a log file as shown above. + + Four tests related to GetLatestVimScripts are known to fail in + the chroot environment because wget or curl are not available to + download the required test scripts. Install the package: diff --git a/packages.ent b/packages.ent index 618fdbf01..6966b1653 100644 --- a/packages.ent +++ b/packages.ent @@ -18,7 +18,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -52,9 +52,9 @@ - + - + @@ -72,10 +72,10 @@ - + - - + + @@ -83,10 +83,10 @@ - + - + @@ -109,10 +109,10 @@ - + - - + + @@ -130,22 +130,22 @@ - - + + - + - + - - + + - + @@ -153,7 +153,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -177,9 +177,9 @@ - + - + @@ -189,7 +189,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -223,10 +223,10 @@ - + - + @@ -234,7 +234,7 @@ - + @@ -250,19 +250,19 @@ - - - - + + + + - - - + + + @@ -296,7 +296,7 @@ - + @@ -394,13 +394,13 @@ - + - - + + - + @@ -410,7 +410,7 @@ - + @@ -418,8 +418,8 @@ - - + + @@ -431,12 +431,12 @@ - + - + - + - + - + - + - - - - + + + + - - + + @@ -642,7 +642,7 @@ - + @@ -650,7 +650,7 @@ - + @@ -658,7 +658,7 @@ - + @@ -676,15 +676,15 @@ - - + + - + - + - + @@ -695,7 +695,7 @@ - + @@ -707,16 +707,16 @@ - + - + - + @@ -725,14 +725,13 @@ - - - + + @@ -740,15 +739,15 @@ - + - + - + - + - + - - + + - + @@ -788,7 +787,7 @@ - + @@ -810,6 +809,6 @@ - + From df98180f354cd47fe9f56224c1498b4b049fb870 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 12 Feb 2025 16:36:17 -0600 Subject: [PATCH 13/18] Remove binutils patch on whatsnew. --- chapter01/whatsnew.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 481d326fd..dc748661e 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -295,9 +295,11 @@ Added: + From 4bc4b26d5a6fcd053175d984415ec0cfe673ac72 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 12 Feb 2025 19:05:22 -0600 Subject: [PATCH 14/18] Restrict tcl currency to version 8 for now. --- lfs-latest-git.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs-latest-git.php b/lfs-latest-git.php index 397f8732a..f189871eb 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -232,7 +232,7 @@ if ( $package == "zstd" ) $dirpath = github("facebook/zstd"); } if ( $package == "tcl" ) - return find_max( $lines, "/tcl\d/", "/^.*tcl(\d\.[\d\.]*\d)-src.*$/" ); + return find_max( $lines, "/tcl8/", "/^.*tcl(\d\.[\d\.]*\d)-src.*$/" ); if ( $package == "gmp" ) return find_max( $lines, "/$package/", "/^.*$package-([\d\._]*\d[a-z]?).tar.*$/" ); From dfd69d56e75e460713607ff87fed6764758931e6 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 13 Feb 2025 11:10:49 -0600 Subject: [PATCH 15/18] Speling --- chapter08/coreutils.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index dfe6d0da5..36d428981 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -71,7 +71,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ build system, so the configuration files must be regenerated. Normally we would use the -i option to update the standard - auxilary files, but for this package it does not work because + auxiliary files, but for this package it does not work because configure.ac specified an old gettext version. @@ -80,7 +80,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ automake -af - The automake auxilary files were not updated by + The automake auxiliary files were not updated by autoreconf due to the missing -i option. This command updates them to prevent a build failure. From 36f2a2dd532bff818cebfc1f1447a26a9ec95650 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 14 Feb 2025 04:11:11 +0800 Subject: [PATCH 16/18] kernel: Regenerate configuration with Linux 6.13.1 --- chapter10/kernel/kernel.version | 2 +- chapter10/kernel/systemd.xml | 3 ++- chapter10/kernel/sysv.xml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version index ff61e1868..d7d9d3fbd 100644 --- a/chapter10/kernel/kernel.version +++ b/chapter10/kernel/kernel.version @@ -1 +1 @@ -6.12.1 +6.13.1 diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml index 0525fbd0a..d143f0578 100644 --- a/chapter10/kernel/systemd.xml +++ b/chapter10/kernel/systemd.xml @@ -49,7 +49,8 @@ [*] Display a user-friendly message when a kernel panic occurs ... [DRM_PANIC] (kmsg) Panic screen formatter [DRM_PANIC_SCREEN] - [*] Enable legacy fbdev support for your modesetting driver + Supported DRM clients ---> + [*] Enable legacy fbdev support for your modesetting driver ... [DRM_FBDEV_EMULATION] <*> Simple framebuffer driver [DRM_SIMPLEDRM] Console display driver support ---> diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml index f90164d65..759c3aa49 100644 --- a/chapter10/kernel/sysv.xml +++ b/chapter10/kernel/sysv.xml @@ -36,7 +36,8 @@ [*] Display a user-friendly message when a kernel panic occurs ... [DRM_PANIC] (kmsg) Panic screen formatter [DRM_PANIC_SCREEN] - [*] Enable legacy fbdev support for your modesetting driver + Supported DRM clients ---> + [*] Enable legacy fbdev support for your modesetting driver ... [DRM_FBDEV_EMULATION] <*> Simple framebuffer driver [DRM_SIMPLEDRM] Console display driver support ---> From 34202ef44adcd00278d7f0f1054573c02291e0f1 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 14 Feb 2025 04:13:13 +0800 Subject: [PATCH 17/18] vim: The tests requiring wget/curl have been removed with sed --- chapter08/vim.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/chapter08/vim.xml b/chapter08/vim.xml index 6e018ac41..3da3bc4b6 100644 --- a/chapter08/vim.xml +++ b/chapter08/vim.xml @@ -80,11 +80,9 @@ sed '/test_glvs/d' -i src/testdir/Make_all.mak cause issues with the settings of the current terminal (especially while we are overriding the TERM variable to satisfy some assumptions of the test suite). The problem can be - avoided by redirecting the output to a log file as shown above. - - Four tests related to GetLatestVimScripts are known to fail in - the chroot environment because wget or curl are not available to - download the required test scripts. + avoided by redirecting the output to a log file as shown above. A + successful test will result in the words ALL + DONE in the log file at completion. Install the package: From 5ba41a882b936b8858926cd3b29cb20be0bf1e43 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 14 Feb 2025 21:52:51 +0800 Subject: [PATCH 18/18] glibc: Fix another flaw in update process regarding "fixed" includes --- chapter08/glibc.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 79137416f..c803d0c07 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -322,10 +322,14 @@ install -vm755 dest/usr/lib/*.so.* /usr/lib When the system has successfully rebooted, if you are running a LFS system prior to 12.0 (exclusive) where GCC was not built with the --disable-fixincludes option, + move two GCC headers into a better location and remove the stale fixed copies of the Glibc headers: - rm -rfv $(dirname $(gcc -print-libgcc-file-name))/include-fixed/* + DIR=$(dirname $(gcc -print-libgcc-file-name)) +[ -e $DIR/include/limits.h ] || mv $DIR/include{-fixed,}/limits.h +[ -e $DIR/include/syslimits.h ] || mv $DIR/include{-fixed,}/syslimits.h +rm -rfv $(dirname $(gcc -print-libgcc-file-name))/include-fixed/* Install the package: