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

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.book
Message-ID <[email protected]>
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 824ef4bdc5890a60a59a5866bded71c8f72bc677
Merge: bceea7013 5ec6ec66b
Author: Xi Ruoyao <[email protected]>
AuthorDate: Fri May 8 23:08:52 2026 +0800

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

 appendices/dependencies.xml      |   8 +--
 chapter01/changelog.xml          | 131 ++++++++++++++++++++++++++++++++++++-
 chapter01/how.xml                |   3 +
 chapter01/whatsnew.xml           |  52 ++++++++-------
 chapter02/creatingfilesystem.xml |   5 +-
 chapter02/creatingpartition.xml  |   4 +-
 chapter02/hostreqs.xml           |  23 ++++++-
 chapter03/packages.xml           |   8 +--
 chapter05/gcc-pass1.xml          |   4 +-
 chapter08/chapter08.xml          |   4 +-
 chapter08/gcc.xml                |   6 +-
 chapter08/glibc.xml              |   3 +-
 chapter08/groff.xml              |   5 +-
 chapter08/inetutils.xml          |  12 ----
 chapter08/libelf.xml             |   9 ++-
 chapter08/openssl.xml            |   7 +-
 chapter08/sed.xml                |   3 +-
 chapter10/fstab.xml              |  42 +++++++++++-
 chapter10/grub.xml               |  17 ++---
 chapter10/kernel.xml             |  38 ++---------
 chapter11/theend.xml             |   4 +-
 general.ent                      |   6 +-
 lfs-latest-git.php               |   4 ++
 packages.ent                     | 137 ++++++++++++++++++++-------------------
 patches.ent                      |  10 +--
 25 files changed, 352 insertions(+), 193 deletions(-)

diff --cc chapter02/creatingpartition.xml
index 1a7973e93,6b3c599b4..23dbb1a74
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@@ -119,9 -142,13 +119,9 @@@
      but can be dropped much lower with some experimentation. The partition
      label should be 'EFI System' if using <command>fdisk</command>.</para>
  
-     <para>For Grub, the EFI System Partion should be located at
+     <para>For Grub, the EFI System Partition should be located at
      <filename class="directory">/boot/efi</filename>.</para>
  
 -    <para>A lot of UEFI systems have a Compatibility Support Module (CSM) or
 -    Legacy Boot option, allowing to boot with BIOS. It could be a good idea to
 -    create a Grub BIOS partition if your system supports CSM in case UEFI
 -    booting does not work as expected.</para>
      </sect3>
  
      <sect3>
@@@ -224,10 -256,20 +224,10 @@@
           <para>The EFI partition must be formatted as VFAT.</para>
         </listitem>
  
 -       <listitem>
 -         <para>The BIOS partition is not formatted.</para>
 -       </listitem>
 -       
         <listitem>
-          <para>The swap partition must be formatted as swap.</para>
+          <para>The swap partition must be initialized.</para>
         </listitem>
         
 -       <listitem>
 -         <para>The /boot partition can be formatted as ext2 since
 -         it is rarely written (and then only by root) and does
 -         not need a journal.</para>
 -       </listitem>
 -       
         <listitem>
           <para>The recommendation for all other partitions is to use ext4 
           formatting.</para>
diff --cc chapter10/grub.xml
index 1760dc508,ee1d08796..7e4be9e29
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@@ -132,9 -221,10 +132,10 @@@ xorriso -as cdrecord -v dev=/dev/cdrw b
  
        <note>
          <para>
-           Some UEFI bootloaders, while rare, skip the hardcoded EFI path.<!-- Such
-           systems most of the time are old, like Lenevo ThinkPads or HP
-           desktops/laptops. -->When the boot entry is missing in the BIOS, you
+           Some UEFI firmware implementations, while rare, skip the standard
 -          EFI path. Such
++          EFI path.<!-- Such
+           systems most of the time are old, like Lenovo ThinkPads or HP
 -          desktops/laptops. When the boot entry is missing in the firmware setup, you
++          desktops/laptops.--> When the boot entry is missing in the firmware setup, you
            will need to install the BLFS package <ulink
            url="&blfs-book;postlfs/efibootmgr.html">efibootmgr</ulink> to create
            a boot entry for UEFI. If it's easier, the package can be installed
@@@ -152,14 -242,15 +153,14 @@@
            Now create a boot entry for the EFI:
          </para>
  <screen role="nodump"><userinput>efibootmgr -c -d /dev/sd<replaceable>&lt;x&gt;</replaceable> \
 -  -p <replaceable>&lt;y&gt;</replaceable> -L "LFS" -l '\EFI\BOOT\BOOT<replaceable>&lt;X64&gt;</replaceable>.EFI'</userinput></screen>
 +  -p <replaceable>&lt;y&gt;</replaceable> -L "LFS" -l '\EFI\BOOT\BOOT&efi-BOOT-suffix;.EFI'</userinput></screen>
          <para>
            The <literal>/dev/sd<replaceable>&lt;x&gt;</replaceable></literal>
-           drive should match the one you are installing LFS onto. The
+           drive should be the device node for the disk where the ESP exists. The
            <replaceable>&lt;y&gt;</replaceable> partition number should match
-           the number which the ESP is mounted. If the ESP is on
+           the number of the ESP. If the ESP is on
            <literal>/dev/sda2</literal>, then the partition number would be
 -          <literal>2</literal>. If you are using 32-bit UEFI, replace
 -          <replaceable>&lt;X64&gt;</replaceable> with <literal>IA32</literal>.
 +          <literal>2</literal>.
          </para>
  
          <para>

-- 
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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.