[lfs] 01/01: Merge branch 'trunk' into multilib
| Newsgroups | gmane.linux.lfs.book |
|---|---|
| Message-ID | <[email protected]> |
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch multilib in repository lfs. commit e48416b6a04d2ea48d0f50dc7a65d44a90d01c1c Merge: 514fa1790 aea637af4 Author: Zeckmathederg <[email protected]> AuthorDate: Wed Oct 15 20:47:19 2025 -0600 Merge branch 'trunk' into multilib chapter01/changelog.xml | 30 +++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 12 ++++++------ chapter08/python.xml | 3 +-- chapter08/systemd.xml | 2 +- chapter08/udev.xml | 4 ++-- packages.ent | 50 ++++++++++++++++++++++++------------------------- 6 files changed, 65 insertions(+), 36 deletions(-) diff --cc packages.ent index 12e1b1b1f,0a806a5dc..508d27c43 --- a/packages.ent +++ b/packages.ent @@@ -431,19 -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 "16"> + <!ENTITY linux-minor-version "17"> <!ENTITY linux-majmin-version "&linux-major-version;.&linux-minor-version;"> - <!ENTITY linux-patch-version "9"> + <!ENTITY linux-patch-version "3"> <!--<!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,102 KB"> + <!ENTITY linux-size "149,748 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> - <!ENTITY linux-md5 "feb0a3d5ecf5a4628aed7d9f8f7ab3f6"> + <!ENTITY linux-md5 "50a1cc4b00a3a0fcdb63a75e63def877"> <!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