gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2023-12-07 00:30:16 +01:00
commit d60b2472bf
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chapter10/kernel/highmem.xml
View File

@ -5,4 +5,4 @@
DO NOT EDIT! --> DO NOT EDIT! -->
<screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt; <screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
H<emphasis role='blue'>i</emphasis>gh Memory Support ---&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>

5
chapter10/kernel/kernel-config.py
View File

@ -251,6 +251,7 @@ sep = known_config.get('separate_toplevel_menu')
for i0, val, i1, title, arrow, key, menu, comment in r: for i0, val, i1, title, arrow, key, menu, comment in r:
rem = max_line rem = max_line
is_choice = (val == '(X)')
if val: if val:
val += (max_val_len[menu] - len(val)) * ' ' val += (max_val_len[menu] - len(val)) * ' '
@ -263,7 +264,9 @@ for i0, val, i1, title, arrow, key, menu, comment in r:
if len(title) > rem: if len(title) > rem:
title = title[:rem - 3] + '...' 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)] a = title[:len(title) - len(b)]
b0 = "<emphasis role='blue'>" + escape(b[0]) + "</emphasis>" b0 = "<emphasis role='blue'>" + escape(b[0]) + "</emphasis>"
line += escape(a) + b0 + escape(b[1:]) + escape(arrow) line += escape(a) + b0 + escape(b[1:]) + escape(arrow)