From d26d12f45c447f265ef9eb15fc4d357797f0039d Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 10 Oct 2024 13:11:31 -0500 Subject: [PATCH 01/41] Fix currency for MarkupSafe --- lfs-latest-git.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lfs-latest-git.php b/lfs-latest-git.php index 55c634e0b..6b7b2d4c2 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -256,6 +256,9 @@ if ( $package == "zstd" ) $dirpath = github("facebook/zstd"); if ( $package == "setuptools" ) return find_max( $lines, "/setuptools /", "/^.*setuptools ([\d\.]+)$/" ); + if ( $package == "MarkupSafe" ) + return find_max( $lines, "/MarkupSafe /", "/^.*MarkupSafe ([\d\.]+)$/" ); + if ( $package == "procps-ng" ) return find_max( $lines, "/v\d/", "/^.*v([\d\.]+)$/" ); From 33ec8810eea89dbe181c5abe4705f52b27b52707 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 14 Oct 2024 22:02:13 +0800 Subject: [PATCH 02/41] grub: Use "file system" instead of "filesystem" We've had the consensus on this since David's cleanup. --- chapter08/grub.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 0710c4a37..b301d4f5a 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -177,7 +177,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions grub-fstest - Is a tool to debug the filesystem driver + Is a tool to debug the file system driver grub-fstest From 52104e05f096555dd2da5d47290bd1cf2fa87c03 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 24 Oct 2024 21:14:17 -0500 Subject: [PATCH 03/41] Package updates. Update to iana-etc-20241015. Update to vim-9.1.0813. Update to xz-5.6.3. Update to sysvinit-3.11. Update to setuptools-75.2.0. Update to Python3-3.13.0. Update to openssl-3.4.0. Update to meson-1.6.0. Update to markupsafe-3.0.2. Update to linux-6.11.5. Update to less-668. Update to elfutils-0.192. --- chapter01/changelog.xml | 54 +++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 20 +++++------ chapter08/python.xml | 5 +-- packages.ent | 76 ++++++++++++++++++++--------------------- 4 files changed, 105 insertions(+), 50 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f6ef99d3f..948d4382b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,60 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-10-25 + + + [bdubbs] - Update to iana-etc-20241015. Addresses + #5006. + + + [bdubbs] - Update to vim-9.1.0813. Addresses + #4500. + + + [bdubbs] - Update to xz-5.6.3. Fixes + #5572. + + + [bdubbs] - Update to sysvinit-3.11. Fixes + #5581. + + + [bdubbs] - Update to setuptools-75.2.0. Fixes + #5577. + + + [bdubbs] - Update to Python3-3.13.0. Fixes + #5575. + + + [bdubbs] - Update to openssl-3.4.0. Fixes + #5582. + + + [bdubbs] - Update to meson-1.6.0. Fixes + #5580. + + + [bdubbs] - Update to markupsafe-3.0.2. Fixes + #5576. + + + [bdubbs] - Update to linux-6.11.5. Fixes + #5574. + + + [bdubbs] - Update to less-668. Fixes + #5578. + + + [bdubbs] - Update to elfutils-0.192. Fixes + #5579. + + + + 2024-10-03 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 2bd9ce999..21032b1bf 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -143,18 +143,18 @@ - + - + @@ -182,9 +182,9 @@ - + Meson-&meson-version; @@ -239,9 +239,9 @@ Systemd-&systemd-version; - + @@ -269,9 +269,9 @@ - + diff --git a/chapter08/python.xml b/chapter08/python.xml index ed3df8453..75f18945f 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -88,7 +88,8 @@ limit and 1 SBU (measured when building Binutils pass 1 with one CPU core) should be enough. Some tests are flaky, so the test suite will automatically re-run failed tests. If a test failed but then passed - when re-run, it should be considered as passed. + when re-run, it should be considered as passed. One test, test_ssl, + is known to fail in the chroot environment. Install the package: @@ -163,7 +164,7 @@ EOF tar --no-same-owner \ -xvf ../python-&python-version;-docs-html.tar.bz2 -cp -R --no-preserve=mode python-&python-minor;-docs-html/* \ +cp -R --no-preserve=mode python-&python-version;-docs-html/* \ /usr/share/doc/python-&python-version;/html diff --git a/packages.ent b/packages.ent index 6909e23e9..ad149fc36 100644 --- a/packages.ent +++ b/packages.ent @@ -148,10 +148,10 @@ - - + + - + @@ -317,10 +317,10 @@ - + - + @@ -373,10 +373,10 @@ - - + + - + @@ -431,12 +431,12 @@ - + - + - + - - - + + + - + - - + + @@ -637,10 +637,10 @@ - - + + - + @@ -679,10 +679,10 @@ - + - + @@ -745,10 +745,10 @@ - + - + - + @@ -783,10 +783,10 @@ - - + + - + From 8a0ae36a91f9c351c3f0b0d9c667346ab9fc3c28 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 25 Oct 2024 11:37:55 -0500 Subject: [PATCH 04/41] Fix extra spacing around some xml tags. --- appendices/dependencies.xml | 12 ++++++------ chapter05/glibc.xml | 4 ++-- chapter10/kernel.xml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index d9c44641c..d93cc1f5e 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -4,8 +4,7 @@ %general-entities; - Systemd - Udev"> + SystemdUdev"> Berkeley DB"> ]> @@ -45,7 +44,7 @@ &dependencies; - Attr, Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make, + Attr, Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make, Perl, Sed, and Texinfo @@ -2571,9 +2570,10 @@ &before; Binutils, - D-Bus, E2fsprogs, - IProute2, Kmod, Man-DB, Procps-ng, Python, - &systemd-udev;, and Util-linux + D-Bus, + E2fsprogs, IProute2, Kmod, Man-DB, Procps-ng, Python, + &systemd-udev;, + and Util-linux diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index b8b8171da..2dccf93bf 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -187,8 +187,8 @@ cd build packages to define the location where the package should be installed. If it is not set, it defaults to the root (/) directory. Here we specify that - the package is installed in $LFS - , which will become the root directory in + $LFS, which will become the root directory in . diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index c1e02129a..4eb87a17b 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -339,7 +339,7 @@ If you've decided to use a separate &boot-dir; partition for the LFS system (maybe sharing a &boot-dir; partition with the host - distro) , the files copied below should go there. The easiest way to + distro), the files copied below should go there. The easiest way to do that is to create the entry for &boot-dir; in &fstab; first (read the previous section for details), then issue the following command as the &root; user in the From 08620feaa124f04c5fee08d462fc0669100306eb Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 25 Oct 2024 12:45:27 -0500 Subject: [PATCH 05/41] Fix currency for markupsafe. --- lfs-latest-git.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lfs-latest-git.php b/lfs-latest-git.php index 6b7b2d4c2..5309d38ad 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -14,6 +14,7 @@ $regex = array(); //$regex[ 'bzip2' ] = "/^.*current version is ([\d\.]+).*$/"; $regex[ 'intltool' ] = "/^.*Latest version is (\d[\d\.]+\d).*$/"; $regex[ 'less' ] = "/^.*current released version is less-(\d+).*$/"; +$regex[ 'markupsafe' ] = "/^.*MarkupSafe ([\d\.]+).*$/"; $regex[ 'mpfr' ] = "/^mpfr-([\d\.]+)\.tar.*$/"; //$regex[ 'Python' ] = "/^.*Latest Python 3.*Python (3[\d\.]+\d).*$/"; //$regex[ 'sysvinit' ] = "/^.*sysvinit-([\d\.]+)dsf\.tar.*$/"; @@ -147,7 +148,7 @@ if ( $package == "psmisc" ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/t if ( $package == "Python" ) $dirpath = "https://www.python.org/downloads/source/"; if ( $package == "shadow" ) $dirpath = github("shadow-maint/shadow"); if ( $package == "sysvinit" ) $dirpath = github("slicer69/sysvinit"); -if ( $package == "MarkupSafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/"; +if ( $package == "markupsafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/"; if ( $package == "jinja" ) $dirpath = "https://pypi.python.org/pypi/Jinja2/"; if ( $package == "sysklogd" ) $dirpath = github("troglobit/sysklogd"); if ( $package == "systemd" ) $dirpath = github("systemd/systemd"); From a9517d383c52f744fef132d1d9f9ce649dd71df5 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 1 Nov 2024 11:38:36 -0500 Subject: [PATCH 06/41] Package updates. Update to linux-6.11.6. Update to libcap-2.71. Update to setuptools-75.3.0. Update to flit_core-3.10.0. --- chapter01/changelog.xml | 22 ++++++++++++++++++++++ chapter01/whatsnew.xml | 8 ++++---- chapter08/sysklogd.xml | 3 ++- packages.ent | 24 ++++++++++++------------ 4 files changed, 40 insertions(+), 17 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 948d4382b..0680f1e92 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-10-25 + + + [bdubbs] - Update to linux-6.11.6. Fixes + #5588. + + + [bdubbs] - Update to libcap-2.71. Fixes + #5584. + + + [bdubbs] - Update to setuptools-75.3.0. Fixes + #5585. + + + [bdubbs] - Update to flit_core-3.10.0. Fixes + #5587. + + + + 2024-10-25 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 21032b1bf..c1ef4374d 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -86,9 +86,9 @@ - + Gawk-&gawk-version; @@ -149,9 +149,9 @@ - + Libelf from Elfutils-&elfutils-version; diff --git a/chapter08/sysklogd.xml b/chapter08/sysklogd.xml index f86718873..af9b860f6 100644 --- a/chapter08/sysklogd.xml +++ b/chapter08/sysklogd.xml @@ -46,7 +46,8 @@ ./configure --prefix=/usr \ --sysconfdir=/etc \ --runstatedir=/run \ - --without-logger + --without-logger \ + --docdir=/usr/share/doc/sysklogd-&sysklogd-version; Compile the package: diff --git a/packages.ent b/packages.ent index ad149fc36..c2c995eee 100644 --- a/packages.ent +++ b/packages.ent @@ -200,10 +200,10 @@ - - + + - + @@ -389,10 +389,10 @@ - - + + - + @@ -431,12 +431,12 @@ - + - + - + + + 2024-11-08 + + + [bdubbs] - Added binutils-2.43.1-upstream_fix-1.patch. Fixes + #5591. + + + [bdubbs] - Update to flit_core-3.10.1. Fixes + #5589. + + + [bdubbs] - Update to expat-2.6.4. Fixes + #5590. + + + + 2024-10-25 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index c1ef4374d..2279d171d 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -292,9 +292,9 @@ Added: - + + binutils-2.43.1-upstream_fix-1.patch + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index ef00fbe5a..1956d39f5 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -35,15 +35,15 @@ --> - + Bzip2 Documentation Patch - &bzip2-docs-patch-size;: diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index 629c698c3..2c28df6f1 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -41,6 +41,12 @@ Installation of Binutils + First, apply a patch to prevent a bug that causing + unnecessary relinking with packages that depend on cmake-3.31.0 + or newer: + +patch -Np1 -i ../&binutils-upstream-patch; + The Binutils documentation recommends building Binutils in a dedicated build directory: diff --git a/packages.ent b/packages.ent index c2c995eee..4013f7e53 100644 --- a/packages.ent +++ b/packages.ent @@ -156,10 +156,10 @@ - - + + - + @@ -200,10 +200,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index fbb773577..7035044cd 100644 --- a/patches.ent +++ b/patches.ent @@ -7,6 +7,10 @@ --> + + + + From 505b6b1581863013bd114510b5d72d8b08fe53ca Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 9 Nov 2024 18:31:59 +0800 Subject: [PATCH 09/41] shadow: Remove reference to cracklib The cracklib integration has been removed by upstream since shadow-4.15.0. --- chapter08/shadow.xml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml index de6b05f75..38d233a9d 100644 --- a/chapter08/shadow.xml +++ b/chapter08/shadow.xml @@ -44,18 +44,20 @@ If you've installed Linux-PAM, you should follow - the BLFS shadow - page instead of this page to build (or, rebuild or upgrade) - shadow. + the BLFS + instruction instead of this page to build (or, rebuild or + upgrade) shadow. - If you would like to enforce the use of strong passwords, refer to - for installing - CrackLib prior to building Shadow. Then add - --with-libcrack to the configure - command below. + If you would like to enforce the use of strong passwords, + install and configure + Linux-PAM first. Then + install and configure + shadow with the PAM support. Finally + install + libpwquality and configure PAM to use it. Disable the installation of the groups program @@ -94,11 +96,6 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \; - - If you chose to build Shadow with Cracklib support, issue this command: - -sed -i 's:DICTPATH.*:DICTPATH\t/lib/cracklib/pw_dict:' etc/login.defs - + + 2024-11-15 + + + [bdubbs] - Update to vim-9.1.0866. Addresses + #4500. + + + [bdubbs] - Update to iana-etc-20241024. Addresses + #5006. + + + [bdubbs] - Update to wheel-0.45.0 (Python Module). Fixes + #5593. + + + [bdubbs] - Update to setuptools-75.5.0 (Python Module). Fixes + #5595. + + + [bdubbs] - Update to linux-6.11.8. Fixes + #5582. + + + [bdubbs] - Update to libcap-2.72. Fixes + #5594. + + + + 2024-11-08 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 2279d171d..bf699eef3 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -263,9 +263,9 @@ Vim-&vim-version; - + diff --git a/chapter08/readline.xml b/chapter08/readline.xml index 882391cae..f5163e992 100644 --- a/chapter08/readline.xml +++ b/chapter08/readline.xml @@ -89,7 +89,9 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install SHLIB_LIBS="-lncursesw" This option forces Readline to link against the - libncursesw library. + libncursesw library. + For details see the "Shared Libraries" section in the package's + "README" file. diff --git a/packages.ent b/packages.ent index 4013f7e53..35da245f8 100644 --- a/packages.ent +++ b/packages.ent @@ -317,10 +317,10 @@ - + - + @@ -389,10 +389,10 @@ - - + + - + @@ -431,12 +431,12 @@ - + - + - + @@ -767,10 +767,10 @@ - - + + - + From eca8b13b5927994b202c172035baa987d7aee70d Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 16 Nov 2024 08:57:29 +0800 Subject: [PATCH 11/41] readline: Decorate new info about SHLIB_LIBS --- chapter08/readline.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter08/readline.xml b/chapter08/readline.xml index f5163e992..2a01c86c8 100644 --- a/chapter08/readline.xml +++ b/chapter08/readline.xml @@ -90,8 +90,8 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install This option forces Readline to link against the libncursesw library. - For details see the "Shared Libraries" section in the package's - "README" file. + For details see the Shared Libraries section in the + package's README file. From 4660ec224be5dff041eaadfaf413e3713f5ab6a1 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 15 Nov 2024 21:02:50 -0600 Subject: [PATCH 12/41] Fix vim stats. --- packages.ent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.ent b/packages.ent index 35da245f8..d8aa85732 100644 --- a/packages.ent +++ b/packages.ent @@ -748,7 +748,7 @@ - + - + From d5d6ec44ea835da5300e48781531567fd04ee6e7 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 17 Nov 2024 11:38:17 +0800 Subject: [PATCH 13/41] readline: Remove SHLIB_LIBS from make install It's not needed now and I don't know why it was added in the first place (at r10573-g2e8cbe04cdac). I'd say it likely just covered up some user error (for e.g. simply forgetting "make" before "make install"). Removing it anyway and if it turns out something bad is happening we can always revert. --- chapter08/readline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/readline.xml b/chapter08/readline.xml index 2a01c86c8..eefd9f966 100644 --- a/chapter08/readline.xml +++ b/chapter08/readline.xml @@ -101,7 +101,7 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install Install the package: -make SHLIB_LIBS="-lncursesw" install +make install If desired, install the documentation: From 410e400a7978c1236b10689dc1268883a33ce778 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 20 Nov 2024 09:59:23 +0800 Subject: [PATCH 14/41] shadow: Having /bin or /sbin in $PATH is not a good idea Turned out in a recent blfs-support discuss. --- chapter08/shadow.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml index 38d233a9d..4cdf2596e 100644 --- a/chapter08/shadow.xml +++ b/chapter08/shadow.xml @@ -83,13 +83,13 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;/usr. - - If you wish to include /bin - and/or /sbin in the PATH - for some reason, modify the - PATH in .bashrc after LFS has been - built. - + + Including /bin + and/or /sbin in + the PATH variable may cause some BLFS packages fail to + build, so don't do that + in the .bashrc file or anywhere else. + sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD YESCRYPT:' \ -e 's:/var/spool/mail:/var/mail:' \ From e5338216f06703f1a58721d52d849265de43d78e Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 19 Nov 2024 22:28:24 -0600 Subject: [PATCH 15/41] Remove unneeded PATH entries. --- chapter11/afterlfs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml index 633a782df..88a3c0114 100644 --- a/chapter11/afterlfs.xml +++ b/chapter11/afterlfs.xml @@ -168,7 +168,7 @@ EOF alias lfs='sudo /usr/sbin/chroot /mnt/lfs /usr/bin/env -i HOME=/root TERM="$TERM" PS1="\u:\w\\\\$ " -PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login' +PATH=/usr/bin:/usr/sbin /bin/bash --login' This alias is a little tricky because of the quoting and levels of From e5cc8213aafbe19f073345a4f5dbad05a6ed4a2d Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 28 Nov 2024 12:50:41 -0600 Subject: [PATCH 16/41] Typo --- chapter08/iproute2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index 8a6755f3d..c010ee2ed 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -274,7 +274,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;Traffic control for Quality of Service (QoS) and Class of Service (CoS) implementations - tc qdisc allows users to set up the queueing + tc qdisc allows users to set up the queuing discipline tc class allows users to set up classes based From ea48456403283120cd3c74357b46c6aae7bcdb2d Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sat, 30 Nov 2024 09:49:34 -0600 Subject: [PATCH 17/41] Update to iana-etc-20241122. Update to file-5.46. Update to iproute2-6.12.0. Update to libtool-2.5.4. Update to linux-6.12.1. Update to setuptools-75.6.0 (Python Module). Update to wheel-0.45.1 (Python Module). --- chapter01/changelog.xml | 34 +++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 4 ++-- chapter08/iproute2.xml | 4 ++-- packages.ent | 44 ++++++++++++++++++++--------------------- 4 files changed, 60 insertions(+), 26 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0beb04d7b..cdb245999 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,40 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-12-01 + + + [bdubbs] - Update to iana-etc-20241122. Addresses + #5006. + + + [bdubbs] - Update to file-5.46. Fixes + #5601. + + + [bdubbs] - Update to iproute2-6.12.0. Fixes + #5597. + + + [bdubbs] - Update to libtool-2.5.4. Fixes + #5598. + + + [bdubbs] - Update to linux-6.12.1. Fixes + #5586. + + + [bdubbs] - Update to setuptools-75.6.0 (Python Module). Fixes + #5599. + + + [bdubbs] - Update to wheel-0.45.1 (Python Module). Fixes + #5600. + + + + 2024-11-15 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index bf699eef3..65de020ec 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -77,9 +77,9 @@ - + diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index c010ee2ed..50fec36aa 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -274,11 +274,11 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;Traffic control for Quality of Service (QoS) and Class of Service (CoS) implementations - tc qdisc allows users to set up the queuing + tc qdisc allows users to set up the queueing discipline tc class allows users to set up classes based - on the queuing discipline scheduling + on the queueing discipline scheduling tc filter allows users to set up the QoS/CoS packet filtering diff --git a/packages.ent b/packages.ent index d8aa85732..f90f8fae7 100644 --- a/packages.ent +++ b/packages.ent @@ -172,10 +172,10 @@ - - + + - + @@ -317,10 +317,10 @@ - - + + - + @@ -341,10 +341,10 @@ - - + + - + @@ -413,10 +413,10 @@ - - + + - + @@ -430,13 +430,13 @@ - - + + - + - + - + + + + 2024-12-15 + + + [bdubbs] - Update to vim-9.1.0927. Addresses + #4500. + + + [bdubbs] - Update to iana-etc-20241206. Addresses + #5006. + + + [bdubbs] - Update to systemd-257. Fixes + #5559. + + + [bdubbs] - Update to Python-3.13.1. Fixes + #5605. + + + [bdubbs] - Update to libcap-2.73. Fixes + #5604. + + + [bdubbs] - Update to linux-6.12.5. Fixes + #5607. + + + [bdubbs] - Update to kbd-2.7. Fixes + #5608. + + + [bdubbs] - Update to gettext-0.23. Fixes + #5603. + + + + 2024-12-01 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 65de020ec..aa8d41543 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -98,9 +98,9 @@ - + @@ -137,9 +137,9 @@ - + diff --git a/chapter08/gettext.xml b/chapter08/gettext.xml index f26d15536..3d5e3ade7 100644 --- a/chapter08/gettext.xml +++ b/chapter08/gettext.xml @@ -43,6 +43,12 @@ Installation of Gettext + First fix some compatibility issues with other programs: + +sed -e '/libxml\/xmlerror.h/i #include <libxml/xmlversion.h>' \ + -e 's/xmlError *err/const &/' \ + -i gettext-tools/src/its.c + Prepare Gettext for compilation: ./configure --prefix=/usr \ diff --git a/chapter08/udev.xml b/chapter08/udev.xml index b3c318a0b..8883b624b 100644 --- a/chapter08/udev.xml +++ b/chapter08/udev.xml @@ -48,17 +48,19 @@ sgx, from the default udev rules: - sed -i -e 's/GROUP="render"/GROUP="video"/' \ - -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in + sed -e 's/GROUP="render"/GROUP="video"/' \ + -e 's/GROUP="sgx", //' \ + -i rules.d/50-udev-default.rules.in Remove one udev rule requiring a full Systemd installation: - sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in + sed -i '/systemd-sysctl/s/^/#/' rules.d/99-systemd.rules.in Adjust the hardcoded paths to network configuration files for the standalone udev installation: - sed '/NETWORK_DIRS/s/systemd/udev/' -i src/basic/path-lookup.h + sed -e '/NETWORK_DIRS/s/systemd/udev/' + -i src/libsystemd/sd-network/network-util.h Prepare Udev for compilation: diff --git a/packages.ent b/packages.ent index f90f8fae7..6af66bcdf 100644 --- a/packages.ent +++ b/packages.ent @@ -245,10 +245,10 @@ - - + + - + @@ -317,10 +317,10 @@ - + - + @@ -357,10 +357,10 @@ - - + + - + @@ -389,10 +389,10 @@ - + - + @@ -431,12 +431,12 @@ - + - + - + - + - + - + - - + + @@ -661,15 +661,15 @@ - + - + - + @@ -745,7 +745,7 @@ - + From 1b69877bc4e55efa87fd1753cb891bcb0329bea3 Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Mon, 16 Dec 2024 11:56:30 +0100 Subject: [PATCH 31/41] Fix chksum of vim tarball --- packages.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.ent b/packages.ent index 6af66bcdf..4ced83917 100644 --- a/packages.ent +++ b/packages.ent @@ -762,7 +762,7 @@ example, https://github.com/vim/vim/tags?after=v8.1.1847 will show us v8.1.1846. --> - + From fba6f0643d6c5bd1bf2a264eead4e5fb42ba83e7 Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Mon, 16 Dec 2024 16:50:42 +0100 Subject: [PATCH 32/41] Add missing backslash --- chapter08/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/udev.xml b/chapter08/udev.xml index 8883b624b..1be726094 100644 --- a/chapter08/udev.xml +++ b/chapter08/udev.xml @@ -59,7 +59,7 @@ Adjust the hardcoded paths to network configuration files for the standalone udev installation: - sed -e '/NETWORK_DIRS/s/systemd/udev/' + sed -e '/NETWORK_DIRS/s/systemd/udev/' \ -i src/libsystemd/sd-network/network-util.h Prepare Udev for compilation: From 72fae0d02c402e2a35e5b078deeed65d8e4c42a2 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 16 Dec 2024 11:54:48 -0600 Subject: [PATCH 33/41] Fix vim size --- packages.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.ent b/packages.ent index 4ced83917..1d41cb4c2 100644 --- a/packages.ent +++ b/packages.ent @@ -748,7 +748,7 @@ - + - One test named systemd:core / test-namespace - is known to fail in the LFS chroot environment. Some other tests may + after initializing the system with systemd. + This seems to pass now in chroot --> + + Three tests named systemd:test / test-fd-util, + systemd:test / test-mount-util, and + systemd:test / test-mountpoint-util, + are known to fail in the LFS chroot environment. Some other tests may fail because they depend on various kernel configuration options. Install the package: From 33b3a04e4e7c13112517e266a9367101f6823dab Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Thu, 19 Dec 2024 15:05:20 -0600 Subject: [PATCH 38/41] Revert "systemd: Update the test suite failures list for 257." This reverts commit 8f493a63774a200a9be7f1543f85b4fa155ed26f. When I was building LFS, I somehow forgot to mount /dev/sdb7 to /mnt/lfs on my system. I ended up chrooting into /mnt/lfs, and it was a directory, not a filesystem. This happens from time to time, not sure why I did it this time! The tests that I had marked as failed no longer fail, but at the same time, now test-namespace does. Let's undo this commit... --- chapter08/systemd.xml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index acd90aef9..1e17c60ce 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -225,14 +225,9 @@ meson setup .. \ ninja test - - Three tests named systemd:test / test-fd-util, - systemd:test / test-mount-util, and - systemd:test / test-mountpoint-util, - are known to fail in the LFS chroot environment. Some other tests may + after initializing the system with systemd. --> + One test named systemd:core / test-namespace + is known to fail in the LFS chroot environment. Some other tests may fail because they depend on various kernel configuration options. Install the package: From 86a50f243aa3dcb79447431677a99baae91c1bc4 Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Fri, 20 Dec 2024 15:15:07 -0600 Subject: [PATCH 39/41] /etc/os-release: Add in the RELEASE_TYPE field. This field was introduced with systemd-257. For development books, we'll use "development" here, but when we do the next release we should change this to say "stable". --- chapter11/theend.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/chapter11/theend.xml b/chapter11/theend.xml index 2b5ef95f1..92e0aaad5 100644 --- a/chapter11/theend.xml +++ b/chapter11/theend.xml @@ -59,6 +59,7 @@ ID=lfs PRETTY_NAME="Linux From Scratch &version;" VERSION_CODENAME="<your name here>" HOME_URL="&lfs-root;lfs/" +RELEASE_TYPE="development" EOF Be sure to customize the fields 'DISTRIB_CODENAME' and From 6913a42bffc9be1495b1b24999fcccde7585123d Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Fri, 20 Dec 2024 15:17:54 -0600 Subject: [PATCH 40/41] Update the systemd man pages to 257. --- packages.ent | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages.ent b/packages.ent index 1d41cb4c2..7d5894a08 100644 --- a/packages.ent +++ b/packages.ent @@ -671,11 +671,11 @@ - - + + - + From bfb0cbae18b850f1c3e8f7a56d689e98e084b20b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 21 Dec 2024 11:56:57 +0800 Subject: [PATCH 41/41] os-release: Automatically update RELEASE_TYPE --- chapter11/theend.xml | 2 +- general.ent | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/chapter11/theend.xml b/chapter11/theend.xml index 92e0aaad5..994cba8c3 100644 --- a/chapter11/theend.xml +++ b/chapter11/theend.xml @@ -59,7 +59,7 @@ ID=lfs PRETTY_NAME="Linux From Scratch &version;" VERSION_CODENAME="<your name here>" HOME_URL="&lfs-root;lfs/" -RELEASE_TYPE="development" +RELEASE_TYPE="&os-release-type;" EOF Be sure to customize the fields 'DISTRIB_CODENAME' and diff --git a/general.ent b/general.ent index d6bf13792..4e1480324 100644 --- a/general.ent +++ b/general.ent @@ -34,6 +34,7 @@ &patches-root;, &donwloads-root;, and &test-results; --> + ]]> + ]]> + ]]>