[lfs] 02/02: Merge trunk

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit 955d389a6e02d3e30c1e7c873134a9b62980e05d
Merge: 1373397ba 7ee11a7bc
Author: Thomas Trepl <[email protected]>
AuthorDate: Thu Sep 4 16:17:46 2025 +0200

    Merge trunk

 appendices/dependencies.xml |  58 +++++++++++---
 chapter01/changelog.xml     |  15 ++++
 chapter01/whatsnew.xml      |   1 +
 chapter03/packages.xml      |  48 ++++++++++--
 chapter06/bash.xml          |   6 +-
 chapter08/chapter08.xml     |   1 +
 chapter08/meson.xml         |   4 -
 chapter08/ncurses.xml       |   7 +-
 chapter08/pcre.xml          | 185 ++++++++++++++++++++++++++++++++++++++++++++
 chapter08/perl.xml          |   4 -
 chapter08/xz.xml            |   4 -
 packages.ent                |  17 +++-
 prologue/why.xml            |  12 ++-
 stylesheets/md5sum.xsl      |   9 ++-
 stylesheets/wget-list.xsl   |  10 +--
 15 files changed, 330 insertions(+), 51 deletions(-)

diff --cc packages.ent
index dc447deb2,7432738ba..4d25cec2c
--- a/packages.ent
+++ b/packages.ent
@@@ -431,18 -421,15 +431,19 @@@
  <!ENTITY libxcrypt-fin-du "12 MB">
  <!ENTITY libxcrypt-fin-sbu "0.1 SBU">
  
 +<!--
 +  The linux-base + patch variant will constantly cause
 +  merge conflicts here.
 +-->
  <!ENTITY linux-major-version "6">
- <!ENTITY linux-minor-version "15">
- <!ENTITY linux-patch-version "6">
+ <!ENTITY linux-minor-version "16">
+ <!ENTITY linux-majmin-version "&linux-major-version;.&linux-minor-version;">
+ <!ENTITY linux-patch-version "1">
  <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
  <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 -<!ENTITY linux-size "149,042 KB">
 +<!ENTITY linux-size "147,622 KB">
  <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
 -<!ENTITY linux-md5 "32d45755e4b39d06e9be58f6817445ee">
 +<!ENTITY linux-md5 "019a3cea6458f01331dfa5afdd1ce252">
  <!ENTITY linux-home "https://www.kernel.org/">
  <!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 : 
   minimum is allnoconfig 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page