Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-05-15 11:24:55 +0200
committerJiri Kosina <jkosina@suse.cz>2018-05-15 11:24:55 +0200
commit363ce7ee01e5bf26dc32ff835f94dcebeb5776ac (patch)
treecf8e0f1175ec1c50cb14a5edb1841ddf5b17e3db
parent3e843b0400a7edff14c3d1f1c85da6e4c378e192 (diff)
parentc6ec8bc75d928d39eff27c09e221f2ebc4c337cb (diff)
Merge remote-tracking branch 'origin/users/tiwai/SLE12-SP4/for-next' into SLE12-SP4
Pull kernel-doc generation fix from Takashi Iwai suse-commit: a52c3cbca53ac68f12ea4c26a32b8b69c51a2541
-rw-r--r--Documentation/conf.py4
-rw-r--r--Documentation/sphinx/cdomain.py4
-rw-r--r--Documentation/sphinx/kfigure.py9
3 files changed, 12 insertions, 5 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 11284ed55083..c7b9eece63e9 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -17,7 +17,9 @@ import os
import sphinx
# Get Sphinx version
-major, minor, patch = sphinx.version_info[:3]
+# major, minor, patch = sphinx.version_info[:3]
+# XXX use the fixed versions for SLE12-SP4 due to silly issues
+major, minor, patch = 1, 2, 3
# If extensions (or modules to document with autodoc) are in another directory,
diff --git a/Documentation/sphinx/cdomain.py b/Documentation/sphinx/cdomain.py
index cf13ff3a656c..c235747836f6 100644
--- a/Documentation/sphinx/cdomain.py
+++ b/Documentation/sphinx/cdomain.py
@@ -44,7 +44,9 @@ from sphinx.domains.c import CDomain as Base_CDomain
__version__ = '1.0'
# Get Sphinx version
-major, minor, patch = sphinx.version_info[:3]
+# major, minor, patch = sphinx.version_info[:3]
+# XXX use the fixed versions for SLE12-SP4 due to silly issues
+major, minor, patch = 1, 2, 3
def setup(app):
diff --git a/Documentation/sphinx/kfigure.py b/Documentation/sphinx/kfigure.py
index cef4ad19624c..d7c006f96968 100644
--- a/Documentation/sphinx/kfigure.py
+++ b/Documentation/sphinx/kfigure.py
@@ -68,7 +68,10 @@ else:
_unicode = unicode
# Get Sphinx version
-major, minor, patch = sphinx.version_info[:3]
+# major, minor, patch = sphinx.version_info[:3]
+# XXX use the fixed versions for SLE12-SP4 due to silly issues
+major, minor, patch = 1, 2, 3
+
if major == 1 and minor > 3:
# patches.Figure only landed in Sphinx 1.4
from sphinx.directives.patches import Figure # pylint: disable=C0413
@@ -237,7 +240,7 @@ def convert_image(img_node, translator, src_fname=None):
elif translator.builder.format == 'html':
dst_fname = path.join(
translator.builder.outdir,
- translator.builder.imagedir,
+ '_images',
fname + '.svg')
img_node['uri'] = path.join(
translator.builder.imgpath, fname + '.svg')
@@ -433,7 +436,7 @@ def visit_kernel_render(self, node):
fname = path.join('%s-%s' % (srclang, sha1(hashobj).hexdigest()))
tmp_fname = path.join(
- self.builder.outdir, self.builder.imagedir, fname + tmp_ext)
+ self.builder.outdir, '_images', fname + tmp_ext)
if not path.isfile(tmp_fname):
mkdir(path.dirname(tmp_fname))