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

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

------------=_1785123993-1024790-6082
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/arm64
in repository lfs.

commit 15910a9c3361d09a797a316c20760f488fecfdbe
Merge: 9cae8ee51 1c2eb20b2
Author: Xi Ruoyao <[email protected]>
AuthorDate: Mon Jul 27 11:45:22 2026 +0800

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

 Makefile               | 2 +-
 chapter02/mounting.xml | 5 +++++
 chapter05/glibc.xml    | 2 +-
 chapter08/sqlite.xml   | 3 +--
 general.ent            | 2 +-
 lfs-latest-git.php     | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --cc general.ent
index e827413de,360fef6f3..69b02660d
--- a/general.ent
+++ b/general.ent
@@@ -94,8 -92,8 +94,8 @@@
  <!-- 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;/advisories/">
+ <!ENTITY secadv          "&lfs-root;advisories/">
  
  <!-- 5.10 EOL is Dec 2026
  	 so for LFS 13.2 we may consider moving to 5.15. -->

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

------------=_1785123993-1024790-6082
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

------------=_1785123993-1024790-6082--