[lfs] 02/02: Merge branch 'xry111/non-x86-efi' into xry111/arm64

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/arm64
in repository lfs.

commit d0429b62e57edfb318a7f8597570644b72f70732
Merge: e796d5c1a 519356650
Author: Xi Ruoyao <[email protected]>
AuthorDate: Mon Aug 24 19:47:42 2026 +0800

    Merge branch 'xry111/non-x86-efi' into xry111/arm64

 chapter01/changelog.xml                  | 126 ++++++++++++
 chapter01/whatsnew.xml                   |  21 +-
 chapter03/patches.xml                    |   6 +-
 chapter05/glibc.xml                      |   9 +-
 chapter06/coreutils.xml                  |   3 +-
 chapter06/gcc-pass2.xml                  |  16 ++
 chapter06/m4.xml                         |  10 +
 chapter07/zlib.xml                       |   4 +
 chapter08/binutils.xml                   |  19 +-
 chapter08/findutils.xml                  |   7 +-
 chapter08/gcc.xml                        |   9 +-
 chapter08/glibc.xml                      |  22 ++-
 chapter08/gmp.xml                        |   2 +-
 chapter08/pkgconf.xml                    |   4 +
 chapter08/python.xml                     |   2 +-
 chapter08/shadow.xml                     |  38 ++--
 chapter08/stripping.xml                  |   2 +-
 chapter08/util-linux.xml                 |   7 +-
 chapter09/inputrc.xml                    |   4 +
 chapter10/grub.xml                       |   8 +-
 chapter10/kernel/kernel.version          |   2 +-
 chapter10/kernel/systemd.toml            |   8 +-
 chapter10/kernel/systemd.xml             |  10 +-
 chapter10/kernel/sysv.toml               |   3 -
 chapter10/kernel/sysv.xml                |   5 -
 chapter10/kernel/uefi.toml               |   2 +-
 chapter10/kernel/uefi.xml                |  10 +-
 lfs-latest-git.php                       |  12 +-
 packages.ent                             | 325 ++++++++++++++++---------------
 patches.ent                              |  10 +-
 prologue/why.xml                         |   8 +-
 stylesheets/dump-commands.xsl            |  20 +-
 stylesheets/lfs-xsl/xhtml/lfs-titles.xsl |   6 +-
 33 files changed, 462 insertions(+), 278 deletions(-)

