diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2011-05-10 14:02:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 16:48:21 +0100 |
commit | a2e232e2313ee267076bb8de32a1a604dbebc33b (patch) | |
tree | 0bd71628aa88c9975d1fe031609558e26ca9164b /meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch | |
parent | 7f7de31e9caa1594f2175f90f8faa96a88627329 (diff) | |
download | poky-a2e232e2313ee267076bb8de32a1a604dbebc33b.tar.gz |
qemu: Upgrade qemu git to the latest 0.14 branch
Also add missing patch to build qemu-git
[YOCTO #1013] got fixed
(From OE-Core rev: 9b80846152931bed018f33baaaf1ba253e756867)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch new file mode 100644 index 0000000000..3cf0953f10 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | Enable i386-linux-user | ||
2 | |||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
4 | |||
5 | Index: qemu-0.14.0/Makefile.target | ||
6 | =================================================================== | ||
7 | --- qemu-0.14.0.orig/Makefile.target | ||
8 | +++ qemu-0.14.0/Makefile.target | ||
9 | @@ -78,8 +78,13 @@ ifeq ($(TARGET_BASE_ARCH), i386) | ||
10 | libobj-y += cpuid.o | ||
11 | endif | ||
12 | libobj-$(CONFIG_NEED_MMU) += mmu.o | ||
13 | +ifndef CONFIG_LINUX_USER | ||
14 | libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o | ||
15 | libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o | ||
16 | +else | ||
17 | +libobj-$(TARGET_I386) += dummygl.o | ||
18 | +libobj-$(TARGET_X86_64) += dummygl.o | ||
19 | +endif #CONFIG_LINUX_USER | ||
20 | libobj-$(TARGET_ARM) += dummygl.o | ||
21 | libobj-$(TARGET_MIPS) += dummygl.o | ||
22 | libobj-$(TARGET_PPC) += dummygl.o | ||
23 | Index: qemu-0.14.0/target-i386/dummygl.c | ||
24 | =================================================================== | ||
25 | --- /dev/null | ||
26 | +++ qemu-0.14.0/target-i386/dummygl.c | ||
27 | @@ -0,0 +1,26 @@ | ||
28 | +#include <string.h> | ||
29 | +#include <stdlib.h> | ||
30 | +#include <assert.h> | ||
31 | +#include <stdint.h> | ||
32 | +#include <X11/Xlib.h> | ||
33 | +#include <X11/Xutil.h> | ||
34 | + | ||
35 | +void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window) | ||
36 | +{ | ||
37 | + | ||
38 | +} | ||
39 | + | ||
40 | +void opengl_process_enable(void) | ||
41 | +{ | ||
42 | + | ||
43 | +} | ||
44 | + | ||
45 | + | ||
46 | +void mem_opengl(uint64_t ptr) | ||
47 | +{ | ||
48 | + | ||
49 | +} | ||
50 | + | ||
51 | +void helper_opengl(void) | ||
52 | +{ | ||
53 | +} | ||