diff options
Diffstat (limited to 'tools/docs')
| -rwxr-xr-x | tools/docs/documentation-file-ref-check | 2 | ||||
| -rwxr-xr-x | tools/docs/sphinx-build-wrapper | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/docs/documentation-file-ref-check b/tools/docs/documentation-file-ref-check index 0cad42f6943b..93b53f3a5567 100755 --- a/tools/docs/documentation-file-ref-check +++ b/tools/docs/documentation-file-ref-check @@ -143,7 +143,7 @@ while (<IN>) { # Check if exists, evaluating wildcards next if (grep -e, glob("$ref $fulref")); - # Accept relative Documentation patches for tools/ + # Accept relative Documentation paths for tools/ if ($f =~ m/tools/) { my $path = $f; $path =~ s,(.*)/.*,$1,; diff --git a/tools/docs/sphinx-build-wrapper b/tools/docs/sphinx-build-wrapper index 1bb962202784..6f1163333a47 100755 --- a/tools/docs/sphinx-build-wrapper +++ b/tools/docs/sphinx-build-wrapper @@ -99,9 +99,9 @@ class SphinxBuilder: def get_path(self, path, use_cwd=False, abs_path=False): """ - Ancillary routine to handle patches the right way, as shell does. + Ancillary routine to handle paths the right way, as shell does. - It first expands "~" and "~user". Then, if patch is not absolute, + It first expands "~" and "~user". Then, if path is not absolute, join self.srctree. Finally, if requested, convert to abspath. """ @@ -220,6 +220,15 @@ class SphinxBuilder: self.pdflatex = os.environ.get("PDFLATEX", "xelatex") # + # Add localversion* to kernelversion if present + # + for file in glob(os.environ["srctree"] + "/localversion*"): + if not file.endswith(".orig"): + with open(file, 'r', encoding='utf-8') as f: + text = f.read() + self.kernelversion += text + + # # Kernel main Makefile defines a PYTHON3 variable whose default is # "python3". When set to a different value, it allows running a # diferent version than the default official python3 package. |