diff --cc chapter08/gcc.xml
index 8eb53ce68,9df3bdc52..9463b4938
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@@ -303,15 -284,10 +303,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/aarch64-unknown-linux-gnu/lib64")
- SEARCH_DIR("/usr/local/lib64")
- SEARCH_DIR("/lib64")
- SEARCH_DIR("/usr/lib64")
- SEARCH_DIR("/usr/aarch64-unknown-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>
 -
++SEARCH_DIR("/usr/aarch64-unknown-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>
  
diff --cc chapter10/kernel/systemd.xml
index d9c1be9ab,310f52f34..206cfc920
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@@ -17,13 -17,10 +17,10 @@@
        [ ] <emphasis role='blue'>G</emphasis>roup scheduling for SCHED_RR/FIFO                    [RT_GROUP_SCHED]
    [ ] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;            [EXPERT]
  
 -<emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
 -  [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel                                   [RELOCATABLE]
 -  [*]   <emphasis role='blue'>R</emphasis>andomize the address of the kernel image (KASLR)       [RANDOMIZE_BASE]
 +<emphasis role='blue'>K</emphasis>ernel Features ---&gt;
 +  [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel image                             [RELOCATABLE]
 +  [*] <emphasis role='blue'>R</emphasis>andomize the address of the kernel image                 [RANDOMIZE_BASE]
  
- <emphasis role='blue'>B</emphasis>oot options ---&gt;
-   [*] <emphasis role='blue'>U</emphasis>EFI runtime support                                                 [EFI]
- 
  <emphasis role='blue'>G</emphasis>eneral architecture-dependent options ---&gt;
    [*] <emphasis role='blue'>S</emphasis>tack Protector buffer overflow detection                 [STACKPROTECTOR]
    [*]   <emphasis role='blue'>S</emphasis>trong Stack Protector                           [STACKPROTECTOR_STRONG]
diff --cc chapter10/kernel/sysv.xml
index 292cf8b91,87e77c30d..c0e25cd06
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@@ -14,13 -14,10 +14,10 @@@
      [*] M<emphasis role='blue'>e</emphasis>mory controller                                                [MEMCG]
    [ ] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;            [EXPERT]
  
 -<emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
 -  [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel                                   [RELOCATABLE]
 -  [*]   <emphasis role='blue'>R</emphasis>andomize the address of the kernel image (KASLR)       [RANDOMIZE_BASE]
 +<emphasis role='blue'>K</emphasis>ernel Features ---&gt;
 +  [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel image                             [RELOCATABLE]
 +  [*] <emphasis role='blue'>R</emphasis>andomize the address of the kernel image                 [RANDOMIZE_BASE]
  
- <emphasis role='blue'>B</emphasis>oot options ---&gt;
-   [*] <emphasis role='blue'>U</emphasis>EFI runtime support                                                 [EFI]
- 
  <emphasis role='blue'>G</emphasis>eneral architecture-dependent options ---&gt;
    [*] <emphasis role='blue'>S</emphasis>tack Protector buffer overflow detection                 [STACKPROTECTOR]
    [*]   <emphasis role='blue'>S</emphasis>trong Stack Protector                           [STACKPROTECTOR_STRONG]
diff --cc chapter10/kernel/uefi.toml
index 38e436912,38e436912..d3ce00379
--- a/chapter10/kernel/uefi.toml
+++ b/chapter10/kernel/uefi.toml
@@@ -1,7 -1,7 +1,7 @@@
  # forced by !EXPERT
  BLOCK = { value = '*', forced = true }
  EFI='*'
--EFI_STUB='*'
++EFI_ZBOOT='*'
  PARTITION_ADVANCED='* '
  EFI_PARTITION="*"
  VFAT_FS="*M"
diff --cc chapter10/kernel/uefi.xml
index eaac061c2,eaac061c2..79a89e202
--- a/chapter10/kernel/uefi.xml
+++ b/chapter10/kernel/uefi.xml
@@@ -3,15 -3,15 +3,19 @@@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
  <!-- Automatically generated by kernel-config.py
       DO NOT EDIT! -->
--<screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
--  [*] <emphasis role='blue'>E</emphasis>FI runtime service support                                          [EFI]
--  [*]   <emphasis role='blue'>E</emphasis>FI stub support                                              [EFI_STUB]
++<screen role="nodump"><emphasis role='blue'>B</emphasis>oot options ---&gt;
++  [*] <emphasis role='blue'>U</emphasis>EFI runtime support                                                 [EFI]
  
  -*- <emphasis role='blue'>E</emphasis>nable the block layer ---&gt;                                          [BLOCK]
    <emphasis role='blue'>P</emphasis>artition Types ---&gt;
      [ /*] <emphasis role='blue'>A</emphasis>dvanced partition selection                      [PARTITION_ADVANCED]
      [*]     <emphasis role='blue'>E</emphasis>FI GUID Partition support                           [EFI_PARTITION]
  
++<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
++  <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
++    <emphasis role='blue'>E</emphasis>FI (Extensible Firmware Interface) Support ---&gt;
++      [*] <emphasis role='blue'>E</emphasis>nable the generic EFI decompressor                        [EFI_ZBOOT]
++
  <emphasis role='blue'>F</emphasis>ile systems ---&gt;
    <emphasis role='blue'>D</emphasis>OS/FAT/EXFAT/NT Filesystems ---&gt;
      &lt;*/M&gt; <emphasis role='blue'>V</emphasis>FAT (Windows-95) fs support                                 [VFAT_FS]

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