summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-04-04 10:35:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-04 14:04:43 +0100
commitdabf7a4b75037a9f7a0630d0e8e8d734df80960f (patch)
tree630418bc88e757d1633a85980d6f07222f715d05 /meta
parent6ad0467ac859bfbff49116164d6b5d82c4d09c4f (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch213
-rw-r--r--meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch54
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
3 files changed, 269 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch b/meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch
new file mode 100644
index 0000000000..9435cfe5a2
--- /dev/null
+++ b/meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch
@@ -0,0 +1,213 @@
1From 9a7146ca91c04d05af36684d8b3ca79c1254abc2 Mon Sep 17 00:00:00 2001
2From: Markus Armbruster <armbru@redhat.com>
3Date: Wed, 13 Feb 2013 19:49:40 +0100
4Subject: [PATCH 1/2] doc: Fix texinfo @table markup in qemu-options.hx
5
6End tables before headings, start new ones afterwards. Fixes
7incorrect indentation of headings "File system options" and "Virtual
8File system pass-through options" in manual page and qemu-doc.
9
10Normalize markup some to increase chances it survives future edits.
11
12Upstream-Status: Backport
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15Signed-off-by: Markus Armbruster <armbru@redhat.com>
16Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
17Message-id: 1360781383-28635-5-git-send-email-armbru@redhat.com
18Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
19---
20 qemu-options.hx | 56 +++++++++++++++++++++++++++++++++++++-------------------
21 1 file changed, 37 insertions(+), 19 deletions(-)
22
23diff --git a/qemu-options.hx b/qemu-options.hx
24index 9d7131a..54bd92a 100644
25--- a/qemu-options.hx
26+++ b/qemu-options.hx
27@@ -537,13 +537,15 @@ STEXI
28 @end table
29 ETEXI
30
31-DEF("usb", 0, QEMU_OPTION_usb,
32- "-usb enable the USB driver (will be the default soon)\n",
33- QEMU_ARCH_ALL)
34 STEXI
35 USB options:
36 @table @option
37+ETEXI
38
39+DEF("usb", 0, QEMU_OPTION_usb,
40+ "-usb enable the USB driver (will be the default soon)\n",
41+ QEMU_ARCH_ALL)
42+STEXI
43 @item -usb
44 @findex -usb
45 Enable the USB driver (will be the default soon)
46@@ -610,9 +612,15 @@ possible drivers and properties, use @code{-device help} and
47 @code{-device @var{driver},help}.
48 ETEXI
49
50+STEXI
51+@end table
52+ETEXI
53 DEFHEADING()
54
55 DEFHEADING(File system options:)
56+STEXI
57+@table @option
58+ETEXI
59
60 DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev,
61 "-fsdev fsdriver,id=id[,path=path,][security_model={mapped-xattr|mapped-file|passthrough|none}]\n"
62@@ -676,9 +684,15 @@ Specifies the tag name to be used by the guest to mount this export point
63
64 ETEXI
65
66+STEXI
67+@end table
68+ETEXI
69 DEFHEADING()
70
71 DEFHEADING(Virtual File system pass-through options:)
72+STEXI
73+@table @option
74+ETEXI
75
76 DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs,
77 "-virtfs local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none]\n"
78@@ -769,11 +783,9 @@ ETEXI
79 STEXI
80 @end table
81 ETEXI
82-
83 DEFHEADING()
84
85 DEFHEADING(Display options:)
86-
87 STEXI
88 @table @option
89 ETEXI
90@@ -1215,7 +1227,6 @@ ETEXI
91 STEXI
92 @end table
93 ETEXI
94-
95 ARCHHEADING(, QEMU_ARCH_I386)
96
97 ARCHHEADING(i386 target only:, QEMU_ARCH_I386)
98@@ -1301,10 +1312,10 @@ Specify SMBIOS type 0 fields
99 Specify SMBIOS type 1 fields
100 ETEXI
101
102-DEFHEADING()
103 STEXI
104 @end table
105 ETEXI
106+DEFHEADING()
107
108 DEFHEADING(Network options:)
109 STEXI
110@@ -1718,13 +1729,19 @@ libpcap, so it can be analyzed with tools such as tcpdump or Wireshark.
111 Indicate that no network devices should be configured. It is used to
112 override the default configuration (@option{-net nic -net user}) which
113 is activated if no @option{-net} options are provided.
114+ETEXI
115
116+STEXI
117 @end table
118 ETEXI
119-
120 DEFHEADING()
121
122 DEFHEADING(Character device options:)
123+STEXI
124+
125+The general form of a character device option is:
126+@table @option
127+ETEXI
128
129 DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
130 "-chardev null,id=id[,mux=on|off]\n"
131@@ -1766,10 +1783,6 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
132 )
133
134 STEXI
135-
136-The general form of a character device option is:
137-@table @option
138-
139 @item -chardev @var{backend} ,id=@var{id} [,mux=on|off] [,@var{options}]
140 @findex -chardev
141 Backend is one of:
142@@ -1990,14 +2003,15 @@ Connect to a spice virtual machine channel, such as vdiport.
143
144 Connect to a spice port, allowing a Spice client to handle the traffic
145 identified by a name (preferably a fqdn).
146+ETEXI
147
148+STEXI
149 @end table
150 ETEXI
151-
152 DEFHEADING()
153
154-STEXI
155 DEFHEADING(Device URL Syntax:)
156+STEXI
157
158 In addition to using normal file images for the emulated storage devices,
159 QEMU can also use networked resources such as iSCSI devices. These are
160@@ -2113,10 +2127,16 @@ qemu-system-x86_84 --drive file=gluster://192.0.2.1/testvol/a.img
161 @end example
162
163 See also @url{http://www.gluster.org}.
164+ETEXI
165+
166+STEXI
167 @end table
168 ETEXI
169
170 DEFHEADING(Bluetooth(R) options:)
171+STEXI
172+@table @option
173+ETEXI
174
175 DEF("bt", HAS_ARG, QEMU_OPTION_bt, \
176 "-bt hci,null dumb bluetooth HCI - doesn't respond to commands\n" \
177@@ -2130,8 +2150,6 @@ DEF("bt", HAS_ARG, QEMU_OPTION_bt, \
178 " emulate a bluetooth device 'dev' in scatternet 'n'\n",
179 QEMU_ARCH_ALL)
180 STEXI
181-@table @option
182-
183 @item -bt hci[...]
184 @findex -bt
185 Defines the function of the corresponding Bluetooth HCI. -bt options
186@@ -2183,9 +2201,11 @@ currently:
187 @item keyboard
188 Virtual wireless keyboard implementing the HIDP bluetooth profile.
189 @end table
190-@end table
191 ETEXI
192
193+STEXI
194+@end table
195+ETEXI
196 DEFHEADING()
197
198 DEFHEADING(Linux/Multiboot boot specific:)
199@@ -2242,11 +2262,9 @@ ETEXI
200 STEXI
201 @end table
202 ETEXI
203-
204 DEFHEADING()
205
206 DEFHEADING(Debug/Expert options:)
207-
208 STEXI
209 @table @option
210 ETEXI
211--
2121.8.1.5
213
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 @@
1From f983d4978e1c49ee936ad52bf2de0c531420f5f8 Mon Sep 17 00:00:00 2001
2From: Cole Robinson <crobinso@redhat.com>
3Date: Wed, 20 Feb 2013 07:20:31 +0000
4Subject: [PATCH 2/2] docs: Fix generating qemu-doc.html with texinfo 5
5
6LC_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
11Upstream-Status: Pending
12http://patchwork.ozlabs.org/patch/222131/
13
14CC: qemu-stable@nongnu.org
15Signed-off-by: Cole Robinson <crobinso@redhat.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17Reviewed-by: Markus Armbruster <armbru@redhat.com>
18---
19 qemu-options.hx | 19 +++++++------------
20 1 file changed, 7 insertions(+), 12 deletions(-)
21
22diff --git a/qemu-options.hx b/qemu-options.hx
23index 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--
531.8.1.5
54
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 06fa88b84b..bd7890d791 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,6 +26,8 @@ SRC_URI = "\
26 file://larger_default_ram_size.patch \ 26 file://larger_default_ram_size.patch \
27 file://arm-bgr.patch \ 27 file://arm-bgr.patch \
28 file://Revert-vmware_vga-Add-back-some-info-in-local-state-.patch \ 28 file://Revert-vmware_vga-Add-back-some-info-in-local-state-.patch \
29 file://0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch \
30 file://0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch \
29 " 31 "
30 32
31SRC_URI_append_class-nativesdk = "\ 33SRC_URI_append_class-nativesdk = "\