Konstantin Demin
c3d09a3e94
imported from https://salsa.debian.org/kernel-team/linux.git commit 9d5cc9d9d6501d7f1dd7e194d4b245bd0b6c6a22 version 6.11.4-1
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From 252aa79fdbd4ac2da09d9b98f81bf11f5e3e1870 Mon Sep 17 00:00:00 2001
|
|
From: Bastian Blank <waldi@debian.org>
|
|
Date: Tue, 4 Aug 2020 09:44:19 +0000
|
|
Subject: [PATCH 1/2] Documentation: Drop sphinx version check
|
|
Forwarded: not-needed
|
|
|
|
---
|
|
Documentation/Makefile | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
--- a/Documentation/Makefile
|
|
+++ b/Documentation/Makefile
|
|
@@ -118,7 +118,6 @@ $(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.
|
|
htmldocs texinfodocs latexdocs epubdocs xmldocs: $(YNL_INDEX)
|
|
|
|
htmldocs:
|
|
- @$(srctree)/scripts/sphinx-pre-install --version-check
|
|
@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))
|
|
|
|
# If Rust support is available and .config exists, add rustdoc generated contents.
|
|
@@ -132,7 +131,6 @@ endif
|
|
endif
|
|
|
|
texinfodocs:
|
|
- @$(srctree)/scripts/sphinx-pre-install --version-check
|
|
@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,texinfo,$(var),texinfo,$(var)))
|
|
|
|
# Note: the 'info' Make target is generated by sphinx itself when
|
|
@@ -144,7 +142,6 @@ linkcheckdocs:
|
|
@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,linkcheck,$(var),,$(var)))
|
|
|
|
latexdocs:
|
|
- @$(srctree)/scripts/sphinx-pre-install --version-check
|
|
@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,latex,$(var),latex,$(var)))
|
|
|
|
ifeq ($(HAVE_PDFLATEX),0)
|
|
@@ -157,7 +154,6 @@ else # HAVE_PDFLATEX
|
|
|
|
pdfdocs: DENY_VF = XDG_CONFIG_HOME=$(FONTS_CONF_DENY_VF)
|
|
pdfdocs: latexdocs
|
|
- @$(srctree)/scripts/sphinx-pre-install --version-check
|
|
$(foreach var,$(SPHINXDIRS), \
|
|
$(MAKE) PDFLATEX="$(PDFLATEX)" LATEXOPTS="$(LATEXOPTS)" $(DENY_VF) -C $(BUILDDIR)/$(var)/latex || sh $(srctree)/scripts/check-variable-fonts.sh || exit; \
|
|
mkdir -p $(BUILDDIR)/$(var)/pdf; \
|
|
@@ -167,11 +163,9 @@ pdfdocs: latexdocs
|
|
endif # HAVE_PDFLATEX
|
|
|
|
epubdocs:
|
|
- @$(srctree)/scripts/sphinx-pre-install --version-check
|
|
@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,epub,$(var),epub,$(var)))
|
|
|
|
xmldocs:
|
|
- @$(srctree)/scripts/sphinx-pre-install --version-check
|
|
@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,xml,$(var),xml,$(var)))
|
|
|
|
endif # HAVE_SPHINX
|