diff options
| author | Ben Hutchings <benh@debian.org> | 2020-08-22 03:15:26 +0100 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2020-08-22 03:15:26 +0100 |
| commit | cb18404450161f5eff18a651d0a6c599ba4fa71e (patch) | |
| tree | 917d06d31ce0c4a227b7658333a05e6337874628 | |
| parent | a13e2224b2091fe60345824c1acb8cac68f8dca6 (diff) | |
| download | kernel_replicant_linux-cb18404450161f5eff18a651d0a6c599ba4fa71e.tar.gz kernel_replicant_linux-cb18404450161f5eff18a651d0a6c599ba4fa71e.tar.bz2 kernel_replicant_linux-cb18404450161f5eff18a651d0a6c599ba4fa71e.zip | |
doc: Disable extension incompatible with Sphinx 3 (fixes FTBFS)
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/debian/doc-disable-extension-incompatible-with-sphinx-3.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 24 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ce5c5e068881..1ca4b7b6c491 100644 --- a/debian/changelog +++ b/debian/changelog @@ -330,6 +330,9 @@ linux (5.7.15-1) UNRELEASED; urgency=medium [ Salvatore Bonaccorso ] * Bump ABI to 3 + [ Ben Hutchings ] + * doc: Disable extension incompatible with Sphinx 3 (fixes FTBFS) + -- Salvatore Bonaccorso <carnil@debian.org> Tue, 04 Aug 2020 16:31:09 +0200 linux (5.7.10-1) unstable; urgency=medium diff --git a/debian/patches/debian/doc-disable-extension-incompatible-with-sphinx-3.patch b/debian/patches/debian/doc-disable-extension-incompatible-with-sphinx-3.patch new file mode 100644 index 000000000000..3e996fa9350b --- /dev/null +++ b/debian/patches/debian/doc-disable-extension-incompatible-with-sphinx-3.patch @@ -0,0 +1,19 @@ +From: Ben Hutchings <benh@debian.org> +Date: Sat, 22 Aug 2020 03:13:44 +0100 +Subject: doc: Disable extension incompatible with Sphinx 3 + +The cdomain extension needs major changes to work with Sphinx 3. +For now, disable it. + +--- +--- 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', #y'cdomain', + 'kfigure', 'sphinx.ext.ifconfig', 'automarkup', + 'maintainers_include', 'sphinx.ext.autosectionlabel' ] + diff --git a/debian/patches/series b/debian/patches/series index 316fdacd13a3..0d93328cd330 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -127,4 +127,6 @@ bugfix/all/0005-libtraceevent-Add-dependency-on-libdl.patch # overlay: allow mounting in user namespaces debian/overlayfs-permit-mounts-in-userns.patch +debian/doc-disable-extension-incompatible-with-sphinx-3.patch + # ABI maintenance |