diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-04-04 10:35:00 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-04 14:04:43 +0100 |
commit | dabf7a4b75037a9f7a0630d0e8e8d734df80960f (patch) | |
tree | 630418bc88e757d1633a85980d6f07222f715d05 /meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch | |
parent | 6ad0467ac859bfbff49116164d6b5d82c4d09c4f (diff) | |
download | poky-dabf7a4b75037a9f7a0630d0e8e8d734df80960f.tar.gz |
qemu: Add 2 patches to fix build with texinfo-5
(From OE-Core rev: af65260dbf17fcd47b6630db473d95f2f3225d68)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch | 54 |
1 files changed, 54 insertions, 0 deletions
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 @@ | |||
1 | From f983d4978e1c49ee936ad52bf2de0c531420f5f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Cole Robinson <crobinso@redhat.com> | ||
3 | Date: Wed, 20 Feb 2013 07:20:31 +0000 | ||
4 | Subject: [PATCH 2/2] docs: Fix generating qemu-doc.html with texinfo 5 | ||
5 | |||
6 | LC_ALL=C makeinfo --no-headers --no-split --number-sections --html qemu-doc.texi -o qemu-doc.html | ||
7 | ./qemu-options.texi:1521: unknown command `list' | ||
8 | ./qemu-options.texi:1521: table requires an argument: the formatter for @item | ||
9 | ./qemu-options.texi:1521: warning: @table has text but no @item | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | http://patchwork.ozlabs.org/patch/222131/ | ||
13 | |||
14 | CC: qemu-stable@nongnu.org | ||
15 | Signed-off-by: Cole Robinson <crobinso@redhat.com> | ||
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
17 | Reviewed-by: Markus Armbruster <armbru@redhat.com> | ||
18 | --- | ||
19 | qemu-options.hx | 19 +++++++------------ | ||
20 | 1 file changed, 7 insertions(+), 12 deletions(-) | ||
21 | |||
22 | diff --git a/qemu-options.hx b/qemu-options.hx | ||
23 | index 54bd92a..5d2d9b8 100644 | ||
24 | --- a/qemu-options.hx | ||
25 | +++ b/qemu-options.hx | ||
26 | @@ -2089,18 +2089,13 @@ QEMU supports using either local sheepdog devices or remote networked | ||
27 | devices. | ||
28 | |||
29 | Syntax for specifying a sheepdog device | ||
30 | -@table @list | ||
31 | -``sheepdog:<vdiname>'' | ||
32 | - | ||
33 | -``sheepdog:<vdiname>:<snapid>'' | ||
34 | - | ||
35 | -``sheepdog:<vdiname>:<tag>'' | ||
36 | - | ||
37 | -``sheepdog:<host>:<port>:<vdiname>'' | ||
38 | - | ||
39 | -``sheepdog:<host>:<port>:<vdiname>:<snapid>'' | ||
40 | - | ||
41 | -``sheepdog:<host>:<port>:<vdiname>:<tag>'' | ||
42 | +@table @code | ||
43 | +@item sheepdog:<vdiname> | ||
44 | +@item sheepdog:<vdiname>:<snapid> | ||
45 | +@item sheepdog:<vdiname>:<tag> | ||
46 | +@item sheepdog:<host>:<port>:<vdiname> | ||
47 | +@item sheepdog:<host>:<port>:<vdiname>:<snapid> | ||
48 | +@item sheepdog:<host>:<port>:<vdiname>:<tag> | ||
49 | @end table | ||
50 | |||
51 | Example | ||
52 | -- | ||
53 | 1.8.1.5 | ||
54 | |||