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 | |
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')
-rw-r--r-- | meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch | 213 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch | 54 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch | 114 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/files/arm-bgr.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch | 39 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/files/linker-flags.patch | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_1.5.0.bb (renamed from meta/recipes-devtools/qemu/qemu_1.4.1.bb) | 4 |
8 files changed, 3 insertions, 483 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 deleted file mode 100644 index 9435cfe5a2..0000000000 --- a/meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch +++ /dev/null | |||
@@ -1,213 +0,0 @@ | |||
1 | From 9a7146ca91c04d05af36684d8b3ca79c1254abc2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Armbruster <armbru@redhat.com> | ||
3 | Date: Wed, 13 Feb 2013 19:49:40 +0100 | ||
4 | Subject: [PATCH 1/2] doc: Fix texinfo @table markup in qemu-options.hx | ||
5 | |||
6 | End tables before headings, start new ones afterwards. Fixes | ||
7 | incorrect indentation of headings "File system options" and "Virtual | ||
8 | File system pass-through options" in manual page and qemu-doc. | ||
9 | |||
10 | Normalize markup some to increase chances it survives future edits. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | Signed-off-by: Markus Armbruster <armbru@redhat.com> | ||
16 | Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
17 | Message-id: 1360781383-28635-5-git-send-email-armbru@redhat.com | ||
18 | Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> | ||
19 | --- | ||
20 | qemu-options.hx | 56 +++++++++++++++++++++++++++++++++++++------------------- | ||
21 | 1 file changed, 37 insertions(+), 19 deletions(-) | ||
22 | |||
23 | diff --git a/qemu-options.hx b/qemu-options.hx | ||
24 | index 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 | -- | ||
212 | 1.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 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 | |||
diff --git a/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch b/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch deleted file mode 100644 index d56256e05c..0000000000 --- a/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | From 2cf7df441ce4c36525ba4d2d040f8cb0b0c75f14 Mon Sep 17 00:00:00 2001 | ||
2 | From: Constantin Musca <constantinx.musca@intel.com> | ||
3 | Date: Fri, 7 Dec 2012 12:33:42 +0200 | ||
4 | Subject: [PATCH] Revert "vmware_vga: Add back some info in local state | ||
5 | partially reverting aa32b38c" | ||
6 | |||
7 | - this reverts commit 1f202568e0553b416483e5993f1bde219c22cf72 | ||
8 | - do not cache the DS depth (the depth might change) | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
12 | --- | ||
13 | hw/vmware_vga.c | 30 +++++++++--------------------- | ||
14 | 1 file changed, 9 insertions(+), 21 deletions(-) | ||
15 | |||
16 | diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c | ||
17 | index 834588d..7c766fb 100644 | ||
18 | --- a/hw/vmware_vga.c | ||
19 | +++ b/hw/vmware_vga.c | ||
20 | @@ -39,8 +39,6 @@ struct vmsvga_state_s { | ||
21 | VGACommonState vga; | ||
22 | |||
23 | int invalidated; | ||
24 | - int depth; | ||
25 | - int bypp; | ||
26 | int enable; | ||
27 | int config; | ||
28 | struct { | ||
29 | @@ -57,9 +55,6 @@ struct vmsvga_state_s { | ||
30 | int new_height; | ||
31 | uint32_t guest; | ||
32 | uint32_t svgaid; | ||
33 | - uint32_t wred; | ||
34 | - uint32_t wgreen; | ||
35 | - uint32_t wblue; | ||
36 | int syncing; | ||
37 | |||
38 | MemoryRegion fifo_ram; | ||
39 | @@ -723,25 +718,25 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address) | ||
40 | return SVGA_MAX_HEIGHT; | ||
41 | |||
42 | case SVGA_REG_DEPTH: | ||
43 | - return s->depth; | ||
44 | + return ds_get_depth(s->vga.ds); | ||
45 | |||
46 | case SVGA_REG_BITS_PER_PIXEL: | ||
47 | - return (s->depth + 7) & ~7; | ||
48 | + return ds_get_bits_per_pixel(s->vga.ds); | ||
49 | |||
50 | case SVGA_REG_PSEUDOCOLOR: | ||
51 | return 0x0; | ||
52 | |||
53 | case SVGA_REG_RED_MASK: | ||
54 | - return s->wred; | ||
55 | + return ds_get_rmask(s->vga.ds); | ||
56 | |||
57 | case SVGA_REG_GREEN_MASK: | ||
58 | - return s->wgreen; | ||
59 | + return ds_get_gmask(s->vga.ds); | ||
60 | |||
61 | case SVGA_REG_BLUE_MASK: | ||
62 | - return s->wblue; | ||
63 | + return ds_get_bmask(s->vga.ds); | ||
64 | |||
65 | case SVGA_REG_BYTES_PER_LINE: | ||
66 | - return s->bypp * s->new_width; | ||
67 | + return ds_get_bytes_per_pixel(s->vga.ds) * s->new_width; | ||
68 | |||
69 | case SVGA_REG_FB_START: { | ||
70 | struct pci_vmsvga_state_s *pci_vmsvga | ||
71 | @@ -806,7 +801,7 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address) | ||
72 | return s->cursor.on; | ||
73 | |||
74 | case SVGA_REG_HOST_BITS_PER_PIXEL: | ||
75 | - return (s->depth + 7) & ~7; | ||
76 | + return ds_get_bits_per_pixel(s->vga.ds); | ||
77 | |||
78 | case SVGA_REG_SCRATCH_SIZE: | ||
79 | return s->scratch_size; | ||
80 | @@ -869,7 +864,7 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) | ||
81 | break; | ||
82 | |||
83 | case SVGA_REG_BITS_PER_PIXEL: | ||
84 | - if (value != s->depth) { | ||
85 | + if (value != ds_get_bits_per_pixel(s->vga.ds)) { | ||
86 | printf("%s: Bad bits per pixel: %i bits\n", __func__, value); | ||
87 | s->config = 0; | ||
88 | } | ||
89 | @@ -1089,7 +1084,7 @@ static const VMStateDescription vmstate_vmware_vga_internal = { | ||
90 | .minimum_version_id_old = 0, | ||
91 | .post_load = vmsvga_post_load, | ||
92 | .fields = (VMStateField[]) { | ||
93 | - VMSTATE_INT32_EQUAL(depth, struct vmsvga_state_s), | ||
94 | + VMSTATE_UNUSED(4), /* was depth */ | ||
95 | VMSTATE_INT32(enable, struct vmsvga_state_s), | ||
96 | VMSTATE_INT32(config, struct vmsvga_state_s), | ||
97 | VMSTATE_INT32(cursor.id, struct vmsvga_state_s), | ||
98 | @@ -1142,13 +1137,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, | ||
99 | vga_common_init(&s->vga); | ||
100 | vga_init(&s->vga, address_space, io, true); | ||
101 | vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); | ||
102 | - /* Save some values here in case they are changed later. | ||
103 | - * This is suspicious and needs more though why it is needed. */ | ||
104 | - s->depth = ds_get_bits_per_pixel(s->vga.ds); | ||
105 | - s->bypp = ds_get_bytes_per_pixel(s->vga.ds); | ||
106 | - s->wred = ds_get_rmask(s->vga.ds); | ||
107 | - s->wgreen = ds_get_gmask(s->vga.ds); | ||
108 | - s->wblue = ds_get_bmask(s->vga.ds); | ||
109 | } | ||
110 | |||
111 | static uint64_t vmsvga_io_read(void *opaque, hwaddr addr, unsigned size) | ||
112 | -- | ||
113 | 1.7.11.7 | ||
114 | |||
diff --git a/meta/recipes-devtools/qemu/files/arm-bgr.patch b/meta/recipes-devtools/qemu/files/arm-bgr.patch deleted file mode 100644 index f3ebde6364..0000000000 --- a/meta/recipes-devtools/qemu/files/arm-bgr.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | After kernel commit: | ||
2 | |||
3 | http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.0/commit/?h=meta&id=9728c1b6a724daefc413b44e10253cdbb5e06d08 | ||
4 | |||
5 | It appears that the emulated colours in qemu are incorrect and that | ||
6 | the red and blue channels are reversed. This patch reverses that logic | ||
7 | so the colours are correctly displayed on the versatile platform which | ||
8 | doesn't support the BGR bit. | ||
9 | |||
10 | RP 16/9/2011 | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Index: qemu-1.2.0/hw/pl110.c | ||
15 | =================================================================== | ||
16 | --- qemu-1.2.0.orig/hw/pl110.c 2012-09-06 14:07:27.619821133 -0700 | ||
17 | +++ qemu-1.2.0/hw/pl110.c 2012-09-06 14:12:07.699829648 -0700 | ||
18 | @@ -168,7 +168,11 @@ | ||
19 | fprintf(stderr, "pl110: Bad color depth\n"); | ||
20 | exit(1); | ||
21 | } | ||
22 | - if (s->cr & PL110_CR_BGR) | ||
23 | + | ||
24 | + if (s->version && s->bpp == BPP_16) | ||
25 | + /* Code assumes BPP_16 == 565 and BGR is never set on the versatile in 565 mode */ | ||
26 | + bpp_offset = 0; | ||
27 | + else if (s->cr & PL110_CR_BGR) | ||
28 | bpp_offset = 0; | ||
29 | else | ||
30 | bpp_offset = 24; | ||
diff --git a/meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch b/meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch deleted file mode 100644 index 2075386b9f..0000000000 --- a/meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 13 May 2010 12:23:40 +0200 | ||
4 | Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/mmap_min_addr cannot be read | ||
5 | |||
6 | * 65536 is default at least for ubuntu and fedora. | ||
7 | --- | ||
8 | linux-user/main.c | 5 +++++ | ||
9 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Index: qemu-0.14.0/linux-user/main.c | ||
14 | =================================================================== | ||
15 | --- qemu-0.14.0.orig/linux-user/main.c | ||
16 | +++ qemu-0.14.0/linux-user/main.c | ||
17 | @@ -36,6 +36,7 @@ | ||
18 | #include "envlist.h" | ||
19 | |||
20 | #define DEBUG_LOGFILE "/tmp/qemu.log" | ||
21 | +#define MMAP_MIN_ADDR_DEFAULT 65536 | ||
22 | |||
23 | char *exec_path; | ||
24 | |||
25 | @@ -3010,8 +3011,14 @@ int main(int argc, char **argv, char **e | ||
26 | if (fscanf(fp, "%lu", &tmp) == 1) { | ||
27 | mmap_min_addr = tmp; | ||
28 | qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr); | ||
29 | + } else { | ||
30 | + qemu_log("cannot read value from /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT); | ||
31 | + mmap_min_addr = MMAP_MIN_ADDR_DEFAULT; | ||
32 | } | ||
33 | fclose(fp); | ||
34 | + } else { | ||
35 | + qemu_log("cannot open /proc/sys/vm/mmap_min_addr for reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT); | ||
36 | + mmap_min_addr = MMAP_MIN_ADDR_DEFAULT; | ||
37 | } | ||
38 | } | ||
39 | |||
diff --git a/meta/recipes-devtools/qemu/files/linker-flags.patch b/meta/recipes-devtools/qemu/files/linker-flags.patch deleted file mode 100644 index 0106ae2420..0000000000 --- a/meta/recipes-devtools/qemu/files/linker-flags.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Fedora 13 switched the default behaviour of the linker to no longer | ||
2 | indirectly link to required libraries (i.e. dependencies of a library | ||
3 | already linked to). Therefore we need to explicitly pass the depended on | ||
4 | libraries into the linker for building to work on Fedora 13. | ||
5 | |||
6 | More information is available on the Fedora Wiki: | ||
7 | https://fedoraproject.org/wiki/UnderstandingDSOLinkChange | ||
8 | |||
9 | JL - 15/06/10 | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Index: qemu-1.2.0/Makefile.target | ||
14 | =================================================================== | ||
15 | --- qemu-1.2.0.orig/Makefile.target 2012-09-05 07:03:06.000000000 -0700 | ||
16 | +++ qemu-1.2.0/Makefile.target 2012-09-06 13:42:24.819764288 -0700 | ||
17 | @@ -130,7 +130,7 @@ | ||
18 | obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o | ||
19 | obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o | ||
20 | obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o | ||
21 | -LIBS+=-lz | ||
22 | +LIBS+=-lz -lX11 -ldl | ||
23 | |||
24 | QEMU_CFLAGS += $(VNC_TLS_CFLAGS) | ||
25 | QEMU_CFLAGS += $(VNC_SASL_CFLAGS) | ||
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 0a7dc4ed2c..7caef6e9a3 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -20,13 +20,8 @@ SDL_class-nativesdk ?= "" | |||
20 | SRC_URI = "\ | 20 | SRC_URI = "\ |
21 | file://powerpc_rom.bin \ | 21 | file://powerpc_rom.bin \ |
22 | file://no-strip.patch \ | 22 | file://no-strip.patch \ |
23 | file://linker-flags.patch \ | ||
24 | file://fix-configure-checks.patch \ | 23 | file://fix-configure-checks.patch \ |
25 | file://fallback-to-safe-mmap_min_addr.patch \ | ||
26 | file://larger_default_ram_size.patch \ | 24 | file://larger_default_ram_size.patch \ |
27 | file://arm-bgr.patch \ | ||
28 | file://Revert-vmware_vga-Add-back-some-info-in-local-state-.patch \ | ||
29 | file://0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch \ | ||
30 | " | 25 | " |
31 | 26 | ||
32 | SRC_URI_append_class-nativesdk = "\ | 27 | SRC_URI_append_class-nativesdk = "\ |
@@ -37,7 +32,7 @@ SRC_URI_append_class-native = "\ | |||
37 | file://fix-libcap-header-issue-on-some-distro.patch \ | 32 | file://fix-libcap-header-issue-on-some-distro.patch \ |
38 | " | 33 | " |
39 | 34 | ||
40 | EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL} --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman" | 35 | EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman" |
41 | 36 | ||
42 | EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ | 37 | EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ |
43 | --disable-curl \ | 38 | --disable-curl \ |
diff --git a/meta/recipes-devtools/qemu/qemu_1.4.1.bb b/meta/recipes-devtools/qemu/qemu_1.5.0.bb index f59d28a1b9..2ea4f12031 100644 --- a/meta/recipes-devtools/qemu/qemu_1.4.1.bb +++ b/meta/recipes-devtools/qemu/qemu_1.5.0.bb | |||
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | |||
6 | SRC_URI += "file://fdt_header.patch" | 6 | SRC_URI += "file://fdt_header.patch" |
7 | 7 | ||
8 | SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" | 8 | SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" |
9 | SRC_URI[md5sum] = "eb2d696956324722b5ecfa46e41f9a75" | 9 | SRC_URI[md5sum] = "b6f3265b8ed39d77e8f354f35cc26e16" |
10 | SRC_URI[sha256sum] = "75063a9326221607de3599e89fb5af80f2d8080ddc55ca253fff113843432df1" | 10 | SRC_URI[sha256sum] = "b22b30ee9712568dfb4eedf76783f4a76546e1cbc41659b909646bcf0b4867bb" |