diff options
author | Riku Voipio <riku.voipio@linaro.org> | 2013-06-06 15:08:40 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-13 17:38:08 +0100 |
commit | b85b6118d5e0dcf8c49af956c1bbca80ec13f8c3 (patch) | |
tree | 80bf309448f4d154f5c3c4655696e7f9d99e4547 /meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch | |
parent | a6daa838df06ea97a9fc29861dae95ee80a0d512 (diff) | |
download | poky-b85b6118d5e0dcf8c49af956c1bbca80ec13f8c3.tar.gz |
qemu: update to 1.5.0
Patches removed:
0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch
- applied
0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
- fixed different upstream
Revert-vmware_vga-Add-back-some-info-in-local-state-.patch
- fixed different upstream
arm-bgr.patch
- this should be also fixed upstream, if still issue please resend.
fallback-to-safe-mmap_min_addr.patch
- this should be also fixed upstream, if still issue please resend.
linker-flags.patch
- unneeded with makefile changes
from configure the obsolete --audio-cards-list option has been removed.
(From OE-Core rev: 408f933f3b5523fc26ee818a16bb4162c4343192)
Signed-off-by: Saul Wold <sgw@linux.intel.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, 0 insertions, 54 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 deleted file mode 100644 index cabbf0ea9f..0000000000 --- a/meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
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 | |||