Changeset 9e76c64 for chapter10


Ignore:
Timestamp:
02/08/2024 04:32:26 AM (5 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/clfs-ng
Children:
c7c614de
Parents:
e49e2ea (diff), 4816dc6 (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:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Location:
chapter10
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • chapter10/chapter10.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
  • chapter10/fstab.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     
    5353  <para>Replace <replaceable>sda</replaceable> to the name of the device
    5454  node for your disk where LFS is being built.  For details on the six
    55   fields in this file, see <command>man 5 fstab</command>.</para>
     55  fields in this file, see <ulink role='man' url='&man;fstab.5'>fstab(5)</ulink>.</para>
    5656
    5757  <para>Filesystems with MS-DOS or Windows origin (i.e. vfat, ntfs, smbfs,
  • chapter10/grub.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     
    106106    </note>
    107107
    108 <!-- This does not seem to be true any more
    109     <note><para><application>grub-install</application> is a script and calls another
    110     program, grub-probe, that may fail with a message "cannot stat `/dev/root'".
    111     If so, create a temporary symbolic link from your root partition to /dev/root:</para>
    112 
    113 <screen role="nodump"><userinput>ln -sv /dev/sda2 /dev/root</userinput></screen>
    114 
    115     <para>The symbolic link will only be present until the system is rebooted.
    116     The link is only needed for the installation procedure.
    117     </para></note>
    118 -->
    119108  </sect2>
    120109
  • chapter10/introduction.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
  • chapter10/kernel.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     
    274274
    275275      <varlistentry>
    276         <term><parameter>Framebuffer Console support</parameter></term>
    277         <listitem>
    278           <para>This is needed to display the Linux console on a frame
    279           buffer device.  To allow the kernel to print debug messages at an
    280           early boot stage, it shouldn't be built as a kernel module
    281           unless an initramfs will be used. And, if
    282           <option>CONFIG_DRM</option> (Direct Rendering Manager) is enabled,
    283           it's likely <option>CONFIG_DRM_FBDEV_EMULATION</option> (Enable
    284           legacy fbdev support for your modesetting driver) should be
    285           enabled as well.</para>
     276        <term>
     277          <parameter>
     278            Enable legacy fbdev support for your modesetting driver
     279          </parameter> and
     280          <parameter>Framebuffer Console support</parameter>
     281        </term>
     282        <listitem>
     283          <para>These are needed to display the Linux console on a
     284          GPU driven by a DRI (Direct Rendering Infrastructure) driver.
     285          If <option>CONFIG_DRM</option> (Direct Rendering Manager) is
     286          enabled, you should enable these two options as well or you'll see
     287          a blank screen once the DRI driver is loaded.</para>
    286288        </listitem>
    287289      </varlistentry>
     
    323325    documentation in the <filename
    324326    class="directory">linux-&linux-version;/Documentation</filename> directory.
    325     Also, <filename>modprobe.d(5)</filename> may be of interest.</para>
     327    Also, <ulink role='man' url='&man;modprobe.d.5'>modprobe.d(5)</ulink>
     328    may be of interest.</para>
    326329
    327330    <para>Unless module support has been disabled in the kernel configuration,
  • chapter10/kernel/Makefile

    re49e2ea r9e76c64  
    2020        touch s-kernel-version
    2121
    22 %.xml: %.toml kernel-config.py kernel_version.py kernel.version
     22%.xml.tmp: %.toml kernel-config.py kernel_version.py kernel.version
    2323        ./kernel-config.py $(KERNEL_TREE) $< > $@
     24
     25%.xml: %.xml.tmp
     26        mv $< $@
  • chapter10/kernel/highmem.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
  • chapter10/kernel/kernel-config.py

    re49e2ea r9e76c64  
    186186            elif line.startswith('endif'):
    187187                if_stack = if_stack[:-1]
     188
     189    if config_buf:
     190        r += [parse_config(config_buf)]
     191
    188192    return r
    189193
     
    248252for i0, val, i1, title, arrow, key, menu, comment in r:
    249253    rem = max_line
     254    is_choice = (val == '(X)')
    250255
    251256    if val:
     
    260265        title = title[:rem - 3] + '...'
    261266
    262     b = title.lstrip('YyMmNnHh')
     267    b = title
     268    if not is_choice:
     269        b = b.lstrip('YyMmNnHh.' + "".join(map(str, range(10))))
    263270    a = title[:len(title) - len(b)]
    264271    b0 = "<emphasis role='blue'>" + escape(b[0]) + "</emphasis>"
     
    287294from jinja2 import Template
    288295
    289 t = Template('''<?xml version="1.0" encoding="ISO-8859-1"?>
     296t = Template('''<?xml version="1.0" encoding="UTF-8"?>
    290297<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    291298  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
  • chapter10/kernel/kernel.version

    re49e2ea r9e76c64  
    1 6.4.8
     16.7.1
  • chapter10/kernel/nvme.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
  • chapter10/kernel/systemd.toml

    re49e2ea r9e76c64  
    1414DEVTMPFS='*'
    1515DEVTMPFS_MOUNT='*'
    16 FB='*'
    17 FRAMEBUFFER_CONSOLE='*'
    18 
     16DRM=' *M'
    1917AUDIT=' '
    2018NET='*'
     
    2927
    3028revision='systemd'
     29
     30[DRM_FBDEV_EMULATION]
     31value = ' *'
     32comment = 'If [DRM] is selected as * or M, this must be selected'
     33
     34[FRAMEBUFFER_CONSOLE]
     35value = ' *'
     36comment = 'If [DRM] is selected as * or M, this must be selected'
  • chapter10/kernel/systemd.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
     
    4242    [*] <emphasis role='blue'>E</emphasis>xport DMI identification via sysfs to userspace                 [DMIID]
    4343  <emphasis role='blue'>G</emphasis>raphics support ---&gt;
    44     <emphasis role='blue'>F</emphasis>rame buffer Devices ---&gt;
    45       &lt;*&gt; <emphasis role='blue'>S</emphasis>upport for frame buffer devices ---&gt;                             [FB]
     44    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
     45                                                                      ...  [DRM]
     46    # If [DRM] is selected as * or M, this must be selected:
     47    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
     48                                                      ...  [DRM_FBDEV_EMULATION]
    4649    <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
    47       [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]
     50      # If [DRM] is selected as * or M, this must be selected:
     51      [ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                    [FRAMEBUFFER_CONSOLE]
    4852
    4953<emphasis role='blue'>F</emphasis>ile systems ---&gt;
  • chapter10/kernel/sysv.toml

    re49e2ea r9e76c64  
    1313DEVTMPFS='*'
    1414DEVTMPFS_MOUNT='*'
    15 FB='*'
    16 FRAMEBUFFER_CONSOLE='*'
     15DRM=' *M'
    1716
    1817revision='sysv'
     18
     19[DRM_FBDEV_EMULATION]
     20value = ' *'
     21comment = 'If [DRM] is selected as * or M, this must be selected'
     22
     23[FRAMEBUFFER_CONSOLE]
     24value = ' *'
     25comment = 'If [DRM] is selected as * or M, this must be selected'
  • chapter10/kernel/sysv.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
     
    3030                                                           ...  [DEVTMPFS_MOUNT]
    3131  <emphasis role='blue'>G</emphasis>raphics support ---&gt;
    32     <emphasis role='blue'>F</emphasis>rame buffer Devices ---&gt;
    33       &lt;*&gt; <emphasis role='blue'>S</emphasis>upport for frame buffer devices ---&gt;                             [FB]
     32    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
     33                                                                      ...  [DRM]
     34    # If [DRM] is selected as * or M, this must be selected:
     35    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
     36                                                      ...  [DRM_FBDEV_EMULATION]
    3437    <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
    35       [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]</screen>
     38      # If [DRM] is selected as * or M, this must be selected:
     39      [ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                    [FRAMEBUFFER_CONSOLE]</screen>
  • chapter10/kernel/x2apic.xml

    re49e2ea r9e76c64  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
Note: See TracChangeset for help on using the changeset viewer.