Changeset d7e0db5 for chapter10

Timestamp:

03/31/2021 10:41:40 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

ee1eb70

Parents:

4ea78e0

git-author:

Thomas Trepl <thomas@…> (08/23/2020 08:15:14 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:40 AM)

Message:

Merge changes from trunk to multilib

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@12034 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter10

Files:

• grub.xml (modified) (1 diff)
• kernel.xml (modified) (1 diff)

chapter10/grub.xml

@@ -41 +41 @@
       <para>
         To boot LFS on host systems that have UEFI enabled, the kernel needs to
-        have been built with the CONFIG_EFI_STUB capabality described in the
+        have been built with the CONFIG_EFI_STUB capability described in the
         previous section.  However, LFS can be booted using GRUB2 without such
         an addition. To do this, the UEFI Mode and Secure Boot capabilities in

chapter10/kernel.xml

@@ -140 +140 @@
     <note arch="ml_32,ml_x32,ml_all">
       <para>
-        Running a multilib system means also that the kernel has to be 
-        configured proper. It is required that the kernel is able to 
+        The kernel on a multilib system needs to be able to
         identify and start binaries compiled for different architectures
-        than the default. Setup the required parameter in the kernel
-        config:
+        than the default.
       </para>
-<screen>Binary Emulations  ---&gt;
+
+      <para arch="ml_32,ml_all">
+        If support for any 32bit ABI was built, make sure that the option
+        "IA32 Emulation" is selected. The option 'IA32 a.out support' is
+        optional.
+      </para>
+
+      <para arch="ml_x32,ml_all">
+        If support for the x32bit ABI was built, make sure that the option
+        "x32 ABI for 64-bit mode" is selected.
+      </para>
+
+<screen arch="ml_32">Binary Emulations  ---&gt;
+    [*] IA32 Emulation
+    &lt;M&gt;   IA32 a.out support
+</screen>
+<screen arch="ml_x32">Binary Emulations  ---&gt;
+    [*] x32 ABI for 64-bit mode
+</screen>
+<screen arch="ml_all">Binary Emulations  ---&gt;
     [*] IA32 Emulation
     &lt;M&gt;   IA32 a.out support
     [*] x32 ABI for 64-bit mode
 </screen>
-      <para>Make sure that the option 
-        'IA32 Emulation' is set if you built support for the 32bit ABI. 
-        If you selected the x32 ABI or built support for both, also select 
-        'x32 ABI for 64-bit mode'. The option 'IA32 a.out support' is
-        optional.
-      </para>
+
     </note>
-
+    
     <variablelist>
       <title>The rationale for the above configuration items:</title>