diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-07 18:05:58 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-07 18:05:58 +0200 |
commit | 9799143e8f057a9cf3406e611a8e53dca0aa703a (patch) | |
tree | ccf6ee2e5f76031a2e31a3b165de2e732e3efd1c /0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch | |
parent | def8cf129efcd41942f6684e26e737bbfca5d62e (diff) | |
parent | f7a55ba381de17d8e5511a97441944b797aa62a5 (diff) | |
download | kernel-9799143e8f057a9cf3406e611a8e53dca0aa703a.tar.gz kernel-9799143e8f057a9cf3406e611a8e53dca0aa703a.tar.xz kernel-9799143e8f057a9cf3406e611a8e53dca0aa703a.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc8.20201007git7575fdda569b.30.vanilla.1.fc32
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, 0 insertions, 29 deletions
diff --git a/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch deleted file mode 100644 index 60e517ca8..000000000 --- a/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch +++ /dev/null @@ -1,29 +0,0 @@ -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.28.0 - |