[lfs] 02/05: Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

This is a multi-part message in MIME format...

------------=_1785571437-3619984-7156
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

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

git pushed a commit to branch xry111/loongarch
in repository lfs.

commit f178ab787044d8303cca0d1803d970f25644cbc0
Merge: 2c35ae3bb 4344f6bde
Author: Xi Ruoyao <[email protected]>
AuthorDate: Thu Jul 9 00:13:00 2026 +0800

    Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

 appendices/dependencies.xml  |   4 +-
 chapter01/changelog.xml      |  96 +++++++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml       |  21 ++++-----
 chapter03/patches.xml        |  21 ++++-----
 chapter05/gcc-pass1.xml      |  13 +++++
 chapter06/bash.xml           |   3 +-
 chapter06/gcc-pass2.xml      |  12 +++++
 chapter08/gcc.xml            |  11 -----
 chapter08/openssl.xml        |   7 ++-
 chapter08/python.xml         |   6 +--
 chapter08/shadow.xml         |  16 +++++++
 chapter08/stripping.xml      |   2 +-
 chapter08/systemd.xml        |  20 +++++---
 chapter08/tar.xml            |   4 ++
 chapter09/systemd-custom.xml |   6 +--
 chapter11/whatnow.xml        |   2 +-
 general.ent                  |   4 +-
 packages.ent                 | 110 +++++++++++++++++++++----------------------
 patches.ent                  |  15 +++---
 19 files changed, 255 insertions(+), 118 deletions(-)

diff --cc general.ent
index 09a9b3e79,af6dc4c16..ef58e64aa
--- a/general.ent
+++ b/general.ent
@@@ -94,10 -92,12 +94,10 @@@
  <!-- Only used for sysv (lfs-bootscripts): -->
  <!ENTITY downloads-root  "&lfs-root;lfs/downloads/&generic-version;/">
  <!ENTITY livecd-root     "&lfs-root;livecd/">
 -<!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
 +<!ENTITY test-results    "&lfs-root;~xry111/lfs/build-logs/&generic-version;/">
- <!ENTITY secadv          "&lfs-root;lfs/advisories/">
+ <!ENTITY secadv          "&lfs-root;/advisories/">
  
 -<!-- 5.10 EOL is Dec 2026
 -	 so for LFS 13.2 we may consider moving to 5.15. -->
 -<!ENTITY min-kernel      "5.10">
 +<!ENTITY min-kernel      "5.19">
  
  <!--
  <!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
diff --cc patches.ent
index 6ba77f435,210ef8387..965d8a5d5
--- a/patches.ent
+++ b/patches.ent
@@@ -64,8 -61,7 +61,12 @@@
  <!ENTITY systemd-upstream-patch-size "4.2 KB">
  -->
  
+ <!ENTITY tar-aclfix-patch "tar-&tar-version;-acl_fix-1.patch">
+ <!ENTITY tar-aclfix-patch-md5 "dbab49e317105539611866dac5dd54f6">
+ <!ENTITY tar-aclfix-patch-size "4.3 KB">
+ 
 +<!-- Put LoongArch patches last to reduce the chance of a conflict during
 +     merge.  -->
 +<!ENTITY gcc-loongarch-fixes-patch "gcc-&gcc-version;-loongarch_fixes-1.patch">
 +<!ENTITY gcc-loongarch-fixes-patch-md5 "ed890265d7cd49d99af55748d915a577">
 +<!ENTITY gcc-loongarch-fixes-patch-size "15 KB">

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

------------=_1785571437-3619984-7156
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

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

------------=_1785571437-3619984-7156--