summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-08-13 09:58:16 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-08-13 09:58:16 -0500
commit142d1dbc8748e066ce794a391416b045d570be71 (patch)
treeb93d3a1877d9b549a5cc857cd0298e8e4053bb27
parent29d3f64f7e887d5cf9ae5f496febe5954fc49117 (diff)
downloadkernel-142d1dbc8748e066ce794a391416b045d570be71.tar.gz
kernel-142d1dbc8748e066ce794a391416b045d570be71.tar.xz
kernel-142d1dbc8748e066ce794a391416b045d570be71.zip
Quick changes for an ELN build while toolchain is worked out
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch29
-rw-r--r--kernel.spec4
2 files changed, 32 insertions, 1 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..75fa78c7d
--- /dev/null
+++ b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
@@ -0,0 +1,29 @@
+From 4940e1f82f28200ca0a42186016b3d460d16e320 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
+
diff --git a/kernel.spec b/kernel.spec
index e78f6e081..8ab157f9b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -181,11 +181,11 @@ Summary: The Linux kernel
%define with_ipaclones 0
# no whitelist
%define with_kernel_abi_whitelists 0
+%endif
# Fedora builds these separately
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
-%endif
%if %{with_verbose}
%define make_opts V=1
@@ -815,6 +815,7 @@ Patch97: 0001-drm-panel-st7703-Assert-reset-prior-to-powering-down.patch
Patch98: 0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch
Patch99: 0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch
Patch100: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
+Patch101: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
%endif
@@ -1417,6 +1418,7 @@ ApplyOptionalPatch 0001-drm-panel-st7703-Assert-reset-prior-to-powering-down.pat
ApplyOptionalPatch 0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch
ApplyOptionalPatch 0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch
ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
+ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
%endif