Changeset 31a9142

Timestamp:

12/05/2023 05:32:48 PM (6 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

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

Children:

7cce808, c4108e5

Parents:

981b9fa6

Message:

kernel-config: Sync fixes from BLFS

Location:

chapter10/kernel

Files:

• Makefile (modified) (1 diff)
• highmem.xml (modified) (1 diff)
• kernel-config.py (modified) (2 diffs)

chapter10/kernel/Makefile

@@ -20 +20 @@
         touch s-kernel-version
 
-%.xml: %.toml kernel-config.py kernel_version.py kernel.version
+%.xml.tmp: %.toml kernel-config.py kernel_version.py kernel.version
         ./kernel-config.py $(KERNEL_TREE) $< > $@
+
+%.xml: %.xml.tmp
+        mv $< $@

chapter10/kernel/highmem.xml

@@ -6 +6 @@
 <screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
   H<emphasis role='blue'>i</emphasis>gh Memory Support ---&gt;
-    (X) <emphasis role='blue'>6</emphasis>4GB                                                        [HIGHMEM64G]</screen>
+    (X) 64<emphasis role='blue'>G</emphasis>B                                                        [HIGHMEM64G]</screen>

chapter10/kernel/kernel-config.py

@@ -186 +186 @@
             elif line.startswith('endif'):
                 if_stack = if_stack[:-1]
+
+    if config_buf:
+        r += [parse_config(config_buf)]
+
     return r
 
@@ -260 +264 @@
         title = title[:rem - 3] + '...'
 
-    b = title.lstrip('YyMmNnHh')
+    b = title.lstrip('YyMmNnHh.' + "".join(map(str, range(10))))
     a = title[:len(title) - len(b)]
     b0 = "<emphasis role='blue'>" + escape(b[0]) + "</emphasis>"