Changeset d60b247

Timestamp:

12/06/2023 11:30:16 PM (6 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

9bfff29

Parents:

c4108e5 (diff), 7cce808 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Location:

chapter10/kernel

Files:

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

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) 64<emphasis role='blue'>G</emphasis>B                                                        [HIGHMEM64G]</screen>
+    (X) <emphasis role='blue'>6</emphasis>4GB                                                        [HIGHMEM64G]</screen>

chapter10/kernel/kernel-config.py

@@ -252 +252 @@
 for i0, val, i1, title, arrow, key, menu, comment in r:
     rem = max_line
+    is_choice = (val == '(X)')
 
     if val:
@@ -264 +265 @@
         title = title[:rem - 3] + '...'
 
-    b = title.lstrip('YyMmNnHh.' + "".join(map(str, range(10))))
+    b = title
+    if not is_choice:
+        b = b.lstrip('YyMmNnHh.' + "".join(map(str, range(10))))
     a = title[:len(title) - len(b)]
     b0 = "<emphasis role='blue'>" + escape(b[0]) + "</emphasis>"