Changeset 57499d5

Timestamp:

08/01/2023 01:17:05 AM (11 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.0, 12.0-rc1, 12.1, 12.1-rc1, multilib, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc

Children:

3d99820

Parents:

70bf551

Message:

kernel: Separate toplevel menus in rendering

Location:

chapter10/kernel

Files:

• kernel-config.py (modified) (2 diffs)
• systemd.xml (modified) (2 diffs)
• sysv.xml (modified) (1 diff)
• x2apic.xml (modified) (1 diff)

chapter10/kernel/kernel-config.py

@@ -244 +244 @@
         raise Exception("%s seems not exist" % i)
 
+sep = known_config.get('separate_toplevel_menu')
+
 for i0, val, i1, title, arrow, key, menu, comment in r:
     rem = max_line
@@ -276 +278 @@
     if comment:
         comment = '\n'.join([' ' * i0 + '# ' + line for line in comment])
-        line = escape(comment) + ':\n' + line
+        buf += escape(comment) + ':'
+
+    if not menu and buf:
+        buf += ['']
 
     buf += [line.rstrip()]

chapter10/kernel/systemd.xml

@@ -15 +15 @@
     [*] 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'>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]
+
 [*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
   N<emphasis role='blue'>e</emphasis>tworking options ---&gt;
     [*] <emphasis role='blue'>T</emphasis>CP/IP networking                                                 [INET]
     &lt;*&gt;   <emphasis role='blue'>T</emphasis>he IPv6 protocol ---&gt;                                          [IPV6]
+
 <emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
   <emphasis role='blue'>G</emphasis>eneric Driver Options ---&gt;
@@ -42 +46 @@
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
       [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]
+
 <emphasis role='blue'>F</emphasis>ile systems ---&gt;
   [*] <emphasis role='blue'>I</emphasis>notify support for userspace                               [INOTIFY_USER]

chapter10/kernel/sysv.xml

@@ -14 +14 @@
     [*] 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'>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]
+
 <emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
   <emphasis role='blue'>G</emphasis>eneric Driver Options ---&gt;

chapter10/kernel/x2apic.xml

@@ -6 +6 @@
 <screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
   [*] <emphasis role='blue'>S</emphasis>upport x2apic                                                [X86_X2APIC]
+
 <emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
   [*] <emphasis role='blue'>P</emphasis>CI support ---&gt;                                                     [PCI]