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

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

------------=_1785571441-3619984-7164
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 1d9e6ecfa5791c73fc88416863578aba65cd9346
Merge: 33d80546f e981d9b10
Author: Xi Ruoyao <[email protected]>
AuthorDate: Sat Aug 1 16:03:40 2026 +0800

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

 chapter01/changelog.xml | 50 +++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  |  9 +++---
 chapter03/patches.xml   |  3 +-
 chapter05/glibc.xml     |  4 +--
 chapter06/gcc-pass2.xml | 16 ++++++++++
 chapter06/m4.xml        | 10 +++++++
 chapter08/binutils.xml  | 19 +++++++++++-
 chapter08/gcc.xml       | 23 ++-------------
 chapter08/glibc.xml     |  6 ++--
 chapter08/pkgconf.xml   |  4 +++
 chapter08/shadow.xml    |  4 +++
 chapter09/inputrc.xml   |  4 +++
 chapter10/grub.xml      |  9 ++----
 lfs-latest-git.php      |  4 +++
 packages.ent            | 78 ++++++++++++++++++++++++-------------------------
 patches.ent             |  2 ++
 16 files changed, 168 insertions(+), 77 deletions(-)

diff --cc chapter08/gcc.xml
index 5c07285a4,3c4f38193..b9158761f
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@@ -309,27 -315,22 +309,10 @@@ readelf -l a.out | grep ': /lib'</useri
    <para>References to paths that have components with '-linux-gnu' should
    be ignored, but otherwise the output of the last command should be:</para>
  
 -<screen><computeroutput>SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64")
 +<screen><computeroutput>SEARCH_DIR("/usr/loongarch64-unknown-linux-gnu/lib64")
- SEARCH_DIR("/usr/local/lib64")
- SEARCH_DIR("/lib64")
- SEARCH_DIR("/usr/lib64")
- SEARCH_DIR("/usr/loongarch64-unknown-linux-gnu/lib")
- SEARCH_DIR("/usr/local/lib")
- SEARCH_DIR("/lib")
- SEARCH_DIR("/usr/lib");</computeroutput></screen>
- <!--
-    <para>A 32-bit system may use a few other directories. For example, here
-    is the output from an i686 machine:</para>
- 
- <screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
- SEARCH_DIR("/usr/local/lib32")
- SEARCH_DIR("/lib32")
- SEARCH_DIR("/usr/lib32")
- SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
- SEARCH_DIR("/usr/local/lib")
- SEARCH_DIR("/lib")
- SEARCH_DIR("/usr/lib");</computeroutput></screen>
- -->
+ SEARCH_DIR("/usr/lib");
 -SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib")</computeroutput></screen>
 -
 -   <para>A 32-bit system may use a few other directories. For example, here
 -   is the output from an i686 machine:</para>
 -
 -<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
 -SEARCH_DIR("/usr/local/lib32")
 -SEARCH_DIR("/lib32")
 -SEARCH_DIR("/usr/lib32")
 -SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
 -SEARCH_DIR("/usr/local/lib")
 -SEARCH_DIR("/lib")
 -SEARCH_DIR("/usr/lib");</computeroutput></screen>
++SEARCH_DIR("/usr/loongarch64-unknown-linux-gnu/lib")</computeroutput></screen>
+ 
    <para>Next make sure that we're using the correct libc:</para>
  
  <screen><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
diff --cc chapter10/grub.xml
index b47235304,6ec526cf8..e5d8c985f
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@@ -203,20 -292,8 +202,18 @@@ set gfxpayload=1024x768x3
  
  menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
          linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
 +}
 +
 +menuentry "Debian" {
 +        insmod fat
 +        insmod chain
 +        chainloader (hd0,1)/EFI/DEBIAN/GRUB&efi-BOOT-suffix;.EFI
 +}
 +
 +menuentry "Firmware Setup" {
 +        fwsetup
  }</literal>
  EOF</userinput></screen>
- <!-- GOP is probably not needed anyhow, since we're not using terminal_output
-      gfxterm. -->
  
      <para>
        The <command>insmod</command> commands load the

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

------------=_1785571441-3619984-7164
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

------------=_1785571441-3619984-7164--