summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-08-31 16:34:09 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-31 16:48:53 +0100
commit09bffb70def83bbca575e4f5b78b3fc949ebf517 (patch)
tree81931295d913d229620daf6fed175b97f2025419
parent1f0ba7c2b0429909ead5ae8fc015a827b08edf85 (diff)
downloadpoky-09bffb70def83bbca575e4f5b78b3fc949ebf517.tar.gz
Add qemu-i386 in qemu-native, required by eglibc
Adding i386-linux-user in target-list is enough in theory, but our gl stuff is not friendly to linux-user code. So disable it when compiling linux-user. [BUGID #218] fixed by this. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch53
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.12.4.bb3
-rw-r--r--meta/recipes-devtools/qemu/qemu_git.bb5
4 files changed, 59 insertions, 4 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch
new file mode 100644
index 0000000000..550d48b138
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch
@@ -0,0 +1,53 @@
1Enable i386-linux-user
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Index: qemu-0.12.4/Makefile.target
6===================================================================
7--- qemu-0.12.4.orig/Makefile.target 2010-08-31 13:57:01.000000000 +0800
8+++ qemu-0.12.4/Makefile.target 2010-08-31 14:03:06.000000000 +0800
9@@ -46,8 +46,13 @@
10 libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
11 libobj-y += op_helper.o helper.o
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
23Index: qemu-0.12.4/target-i386/dummygl.c
24===================================================================
25--- /dev/null 1970-01-01 00:00:00.000000000 +0000
26+++ qemu-0.12.4/target-i386/dummygl.c 2010-08-31 15:25:25.000000000 +0800
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+}
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 5425aaf4a5..9180be718b 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://qemu.org"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "zlib" 4DEPENDS = "zlib"
5 5
6EXTRA_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" 6EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-linux-user,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
9inherit autotools 9inherit autotools
diff --git a/meta/recipes-devtools/qemu/qemu_0.12.4.bb b/meta/recipes-devtools/qemu/qemu_0.12.4.bb
index c253b03a2f..87fc2cc47a 100644
--- a/meta/recipes-devtools/qemu/qemu_0.12.4.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.12.4.bb
@@ -1,6 +1,6 @@
1require qemu.inc 1require qemu.inc
2 2
3PR = "r16" 3PR = "r17"
4 4
5FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 5FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
6FILESDIR = "${WORKDIR}" 6FILESDIR = "${WORKDIR}"
@@ -17,6 +17,7 @@ SRC_URI = "\
17 file://init-info.patch \ 17 file://init-info.patch \
18 file://qemu-vmware-vga-depth.patch \ 18 file://qemu-vmware-vga-depth.patch \
19 file://qemu-ppc-hack.patch \ 19 file://qemu-ppc-hack.patch \
20 file://enable-i386-linux-user.patch \
20 file://powerpc_rom.bin" 21 file://powerpc_rom.bin"
21 22
22do_install_append () { 23do_install_append () {
diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb
index 00b361063a..9a4823abc4 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -1,7 +1,7 @@
1require qemu.inc 1require qemu.inc
2 2
3PV = "0.12.4" 3PV = "0.12.4"
4PR = "r9" 4PR = "r10"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" 6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
7FILESDIR = "${WORKDIR}" 7FILESDIR = "${WORKDIR}"
@@ -15,7 +15,8 @@ SRC_URI = "\
15 file://fix-nogl.patch \ 15 file://fix-nogl.patch \
16 file://qemugl-allow-glxcontext-release.patch \ 16 file://qemugl-allow-glxcontext-release.patch \
17 file://linker-flags.patch \ 17 file://linker-flags.patch \
18 file://qemu-vmware-vga-depth.patch" 18 file://qemu-vmware-vga-depth.patch \
19 file://enable-i386-linux-user.patch"
19 20
20S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
21 22