diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-21 20:13:19 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-21 20:13:19 +0200 |
commit | c01e23554af1d0635829396c9b8b7f5040a2d7d3 (patch) | |
tree | c436ae3689e1994981ecab857e0e85c171b49722 /0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch | |
parent | adaff2fee66a964ee87251de98e9f58f7ba5cb92 (diff) | |
parent | 1e0aef3c8fd22ad01d73d3a066e72a26328d3ef2 (diff) | |
download | kernel-c01e23554af1d0635829396c9b8b7f5040a2d7d3.tar.gz kernel-c01e23554af1d0635829396c9b8b7f5040a2d7d3.tar.xz kernel-c01e23554af1d0635829396c9b8b7f5040a2d7d3.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc1.20200821gitda2968ff879b.1.vanilla.2.fc34kernel-5.9.0-0.rc1.20200821gitda2968ff879b.1.vanilla.2.fc33kernel-5.9.0-0.rc1.20200821gitda2968ff879b.1.vanilla.2.fc32kernel-5.9.0-0.rc1.20200821gitda2968ff879b.1.vanilla.2.fc31
Diffstat (limited to '0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch')
-rw-r--r-- | 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch new file mode 100644 index 000000000..c9605b88c --- /dev/null +++ b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" <jforbes@fedoraproject.org> +Date: Mon, 10 Aug 2020 08:06:05 -0500 +Subject: [PATCH] Temporarily remove cdomain from sphinx documentation + +The documentation subpackage will not build currently. +https://github.com/sphinx-doc/sphinx/issues/7421 + +Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org> +--- + Documentation/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/conf.py b/Documentation/conf.py +index c503188880d9..b5b2be8eec22 100644 +--- a/Documentation/conf.py ++++ b/Documentation/conf.py +@@ -36,7 +36,7 @@ needs_sphinx = '1.3' + # Add any Sphinx extension module names here, as strings. They can be + # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom + # ones. +-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', ++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', + 'kfigure', 'sphinx.ext.ifconfig', 'automarkup', + 'maintainers_include', 'sphinx.ext.autosectionlabel' ] + +-- +2.26.2 + |