gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-09 23:49:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/trunk' into xry111/arm64

Browse Source
This commit is contained in:
Xi Ruoyao 2023-12-06 17:29:45 +08:00
commit 00de2694ce
No known key found for this signature in database
GPG Key ID: ACAAD20E19E710E3
9 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appendices/dependencies.xml
View File

@ -3192,6 +3192,7 @@
<segtitle>&external;</segtitle>
<seglistitem>
<seg>
<ulink url="&blfs-book;general/asciidoctor.html">Asciidoctor</ulink>,
<ulink
url="https://people.redhat.com/sgrubb/libcap-ng/">Libcap-NG</ulink>,
<ulink url="&github;/openSUSE/libeconf">libeconf</ulink>,
@ -3200,7 +3201,8 @@
<ulink
url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>,
<ulink
url="&blfs-book;postlfs/smartmontools.html">smartmontools</ulink>, and
url="&blfs-book;postlfs/smartmontools.html">smartmontools</ulink>,
<ulink url="https://po4a.org/index.php.en">po4a</ulink>, and
<ulink url="&blfs-book;general/slang.html">slang</ulink>
</seg>
</seglistitem>

20
chapter10/kernel.xml
View File

@ -265,16 +265,18 @@
</varlistentry>
<varlistentry>
<term><parameter>Framebuffer Console support</parameter></term>
<term>
<parameter>
Enable legacy fbdev support for your modesetting driver
</parameter> and
<parameter>Framebuffer Console support</parameter>
</term>
<listitem>
<para>This is needed to display the Linux console on a frame
buffer device. To allow the kernel to print debug messages at an
early boot stage, it shouldn't be built as a kernel module
unless an initramfs will be used. And, if
<option>CONFIG_DRM</option> (Direct Rendering Manager) is enabled,
it's likely <option>CONFIG_DRM_FBDEV_EMULATION</option> (Enable
legacy fbdev support for your modesetting driver) should be
enabled as well.</para>
<para>These are needed to display the Linux console on a
GPU driven by a DRI (Direct Rendering Infrastructure) driver.
If <option>CONFIG_DRM</option> (Direct Rendering Manager) is
enabled, you should enable these two options as well or you'll see
a blank screen once the DRI driver is loaded.</para>
</listitem>
</varlistentry>

5
chapter10/kernel/Makefile
View File

@ -19,5 +19,8 @@ s-kernel-version:
fi
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 $< $@

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

@ -185,6 +185,10 @@ def load_kconfig(file):
if_stack += [top]
elif line.startswith('endif'):
if_stack = if_stack[:-1]
if config_buf:
r += [parse_config(config_buf)]
return r
known_config = {}
@ -247,6 +251,7 @@ sep = known_config.get('separate_toplevel_menu')
for i0, val, i1, title, arrow, key, menu, comment in r:
rem = max_line
is_choice = (val == '(X)')
if val:
val += (max_val_len[menu] - len(val)) * ' '
@ -259,7 +264,9 @@ for i0, val, i1, title, arrow, key, menu, comment in r:
if len(title) > rem:
title = title[:rem - 3] + '...'
b = title.lstrip('YyMmNnHh')
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>"
line += escape(a) + b0 + escape(b[1:]) + escape(arrow)

2
chapter10/kernel/kernel.version
View File

@ -1 +1 @@
6.4.12
6.6.3

12
chapter10/kernel/systemd.toml
View File

@ -13,9 +13,7 @@ STACKPROTECTOR_STRONG='*'
UEVENT_HELPER=' '
DEVTMPFS='*'
DEVTMPFS_MOUNT='*'
FB='*'
FRAMEBUFFER_CONSOLE='*'
DRM=' *M'
AUDIT=' '
NET='*'
INET='*'
@ -28,3 +26,11 @@ TMPFS='*'
TMPFS_POSIX_ACL='*'
revision='systemd'
[DRM_FBDEV_EMULATION]
value = ' *'
comment = 'If [DRM] is selected as * or M, this must be selected'
[FRAMEBUFFER_CONSOLE]
value = ' *'
comment = 'If [DRM] is selected as * or M, this must be selected'

10
chapter10/kernel/systemd.xml
View File

@ -41,10 +41,14 @@
<emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
[*] <emphasis role='blue'>E</emphasis>xport DMI identification via sysfs to userspace [DMIID]
<emphasis role='blue'>G</emphasis>raphics support ---&gt;
<emphasis role='blue'>F</emphasis>rame buffer Devices ---&gt;
&lt;*&gt; <emphasis role='blue'>S</emphasis>upport for frame buffer devices ---&gt; [FB]
&lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
... [DRM]
# If [DRM] is selected as * or M, this must be selected:
[ /*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
... [DRM_FBDEV_EMULATION]
<emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
[*] <emphasis role='blue'>F</emphasis>ramebuffer Console support [FRAMEBUFFER_CONSOLE]
# If [DRM] is selected as * or M, this must be selected:
[ /*] <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]

11
chapter10/kernel/sysv.toml
View File

@ -12,7 +12,14 @@ STACKPROTECTOR_STRONG='*'
UEVENT_HELPER=' '
DEVTMPFS='*'
DEVTMPFS_MOUNT='*'
FB='*'
FRAMEBUFFER_CONSOLE='*'
DRM=' *M'
revision='sysv'
[DRM_FBDEV_EMULATION]
value = ' *'
comment = 'If [DRM] is selected as * or M, this must be selected'
[FRAMEBUFFER_CONSOLE]
value = ' *'
comment = 'If [DRM] is selected as * or M, this must be selected'

10
chapter10/kernel/sysv.xml
View File

@ -29,7 +29,11 @@
[*] <emphasis role='blue'>A</emphasis>utomount devtmpfs at /dev, after the kernel mounted the rootfs
... [DEVTMPFS_MOUNT]
<emphasis role='blue'>G</emphasis>raphics support ---&gt;
<emphasis role='blue'>F</emphasis>rame buffer Devices ---&gt;
&lt;*&gt; <emphasis role='blue'>S</emphasis>upport for frame buffer devices ---&gt; [FB]
&lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
... [DRM]
# If [DRM] is selected as * or M, this must be selected:
[ /*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
... [DRM_FBDEV_EMULATION]
<emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
[*] <emphasis role='blue'>F</emphasis>ramebuffer Console support [FRAMEBUFFER_CONSOLE]</screen>
# If [DRM] is selected as * or M, this must be selected:
[ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support [FRAMEBUFFER_CONSOLE]</screen>