diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-24 08:18:58 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-24 08:19:58 +0100 |
commit | 824895f14ef1a3a38c0241a13bb452bf940fa638 (patch) | |
tree | bce833bf10a47e646ce317801fcb63f9a803b714 /meta/packages/qemu | |
parent | 01e54ffb42090f0b1769639ccab338a2208386b8 (diff) | |
download | poky-824895f14ef1a3a38c0241a13bb452bf940fa638.tar.gz |
qemu: Enable ppc system emulation and fix ppc build
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/qemu')
-rw-r--r-- | meta/packages/qemu/qemu-0.12.4/fix-nogl.patch | 44 | ||||
-rw-r--r-- | meta/packages/qemu/qemu.inc | 4 | ||||
-rw-r--r-- | meta/packages/qemu/qemu_0.12.4.bb | 2 |
3 files changed, 39 insertions, 11 deletions
diff --git a/meta/packages/qemu/qemu-0.12.4/fix-nogl.patch b/meta/packages/qemu/qemu-0.12.4/fix-nogl.patch index 68efab3a1f..528b6f0d18 100644 --- a/meta/packages/qemu/qemu-0.12.4/fix-nogl.patch +++ b/meta/packages/qemu/qemu-0.12.4/fix-nogl.patch | |||
@@ -1,21 +1,22 @@ | |||
1 | Index: qemu/Makefile.target | 1 | Index: qemu-0.12.4/Makefile.target |
2 | =================================================================== | 2 | =================================================================== |
3 | --- qemu.orig/Makefile.target 2010-05-11 16:53:34.545811866 -0400 | 3 | --- qemu-0.12.4.orig/Makefile.target 2010-06-24 07:59:15.669394205 +0100 |
4 | +++ qemu/Makefile.target 2010-05-11 16:53:37.743809704 -0400 | 4 | +++ qemu-0.12.4/Makefile.target 2010-06-24 08:07:38.739399512 +0100 |
5 | @@ -47,6 +47,9 @@ libobj-$(CONFIG_NOSOFTFLOAT) += fpu/soft | 5 | @@ -47,6 +47,10 @@ |
6 | libobj-y += op_helper.o helper.o | 6 | libobj-y += op_helper.o helper.o |
7 | libobj-$(CONFIG_NEED_MMU) += mmu.o | 7 | libobj-$(CONFIG_NEED_MMU) += mmu.o |
8 | libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o | 8 | libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o |
9 | +libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o | 9 | +libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o |
10 | +libobj-$(TARGET_ARM) += dummygl.o | 10 | +libobj-$(TARGET_ARM) += dummygl.o |
11 | +libobj-$(TARGET_MIPS) += dummygl.o | 11 | +libobj-$(TARGET_MIPS) += dummygl.o |
12 | +libobj-$(TARGET_PPC) += dummygl.o | ||
12 | libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o | 13 | libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o |
13 | libobj-$(TARGET_ALPHA) += alpha_palcode.o | 14 | libobj-$(TARGET_ALPHA) += alpha_palcode.o |
14 | 15 | ||
15 | Index: qemu/target-arm/dummygl.c | 16 | Index: qemu-0.12.4/target-arm/dummygl.c |
16 | =================================================================== | 17 | =================================================================== |
17 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 18 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
18 | +++ qemu/target-arm/dummygl.c 2010-05-11 16:53:37.743809704 -0400 | 19 | +++ qemu-0.12.4/target-arm/dummygl.c 2010-06-24 07:59:15.899401748 +0100 |
19 | @@ -0,0 +1,22 @@ | 20 | @@ -0,0 +1,22 @@ |
20 | +#include <string.h> | 21 | +#include <string.h> |
21 | +#include <stdlib.h> | 22 | +#include <stdlib.h> |
@@ -39,10 +40,37 @@ Index: qemu/target-arm/dummygl.c | |||
39 | +{ | 40 | +{ |
40 | + | 41 | + |
41 | +} | 42 | +} |
42 | Index: qemu/target-mips/dummygl.c | 43 | Index: qemu-0.12.4/target-mips/dummygl.c |
43 | =================================================================== | 44 | =================================================================== |
44 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 45 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
45 | +++ qemu/target-mips/dummygl.c 2010-05-11 16:53:37.744811919 -0400 | 46 | +++ qemu-0.12.4/target-mips/dummygl.c 2010-06-24 07:59:15.899401748 +0100 |
47 | @@ -0,0 +1,22 @@ | ||
48 | +#include <string.h> | ||
49 | +#include <stdlib.h> | ||
50 | +#include <assert.h> | ||
51 | +#include <stdint.h> | ||
52 | +#include <X11/Xlib.h> | ||
53 | +#include <X11/Xutil.h> | ||
54 | + | ||
55 | +void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window) | ||
56 | +{ | ||
57 | + | ||
58 | +} | ||
59 | + | ||
60 | +void opengl_process_enable(void) | ||
61 | +{ | ||
62 | + | ||
63 | +} | ||
64 | + | ||
65 | + | ||
66 | +void mem_opengl(uint64_t ptr) | ||
67 | +{ | ||
68 | + | ||
69 | +} | ||
70 | Index: qemu-0.12.4/target-ppc/dummygl.c | ||
71 | =================================================================== | ||
72 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
73 | +++ qemu-0.12.4/target-ppc/dummygl.c 2010-06-24 08:07:59.070712946 +0100 | ||
46 | @@ -0,0 +1,22 @@ | 74 | @@ -0,0 +1,22 @@ |
47 | +#include <string.h> | 75 | +#include <string.h> |
48 | +#include <stdlib.h> | 76 | +#include <stdlib.h> |
diff --git a/meta/packages/qemu/qemu.inc b/meta/packages/qemu/qemu.inc index c744990d0f..5711596cc2 100644 --- a/meta/packages/qemu/qemu.inc +++ b/meta/packages/qemu/qemu.inc | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "http://qemu.org" | |||
3 | LICENSE = "GPL" | 3 | LICENSE = "GPL" |
4 | DEPENDS = "zlib" | 4 | DEPENDS = "zlib" |
5 | 5 | ||
6 | EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu --disable-werror --disable-vnc-tls" | 6 | EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu,ppc-softmmu --disable-werror --disable-vnc-tls" |
7 | #EXTRA_OECONF += "--disable-sdl" | 7 | #EXTRA_OECONF += "--disable-sdl" |
8 | 8 | ||
9 | inherit autotools | 9 | inherit autotools |
@@ -33,6 +33,6 @@ do_configure() { | |||
33 | SRC_URI_append_virtclass-nativesdk = " file://glflags.patch;patch=1" | 33 | SRC_URI_append_virtclass-nativesdk = " file://glflags.patch;patch=1" |
34 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" | 34 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" |
35 | RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" | 35 | RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" |
36 | EXTRA_OECONF_virtclass-nativesdk = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu --disable-vnc-tls --cross-prefix=${TARGET_PREFIX}" | 36 | EXTRA_OECONF_virtclass-nativesdk = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu,ppc-softmmu --disable-vnc-tls --cross-prefix=${TARGET_PREFIX}" |
37 | 37 | ||
38 | BBCLASSEXTEND = "native nativesdk" | 38 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/packages/qemu/qemu_0.12.4.bb b/meta/packages/qemu/qemu_0.12.4.bb index 79b0749f32..20cc8e8a5a 100644 --- a/meta/packages/qemu/qemu_0.12.4.bb +++ b/meta/packages/qemu/qemu_0.12.4.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require qemu.inc | 1 | require qemu.inc |
2 | 2 | ||
3 | PR = "r14" | 3 | PR = "r15" |
4 | 4 | ||
5 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" | 5 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" |
6 | FILESDIR = "${WORKDIR}" | 6 | FILESDIR = "${WORKDIR}" |