From dcf5543233a7cda1ee3443542748153da4626df3 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 14 Mar 2024 09:36:53 -0500 Subject: [PATCH 1/5] Package updates. Update to wheel-0.43.0. Update to setuptools-69.2.0 (Python module). Update to meson-1.4.0. Update to expat-2.6.2 (Security fix). Update to iana-etc-20240305. Update to vim-9.1.0161. Update to xz-5.6.1. Update to shadow-4.15.0. Update to psmisc-23.7. Update to kmod-32. Update to elfutils-0.191. --- chapter01/changelog.xml | 50 +++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 20 ++++++------- chapter08/kmod.xml | 1 + packages.ent | 62 ++++++++++++++++++++--------------------- 4 files changed, 92 insertions(+), 41 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c60e48ee0..7caece337 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,56 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-03-15 + + + [bdubbs] - Update to wheel-0.43.0. Fixes + #5459. + + + [bdubbs] - Update to setuptools-69.2.0 (Python module). Fixes + #5462. + + + [bdubbs] - Update to meson-1.4.0. Fixes + #5460. + + + [bdubbs] - Update to expat-2.6.2 (Security fix). Fixes + #5461. + + + [bdubbs] - Update to iana-etc-20240305. Addresses + #5006. + + + [bdubbs] - Update to vim-9.1.0161. Addresses + #4500. + + + [bdubbs] - Update to xz-5.6.1. Fixes + #5457. + + + [bdubbs] - Update to shadow-4.15.0. Fixes + #5456. + + + [bdubbs] - Update to psmisc-23.7. Fixes + #5454. + + + [bdubbs] - Update to kmod-32. Fixes + #5455. + + + [bdubbs] - Update to elfutils-0.191. Fixes + #5451. + + + + 2024-03-02 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index f45c5a2c7..293478eae 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -140,9 +140,9 @@ - + @@ -152,9 +152,9 @@ - + Libffi-&libffi-version; @@ -182,9 +182,9 @@ - + @@ -212,9 +212,9 @@ - + @@ -260,9 +260,9 @@ Vim-&vim-version; - + diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index 9a16da3f0..4b194ea13 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -92,6 +92,7 @@ for target in depmod insmod modinfo modprobe rmmod; do ln -sfv ../bin/kmod /usr/sbin/$target + rm -fv /usr/bin/$target done ln -sfv kmod /usr/bin/lsmod diff --git a/packages.ent b/packages.ent index 5017a8bf4..815b57ca5 100644 --- a/packages.ent +++ b/packages.ent @@ -148,18 +148,18 @@ - - + + - + - - + + - + @@ -317,10 +317,10 @@ - + - + @@ -365,10 +365,10 @@ - - + + - + @@ -494,10 +494,10 @@ - - + + - + @@ -587,10 +587,10 @@ - - + + - + @@ -631,18 +631,18 @@ - - + + - + - - + + - + @@ -738,21 +738,21 @@ - + - + - + - + - + @@ -765,10 +765,10 @@ - - + + - + From e7231421fde669663d88722bb8fcba2a1e0bb10c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 14 Mar 2024 22:53:21 +0800 Subject: [PATCH 2/5] kmod: Remove an unnecessary command and adjust the description /usr/bin/lsmod is already created by the building system. --- chapter08/kmod.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index 4b194ea13..6f30185d2 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -84,18 +84,19 @@ (not the sanitized kernel headers installed earlier), which are beyond the scope of LFS. - Install the package and create symlinks for + Install the package and recreate some symlinks for compatibility with Module-Init-Tools (the package that previously handled - Linux kernel modules): + Linux kernel modules) in + /usr/sbin instead of + /usr/bin (where the building + system will create these symlinks): make install for target in depmod insmod modinfo modprobe rmmod; do ln -sfv ../bin/kmod /usr/sbin/$target rm -fv /usr/bin/$target -done - -ln -sfv kmod /usr/bin/lsmod +done From 98bdf39b6c4dad570b06ee5697bd1615ac7bac99 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 14 Mar 2024 22:59:27 +0800 Subject: [PATCH 3/5] shadow: Capitalization adjustment --- chapter08/shadow.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml index 8fb11e138..315e3cc5e 100644 --- a/chapter08/shadow.xml +++ b/chapter08/shadow.xml @@ -46,7 +46,7 @@ If you've installed Linux-PAM, you should follow the BLFS shadow page instead of this page to build (or, rebuild or upgrade) - Shadow. + shadow. From 68215a4ed77a35f07aebda70d7ea3a045e772c17 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 14 Mar 2024 23:01:43 +0800 Subject: [PATCH 4/5] kmod: Emphasis that we don't want --- chapter08/kmod.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index 6f30185d2..459a2d5d9 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -89,7 +89,7 @@ Linux kernel modules) in /usr/sbin instead of /usr/bin (where the building - system will create these symlinks): + system will create these symlinks but we don't want them there): make install From e2d3b4b0bc1db527317b617f2919c694dce7e47c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 14 Mar 2024 23:04:38 +0800 Subject: [PATCH 5/5] kmod: Use a more natural expression for symlink location issue --- chapter08/kmod.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index 459a2d5d9..6c875caed 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -86,10 +86,10 @@ Install the package and recreate some symlinks for compatibility with Module-Init-Tools (the package that previously handled - Linux kernel modules) in - /usr/sbin instead of - /usr/bin (where the building - system will create these symlinks but we don't want them there): + Linux kernel modules). The building system will create all these + symlinks in /usr/bin, but we + only want lsmod there and all other symlinks in + /usr/sbin instead: make install