From af65260dbf17fcd47b6630db473d95f2f3225d68 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Thu, 4 Apr 2013 10:35:00 +0200
Subject: qemu: Add 2 patches to fix build with texinfo-5

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...x-generating-qemu-doc.html-with-texinfo-5.patch | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch

(limited to 'meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch')

diff --git a/meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch b/meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
new file mode 100644
index 0000000000..cabbf0ea9f
--- /dev/null
+++ b/meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
@@ -0,0 +1,54 @@
+From f983d4978e1c49ee936ad52bf2de0c531420f5f8 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Wed, 20 Feb 2013 07:20:31 +0000
+Subject: [PATCH 2/2] docs: Fix generating qemu-doc.html with texinfo 5
+
+LC_ALL=C makeinfo --no-headers --no-split --number-sections --html qemu-doc.texi -o qemu-doc.html
+./qemu-options.texi:1521: unknown command `list'
+./qemu-options.texi:1521: table requires an argument: the formatter for @item
+./qemu-options.texi:1521: warning: @table has text but no @item
+
+Upstream-Status: Pending
+http://patchwork.ozlabs.org/patch/222131/
+
+CC: qemu-stable@nongnu.org
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+Reviewed-by: Markus Armbruster <armbru@redhat.com>
+---
+ qemu-options.hx | 19 +++++++------------
+ 1 file changed, 7 insertions(+), 12 deletions(-)
+
+diff --git a/qemu-options.hx b/qemu-options.hx
+index 54bd92a..5d2d9b8 100644
+--- a/qemu-options.hx
++++ b/qemu-options.hx
+@@ -2089,18 +2089,13 @@ QEMU supports using either local sheepdog devices or remote networked
+ devices.
+ 
+ Syntax for specifying a sheepdog device
+-@table @list
+-``sheepdog:<vdiname>''
+-
+-``sheepdog:<vdiname>:<snapid>''
+-
+-``sheepdog:<vdiname>:<tag>''
+-
+-``sheepdog:<host>:<port>:<vdiname>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<snapid>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<tag>''
++@table @code
++@item sheepdog:<vdiname>
++@item sheepdog:<vdiname>:<snapid>
++@item sheepdog:<vdiname>:<tag>
++@item sheepdog:<host>:<port>:<vdiname>
++@item sheepdog:<host>:<port>:<vdiname>:<snapid>
++@item sheepdog:<host>:<port>:<vdiname>:<tag>
+ @end table
+ 
+ Example
+-- 
+1.8.1.5
+
-- 
cgit v1.2.3