Revert "doc: update Kernel documentation build system"
Unfortunately we now see a number of now-fatal warnings about duplicate
labels. It is often unclear how best to re-write the document in
question to not duplicate these otherwise logical headings.
This reverts commit 10a1df3cd43ba2fe893d5dd1aeb2e7109ef0007f.
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/doc/sphinx/kerneldoc.py b/doc/sphinx/kerneldoc.py
index e9857ab..4bcbd6a 100644
--- a/doc/sphinx/kerneldoc.py
+++ b/doc/sphinx/kerneldoc.py
@@ -62,7 +62,6 @@
'export': directives.unchanged,
'internal': directives.unchanged,
'identifiers': directives.unchanged,
- 'no-identifiers': directives.unchanged,
'functions': directives.unchanged,
}
has_content = False
@@ -71,11 +70,6 @@
env = self.state.document.settings.env
cmd = [env.config.kerneldoc_bin, '-rst', '-enable-lineno']
- # Pass the version string to kernel-doc, as it needs to use a different
- # dialect, depending what the C domain supports for each specific
- # Sphinx versions
- cmd += ['-sphinx-version', sphinx.__version__]
-
filename = env.config.kerneldoc_srctree + '/' + self.arguments[0]
export_file_patterns = []
@@ -105,12 +99,6 @@
else:
cmd += ['-no-doc-sections']
- if 'no-identifiers' in self.options:
- no_identifiers = self.options.get('no-identifiers').split()
- if no_identifiers:
- for i in no_identifiers:
- cmd += ['-nosymbol', i]
-
for pattern in export_file_patterns:
for f in glob.glob(env.config.kerneldoc_srctree + '/' + pattern):
env.note_dependency(os.path.abspath(f))
@@ -148,8 +136,7 @@
lineoffset = int(match.group(1)) - 1
# we must eat our comments since the upset the markup
else:
- doc = env.srcdir + "/" + env.docname + ":" + str(self.lineno)
- result.append(line, doc + ": " + filename, lineoffset)
+ result.append(line, filename, lineoffset)
lineoffset += 1
node = nodes.section()