From 32a9d4b35bc4486cfc970301a24af64f2476cdc4 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 3 Apr 2025 11:33:20 +0800 Subject: [PATCH 1/4] Remove check (#5650) --- appendices/dependencies.xml | 43 -------------- chapter01/whatsnew.xml | 9 +-- chapter03/packages.xml | 9 --- chapter08/chapter08.xml | 1 - chapter08/check.xml | 109 ------------------------------------ lfs-latest-git.php | 1 - packages.ent | 8 --- 7 files changed, 3 insertions(+), 177 deletions(-) delete mode 100644 chapter08/check.xml diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 84dc75acd..4ba8d13c4 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -399,49 +399,6 @@ - - Check - - - &dependencies; - - Gawk, GCC, Grep, Make, Sed, and Texinfo - - - - - &runtime; - - Bash and Gawk - - - - - &testsuites; - - None - - - - - &before; - - None - - - - - &external; - - - libsubunit - and - - patchutils - - - - Coreutils diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index b8ff551d3..8e1bec99c 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -305,12 +305,9 @@ Removed: - - + + Check-0.15.2 + diff --git a/chapter03/packages.xml b/chapter03/packages.xml index d58002ad2..2b3dbd9e7 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -110,15 +110,6 @@ - - Check (&check-version;) - &check-size;: - - Home page: - Download: - MD5 sum: &check-md5; - - - Coreutils (&coreutils-version;) - &coreutils-size;: diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml index 85589c3be..cb13689e7 100644 --- a/chapter08/chapter08.xml +++ b/chapter08/chapter08.xml @@ -70,7 +70,6 @@ - diff --git a/chapter08/check.xml b/chapter08/check.xml deleted file mode 100644 index 1000aaa68..000000000 --- a/chapter08/check.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - %general-entities; -]> - - - - - - check - &check-version; -
&check-url;
- - - Check-&check-version; - - - Check - - - - - - <para>Check is a unit testing framework for C.</para> - - <segmentedlist> - <segtitle>&buildtime;</segtitle> - <segtitle>&diskspace;</segtitle> - - <seglistitem> - <seg>&check-fin-sbu;</seg> - <seg>&check-fin-du;</seg> - </seglistitem> - </segmentedlist> - - </sect2> - - <sect2 role="installation"> - <title>Installation of Check - - Prepare Check for compilation: - -./configure --prefix=/usr --disable-static - - Build the package: - -make - - Compilation is now complete. To run the Check test suite, issue the - following command: - -make check - - - Install the package: - - make docdir=/usr/share/doc/check-&check-version; install - - - - - Contents of Check - - - Installed program - Installed library - - - checkmk - libcheck.so - - - - - Short Descriptions - - - - - checkmk - - Awk script for generating C unit tests for use with the Check - unit testing framework - - checkmk - - - - - - libcheck.so - - Contains functions that allow Check to be called from a test - program - - libcheck - - - - - - - - - diff --git a/lfs-latest-git.php b/lfs-latest-git.php index f189871eb..d8da03ef5 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -118,7 +118,6 @@ function get_packages( $package, $dirpath ) //if ( $package != "wheel" ) return 0; // debug if ( $package == "bc" ) $dirpath = github("gavinhoward/bc"); -if ( $package == "check" ) $dirpath = github("libcheck/check"); if ( $package == "e2fsprogs" ) $dirpath = "https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs"; if ( $package == "expat" ) $dirpath = "https://sourceforge.net/projects/expat/files"; if ( $package == "elfutils" ) $dirpath = "https://sourceware.org/ftp/elfutils"; diff --git a/packages.ent b/packages.ent index 5dbbfed1a..c5d645e4c 100644 --- a/packages.ent +++ b/packages.ent @@ -96,14 +96,6 @@ - - - - - - - - From f3e6b8964f8b83146b57083a7d70a1e274f9f10d Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 4 Apr 2025 15:44:07 +0800 Subject: [PATCH 2/4] make: Remove --without-guile from chapter 6 This seems just a remnant from the pre-cross-chap5 era. Now with the cross- toolchain the build system cannot find guile headers and libraries, thus guile should be disabled by default. I've also tried this on a host distro with guile installed. --- chapter06/make.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/chapter06/make.xml b/chapter06/make.xml index eaf0db48f..3d3ca9b38 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -45,23 +45,9 @@ Prepare Make for compilation: ./configure --prefix=/usr \ - --without-guile \ --host=$LFS_TGT \ --build=$(build-aux/config.guess) - - The meaning of the new configure option: - - - --without-guile - - Although we are cross-compiling, configure tries to use - guile from the build host if it finds it. This makes compilation - fail, so this switch prevents using it. - - - - Compile the package: make From d470cdb21ca21afb19ec38fa587ef9da90daa99b Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 14 Apr 2025 13:10:11 -0500 Subject: [PATCH 3/4] Package updates. Update to libcap-2.76. Update to perl-5.40.2 (Security update). Add packaging-24.2 (Python module). Needed for wheel. Update to xz-5.8.1. Update to wheel-0.46.1 (Python Module). Update to sysklogd-2.7.2. Update to Python3-3.13.3. Update to openssl-3.5.0. Update to meson-1.7.2. Update to linux-6.14.2. Update to libffi-3.4.8. Update to iproute2-6.14.0. Update to gzip-1.14. Update to grep-3.12. Update to gperf-3.2.1. Update to gawk-5.3.2. Update to diffutils-3.12. Update to coreutils-9.7. --- appendices/dependencies.xml | 42 ++++++++++++- chapter01/changelog.xml | 78 ++++++++++++++++++++++++ chapter01/whatsnew.xml | 61 +++++++++---------- chapter03/packages.xml | 9 +++ chapter06/diffutils.xml | 6 ++ chapter08/chapter08.xml | 1 + chapter08/packaging.xml | 76 +++++++++++++++++++++++ packages.ent | 116 +++++++++++++++++++----------------- patches.ent | 4 +- 9 files changed, 304 insertions(+), 89 deletions(-) create mode 100644 chapter08/packaging.xml diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 4ba8d13c4..a8675a805 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -2416,6 +2416,46 @@ + + Packaging + + + &dependencies; + + Python + + + + + &runtime; + + Python + + + + + &testsuites; + + No test suite available + + + + + &before; + + Wheel + + + + + &external; + + + pytest + + + + Patch @@ -3269,7 +3309,7 @@ &dependencies; - Python and Flit-core + Python, Flit-core, and packaging diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 91d4de3e3..1ac0d51b7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,84 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2025-04-15 + + + [bdubbs] - Update to libcap-2.76. Fixes + #5704. + + + [bdubbs] - Update to perl-5.40.2 (Security update). Fixes + #5703. + + + [bdubbs] - Add packaging-24.2 (Python module). Needed for wheel. + + + + [bdubbs] - Update to xz-5.8.1. Fixes + #5694. + + + [bdubbs] - Update to wheel-0.46.1 (Python Module). Fixes + #5693. + + + [bdubbs] - Update to sysklogd-2.7.2. Fixes + #5690. + + + [bdubbs] - Update to Python3-3.13.3. Fixes + #5697. + + + [bdubbs] - Update to openssl-3.5.0. Fixes + #5701. + + + [bdubbs] - Update to meson-1.7.2. Fixes + #5691. + + + [bdubbs] - Update to linux-6.14.2. Fixes + #5680. + + + [bdubbs] - Update to libffi-3.4.8. Fixes + #5700. + + + [bdubbs] - Update to iproute2-6.14.0. Fixes + #5682. + + + [bdubbs] - Update to gzip-1.14. Fixes + #5699. + + + [bdubbs] - Update to grep-3.12. Fixes + #5702. + + + [bdubbs] - Update to gperf-3.2.1. Fixes + #5695. + + + [bdubbs] - Update to gawk-5.3.2. Fixes + #5692. + + + [bdubbs] - Update to diffutils-3.12. Fixes + #5696. + + + [bdubbs] - Update to coreutils-9.7. Fixes + #5698. + + + + 2025-04-01 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 8e1bec99c..4ab0abff3 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -53,21 +53,18 @@ - - + D-Bus-&dbus-version; - + @@ -89,9 +86,9 @@ Flit-Core-&flit-core-version; - + @@ -107,21 +104,21 @@ - - + - + Iana-Etc-&iana-etc-version; @@ -131,9 +128,9 @@ - + Jinja2-&jinja2-version; @@ -155,9 +152,9 @@ - + @@ -188,9 +185,9 @@ - + @@ -203,15 +200,15 @@ - + Patch-&patch-version; - + Pkgconf-&pkgconf-version; @@ -221,9 +218,9 @@ - + @@ -266,9 +263,9 @@ Vim-&vim-version; - + @@ -295,11 +292,11 @@ Added: - + diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 2b3dbd9e7..6cdb5e224 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -588,6 +588,15 @@ + + Packaging (&packaging-version;) - &packaging-size;: + + Home page: + Download: + MD5 sum: &packaging-md5; + + + Patch (&patch-version;) - &patch-size;: diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index 92951604d..c56b01c5a 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -43,6 +43,12 @@ Installation of Diffutils + First, fix a problem in the current version of diffutils: + + sed -e '46252,+3 s/^/#/' \ + -e '46596,+3 s/^/#/' \ + -i configure + Prepare Diffutils for compilation: ./configure --prefix=/usr \ diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml index cb13689e7..bd8571903 100644 --- a/chapter08/chapter08.xml +++ b/chapter08/chapter08.xml @@ -64,6 +64,7 @@ + diff --git a/chapter08/packaging.xml b/chapter08/packaging.xml new file mode 100644 index 000000000..b3e9e439d --- /dev/null +++ b/chapter08/packaging.xml @@ -0,0 +1,76 @@ + + + %general-entities; +]> + + + + + + packaging + &packaging-version; +
&packaging-url;
+ + + Packaging-&packaging-version; + + + packaging + + + + + + <para> + The packaging module is a Python library that provides utilities that + implement the interoperability specifications which have clearly one + correct behaviour (PEP440) or benefit greatly from having a single shared + implementation (PEP425). This includes utilities for version handling, + specifiers, markers, tags, and requirements. + </para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + <seglistitem> + <seg>&packaging-fin-sbu;</seg> + <seg>&packaging-fin-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of packaging + + Compile packaging with the following command: + +pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD + + Install packaging with the following command: + +pip3 install --no-index --find-links dist packaging + + + + + Contents of Packaging + + + Installed directories + + + packaging + + /usr/lib/python&python-minor;/site-packages/packaging and + /usr/lib/python&python-minor;/site-packages/packaging-&packaging-version;.dist-info + + + + + + + + diff --git a/packages.ent b/packages.ent index c5d645e4c..38982675a 100644 --- a/packages.ent +++ b/packages.ent @@ -96,10 +96,10 @@ - - + + - + @@ -122,10 +122,10 @@ - - + + - + @@ -200,10 +200,10 @@ - - + + - + @@ -265,18 +265,18 @@ - - + + - + - - + + - + @@ -299,10 +299,10 @@ - - + + - + @@ -333,10 +333,10 @@ - - + + - + @@ -381,18 +381,18 @@ - - + + - + - - + + - + @@ -422,13 +422,13 @@ - - + + - + - + - + - + - + - - + + @@ -645,10 +653,10 @@ - - + + - + @@ -758,10 +766,10 @@ - - + + - + @@ -774,10 +782,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index c90d38120..c7b2ab19b 100644 --- a/patches.ent +++ b/patches.ent @@ -17,8 +17,8 @@ - - + + From 9103be90053dff74a1bd88571a54093db9f3a65a Mon Sep 17 00:00:00 2001 From: Zeckmathederg Date: Mon, 14 Apr 2025 18:02:27 -0600 Subject: [PATCH 4/4] chapter06/Diffutils: Elaborate what the sed does. --- chapter06/diffutils.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index c56b01c5a..8738e32b0 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -43,7 +43,10 @@ Installation of Diffutils - First, fix a problem in the current version of diffutils: + When Diffutils is being configured, it checks to see if it is + being cross compiled. If it is, configuration fails. Since we are + cross compiling, comment out the specific lines that perform that + test now: sed -e '46252,+3 s/^/#/' \ -e '46596,+3 s/^/#/' \