diff options
author | Quentin Schulz <foss@0leil.net> | 2021-06-19 09:07:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-16 21:59:31 +0100 |
commit | 5a6fb291ad16ce4110e65adf2d29e8ccfe6fa25a (patch) | |
tree | df43222dc7a0def1bbc6246ca2a33953f85e584f /documentation/kernel-dev | |
parent | be3e14dd43220db034a63b7a9f5516feb6a00110 (diff) | |
download | poky-5a6fb291ad16ce4110e65adf2d29e8ccfe6fa25a.tar.gz |
docs: replace remaining ``FOO`` by :term:`FOO`
A few occurences appeared between the time the original patch was sent
and it was applied, this fixes it.
Also, the original patch didn't take into account lowercase terms, this
is now fixed, see module_autoload for example.
Finally, as is often the case with regexp, there was a typo in it that
didn't make it match as much as it should have.
The script that is used to do the replacement of ``FOO`` by :term:`FOO`
is the following Python code:
import re
from pathlib import Path
from runpy import run_module
import contextlib
import io
import sys
re_term = re.compile(r'variables.html#term-([a-zA-Z_0-9]*)')
terms = []
new_terms = set()
with contextlib.redirect_stdout(io.StringIO()) as f:
run_module('sphinx.ext.intersphinx', run_name='__main__')
objects = f.getvalue()
match = re_term.search(objects)
while match:
if match.group(1):
terms.append(match.group(1))
match = re_term.search(objects, match.end())
for rst in Path('.').rglob('*.rst'):
with open(rst, 'r') as f:
content = "".join(f.readlines())
for term in terms:
content = re.sub(r'``({})``(?!.*\s+[~=-]{{{:d},}})'.format(term, len(term)), r':term:`\1`', content)
with open(rst, 'w') as f:
f.write(content)
This script takes one argument as input: an objects.inv. Bitbake's can
be gotten from https://docs.yoctoproject.org/bitbake/objects.inv. The
objetcs.inv from the current git repo can be gotten from
documentation/_build/html/objetcs.inv after running `make html`.
Note that this excludes from replacement terms that appear in section
titles as it requires refs to be changed too. This can be automated too
if need be but right now it looks a bit confusing to have an anchor link
(for sections) also have a term/reference link in it. I am not sure this
is desired today.
This is the result of two runs of the aforementioned script, once with
Bitbake objects.inv and once with this repo's.
Fixes: ba49d9babfcb "docs: replace ``FOO`` by :term:`FOO` where possible"
(From yocto-docs rev: 1e1b0c4dd241b6657035172b1f7b5f341afa8b25)
Signed-off-by: Quentin Schulz <foss@0leil.net>
Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/kernel-dev')
-rw-r--r-- | documentation/kernel-dev/common.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/kernel-dev/common.rst b/documentation/kernel-dev/common.rst index de62df5b1f..a97140b0b9 100644 --- a/documentation/kernel-dev/common.rst +++ b/documentation/kernel-dev/common.rst | |||
@@ -81,7 +81,7 @@ section: | |||
81 | variable to include kernel modules. | 81 | variable to include kernel modules. |
82 | 82 | ||
83 | In this example we wish to build for qemux86 so we must set the | 83 | In this example we wish to build for qemux86 so we must set the |
84 | ``MACHINE`` variable to "qemux86" and also add the "kernel-modules". | 84 | :term:`MACHINE` variable to "qemux86" and also add the "kernel-modules". |
85 | As described we do this by appending to ``conf/local.conf``:: | 85 | As described we do this by appending to ``conf/local.conf``:: |
86 | 86 | ||
87 | MACHINE = "qemux86" | 87 | MACHINE = "qemux86" |
@@ -259,7 +259,7 @@ section: | |||
259 | variable to include kernel modules. | 259 | variable to include kernel modules. |
260 | 260 | ||
261 | In this example we wish to build for qemux86 so we must set the | 261 | In this example we wish to build for qemux86 so we must set the |
262 | ``MACHINE`` variable to "qemux86" and also add the "kernel-modules". | 262 | :term:`MACHINE` variable to "qemux86" and also add the "kernel-modules". |
263 | As described we do this by appending to ``conf/local.conf``:: | 263 | As described we do this by appending to ``conf/local.conf``:: |
264 | 264 | ||
265 | MACHINE = "qemux86" | 265 | MACHINE = "qemux86" |
@@ -588,7 +588,7 @@ recipe is processed. | |||
588 | added to the Yocto Project. | 588 | added to the Yocto Project. |
589 | 589 | ||
590 | In general, however, the Yocto Project maintainers take care of | 590 | In general, however, the Yocto Project maintainers take care of |
591 | moving the ``SRC_URI``-specified configuration options to the | 591 | moving the :term:`SRC_URI`-specified configuration options to the |
592 | kernel's ``meta`` branch. Not only is it easier for BSP developers | 592 | kernel's ``meta`` branch. Not only is it easier for BSP developers |
593 | not to have to put those configurations in the branch, | 593 | not to have to put those configurations in the branch, |
594 | but having the maintainers do it allows them to apply 'global' | 594 | but having the maintainers do it allows them to apply 'global' |
@@ -730,7 +730,7 @@ a Raspberry Pi 2, which is based on the Broadcom 2708/2709 chipset:: | |||
730 | 730 | ||
731 | Aside from modifying your kernel recipe and providing your own | 731 | Aside from modifying your kernel recipe and providing your own |
732 | ``defconfig`` file, you need to be sure no files or statements set | 732 | ``defconfig`` file, you need to be sure no files or statements set |
733 | ``SRC_URI`` to use a ``defconfig`` other than your "in-tree" file (e.g. | 733 | :term:`SRC_URI` to use a ``defconfig`` other than your "in-tree" file (e.g. |
734 | a kernel's ``linux-``\ `machine`\ ``.inc`` file). In other words, if the | 734 | a kernel's ``linux-``\ `machine`\ ``.inc`` file). In other words, if the |
735 | build system detects a statement that identifies an "out-of-tree" | 735 | build system detects a statement that identifies an "out-of-tree" |
736 | ``defconfig`` file, that statement will override your | 736 | ``defconfig`` file, that statement will override your |