6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akira Yokosawa akiyks@gmail.com
[ Upstream commit a304fa1d10fcb974c117d391e5b4d34c2baa9a62 ]
Commit f061c9f7d058 ("Documentation: Document each netlink family") added recipes for YAML -> RST conversion. Then commit 7da8bdbf8f5d ("docs: Makefile: Fix make cleandocs by deleting generated .rst files") made sure those converted .rst files are cleaned by "make cleandocs".
However, they took care of htmldocs build only.
If one of other targets such as latexdocs or epubdocs is built without building htmldocs, missing .rst files can cause additional WARNINGs from sphinx-build as follow:
./Documentation/userspace-api/netlink/specs.rst:18: WARNING: undefined label: 'specs' ./Documentation/userspace-api/netlink/netlink-raw.rst:64: WARNING: unknown document: '../../networking/netlink_spec/rt_link' ./Documentation/userspace-api/netlink/netlink-raw.rst:64: WARNING: unknown document: '../../networking/netlink_spec/tc' ./Documentation/userspace-api/netlink/index.rst:21: WARNING: undefined label: 'specs'
Add dependency to $(YNL_INDEX) for other targets and allow any targets to be built cleanly right after "make cleandocs".
Signed-off-by: Akira Yokosawa akiyks@gmail.com Cc: stable@vger.kernel.org # v6.7 Cc: Thorsten Blum thorsten.blum@toblux.com Cc: Breno Leitao leitao@debian.org Cc: Jakub Kicinski kuba@kernel.org Cc: "David S. Miller" davem@davemloft.net Reviwed-by: Breno Leitao leitao@debian.org Signed-off-by: Jonathan Corbet corbet@lwn.net Message-ID: e876e3c8-109d-4bc8-9916-05a4bc4ee9ac@gmail.com Signed-off-by: Sasha Levin sashal@kernel.org --- Documentation/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile index 3885bbe260eb2..99cb6cbccb135 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -111,7 +111,9 @@ $(YNL_INDEX): $(YNL_RST_FILES) $(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml $(YNL_TOOL) $(Q)$(YNL_TOOL) -i $< -o $@
-htmldocs: $(YNL_INDEX) +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)))