[lfs] 01/01: Merge remote-tracking branch 'origin/trunk' into xry111/non-x86-efi

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

------------=_1785771827-1024790-7686
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/non-x86-efi
in repository lfs.

commit fe486a185097beaaf0a429d179b69b895c33b76f
Merge: 58764797c b9962747d
Author: Xi Ruoyao <[email protected]>
AuthorDate: Mon Aug 3 23:43:28 2026 +0800

    Merge remote-tracking branch 'origin/trunk' into xry111/non-x86-efi

 INSTALL                                     |   4 +-
 Makefile                                    |   2 +-
 appendices/dependencies.xml                 |  63 ++++++--
 chapter01/changelog.xml                     | 240 +++++++++++++++++++++++++++-
 chapter01/whatsnew.xml                      |  47 +++---
 chapter02/hostreqs.xml                      |  13 +-
 chapter02/mounting.xml                      |   5 +
 chapter03/packages.xml                      |  13 +-
 chapter03/patches.xml                       |  30 ++--
 chapter05/gcc-pass1.xml                     |  13 ++
 chapter05/glibc.xml                         |   6 +-
 chapter05/libstdc++.xml                     |  18 +++
 chapter06/bash.xml                          |   3 +-
 chapter06/gcc-pass2.xml                     |  82 +++++++---
 chapter06/m4.xml                            |  10 ++
 chapter07/chapter07.xml                     |   2 +
 chapter06/m4.xml => chapter07/mpdecimal.xml |  39 +++--
 chapter06/m4.xml => chapter07/zlib.xml      |  36 ++---
 chapter08/acl.xml                           |   2 +-
 chapter08/binutils.xml                      |  19 ++-
 chapter08/chapter08.xml                     |   5 +-
 chapter08/gcc.xml                           |  42 ++---
 chapter08/glibc.xml                         |  17 +-
 chapter08/gmp.xml                           |   4 +-
 chapter08/mpdecimal.xml                     | 109 +++++++++++++
 chapter08/openssl.xml                       |   7 +-
 chapter08/pkgconf.xml                       |  22 ++-
 chapter08/python.xml                        |   6 +-
 chapter08/shadow.xml                        |  20 +++
 chapter08/sqlite.xml                        |   5 +-
 chapter08/stripping.xml                     |   2 +-
 chapter08/systemd.xml                       |  24 +--
 chapter08/tar.xml                           |   4 +
 chapter09/inputrc.xml                       |   4 +
 chapter09/systemd-custom.xml                |   6 +-
 chapter10/grub.xml                          |   8 +-
 chapter11/whatnow.xml                       |   2 +-
 general.ent                                 |   4 +-
 lfs-latest-git.php                          |  10 +-
 packages.ent                                | 199 ++++++++++++-----------
 patches.ent                                 |  19 ++-
 prologue/why.xml                            |   7 +
 stylesheets/md5sum.xsl                      |   8 +-
 stylesheets/wget-list.xsl                   |   8 +-
 44 files changed, 871 insertions(+), 318 deletions(-)

diff --cc chapter10/grub.xml
index 7e4be9e29,6ec526cf8..346dfddd7
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@@ -198,25 -288,12 +198,21 @@@ insmod part_gp
  insmod ext2
  
  set root=(hd0,2)
 -set gfxpayload=1024x768x32
  
- insmod efi_gop
- 
  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.

------------=_1785771827-1024790-7686
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

------------=_1785771827-1024790-7686--