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

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

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

commit a0af76c2944d0aebd6f971db2d1d538b76c57ffd
Merge: 3dbd6c357 dfa48e5eb
Author: Xi Ruoyao <[email protected]>
AuthorDate: Tue May 26 23:06:42 2026 +0800

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

 INSTALL                 |  4 ++--
 chapter01/changelog.xml | 20 ++++++++++++++++++++
 chapter02/hostreqs.xml  | 13 ++++++++++---
 chapter03/patches.xml   |  2 +-
 packages.ent            |  6 +++---
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --cc chapter02/hostreqs.xml
index b8565fec9,07c351dda..6917f1fe0
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@@ -309,9 -261,13 +312,13 @@@ ver_kernel(
  }
  
  # Coreutils first because --version-sort needs Coreutils >= 7.0
- ver_check Coreutils      sort     8.1 || bail "Coreutils too old, stop"
+ if sort --version |&amp; grep -q uutils; then
+     ver_check Coreutils  sort     0.8 || bail "Uutils Coreutils too old, stop"
+ else
+     ver_check Coreutils  sort     8.1 || bail "GNU Coreutils too old, stop"
+ fi
  ver_check Bash           bash     3.2
 -ver_check Binutils       ld       2.13.1
 +ver_check Binutils       ld       2.38
  ver_check Bison          bison    2.7
  ver_check Diffutils      diff     2.8.1
  ver_check Findutils      find     4.2.31

-- 
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