Skip to contentSkip to conversation

qemu-doc build fixes

PATCH In review Markus Armbruster 3 participants 5 messages Jul 15, 2019 Kbuild

lore
Share & tools
lore
#0 lore raw

cover qemu-doc build fixes

*** BLURB HERE ***

Markus Armbruster (2):
Makefile: Fix missing dependency of on qemu-tech.texi
qemu-tech: Fix dangling @menu entries

 Makefile       | 3 ++-
 qemu-tech.texi | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/2 Makefile: Fix missing dependency of on qemu-tech.texi

The qemu-doc.{html,info,pdf,txt} depend on qemu-doc.texi and its include files. Except qemu-tech.texi is missing. Has always been missing as far as I can see. Fix it.

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Makefile +2 -1
index 1fcbaed62c..8212a1446c 100644
@@ -1020,7 +1020,8 @@ pdf: qemu-doc.pdf docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
 txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt
 
 qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \
-	qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \
+	qemu-img.texi qemu-nbd.texi qemu-options.texi \
+	qemu-tech.texi qemu-option-trace.texi \
 	qemu-deprecated.texi qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \
 	qemu-monitor-info.texi docs/qemu-block-drivers.texi \
 	docs/qemu-cpu-models.texi docs/security.texi
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/2 qemu-tech: Fix dangling @menu entries

In reply to Markus Armbruster

Recent commit 2f2c4e4731 "Convert "translator internals" docs to RST, move to devel manual" and commit 282d36b5e2 "qemu-tech.texi: Remove "QEMU compared to other emulators" section" removed @node, but left their @menu entries behind. This broke building qemu-doc.info (but not qemu-doc.{html,pdf,txt}; how odd). Bury the dead @menu entries.

Fixes 2f2c4e4731449449a2b1aafcd73e4f9ae107d78b
Fixes 282d36b5e27ba86d42d0638430e439c2c257367b
---
 qemu-tech.texi | 3 ---
 1 file changed, 3 deletions(-)
qemu-tech.texi +0 -3
index 3451cfaa5b..0380de77b6 100644
@@ -3,10 +3,7 @@
 
 @menu
 * CPU emulation::
-* Translator Internals::
-* QEMU compared to other emulators::
 * Managed start up options::
-* Bibliography::
 @end menu
 
 @node CPU emulation
Signature · 1 line
2.21.0
Reviewed-by on v1 2/2
#3 lore raw

Re: [Qemu-devel] [PATCH for-4.1 2/2] qemu-tech: Fix dangling @menu entries

Quoted 20 lines · Markus Armbruster

Recent commit 2f2c4e4731 "Convert "translator internals" docs to RST, move to devel manual" and commit 282d36b5e2 "qemu-tech.texi: Remove "QEMU compared to other emulators" section" removed @node, but left their @menu entries behind. This broke building qemu-doc.info (but not qemu-doc.{html,pdf,txt}; how odd). Bury the dead @menu entries.

Fixes 2f2c4e4731449449a2b1aafcd73e4f9ae107d78b
Fixes 282d36b5e27ba86d42d0638430e439c2c257367b
---
 qemu-tech.texi | 3 ---
 1 file changed, 3 deletions(-)
qemu-tech.texi +0 -0
index 3451cfaa5b..0380de77b6 100644

qemu-tech.texi line 7

Quoted 8 lines
qemu-tech.texi +0 -3
@@ -3,10 +3,7 @@
 
 @menu
 * CPU emulation::
-* Translator Internals::
-* QEMU compared to other emulators::
 * Managed start up options::
-* Bibliography::
 @end menu

Whoops...

thanks
-- PMM