mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
1f0ba7c2b0
commit
09bffb70de
@@ -0,0 +1,53 @@
|
|||||||
|
Enable i386-linux-user
|
||||||
|
|
||||||
|
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
|
||||||
|
|
||||||
|
Index: qemu-0.12.4/Makefile.target
|
||||||
|
===================================================================
|
||||||
|
--- qemu-0.12.4.orig/Makefile.target 2010-08-31 13:57:01.000000000 +0800
|
||||||
|
+++ qemu-0.12.4/Makefile.target 2010-08-31 14:03:06.000000000 +0800
|
||||||
|
@@ -46,8 +46,13 @@
|
||||||
|
libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
|
||||||
|
libobj-y += op_helper.o helper.o
|
||||||
|
libobj-$(CONFIG_NEED_MMU) += mmu.o
|
||||||
|
+ifndef CONFIG_LINUX_USER
|
||||||
|
libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
|
||||||
|
libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
|
||||||
|
+else
|
||||||
|
+libobj-$(TARGET_I386) += dummygl.o
|
||||||
|
+libobj-$(TARGET_X86_64) += dummygl.o
|
||||||
|
+endif #CONFIG_LINUX_USER
|
||||||
|
libobj-$(TARGET_ARM) += dummygl.o
|
||||||
|
libobj-$(TARGET_MIPS) += dummygl.o
|
||||||
|
libobj-$(TARGET_PPC) += dummygl.o
|
||||||
|
Index: qemu-0.12.4/target-i386/dummygl.c
|
||||||
|
===================================================================
|
||||||
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||||
|
+++ qemu-0.12.4/target-i386/dummygl.c 2010-08-31 15:25:25.000000000 +0800
|
||||||
|
@@ -0,0 +1,26 @@
|
||||||
|
+#include <string.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+#include <assert.h>
|
||||||
|
+#include <stdint.h>
|
||||||
|
+#include <X11/Xlib.h>
|
||||||
|
+#include <X11/Xutil.h>
|
||||||
|
+
|
||||||
|
+void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window)
|
||||||
|
+{
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void opengl_process_enable(void)
|
||||||
|
+{
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+void mem_opengl(uint64_t ptr)
|
||||||
|
+{
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void helper_opengl(void)
|
||||||
|
+{
|
||||||
|
+}
|
||||||
@@ -3,7 +3,7 @@ HOMEPAGE = "http://qemu.org"
|
|||||||
LICENSE = "GPL"
|
LICENSE = "GPL"
|
||||||
DEPENDS = "zlib"
|
DEPENDS = "zlib"
|
||||||
|
|
||||||
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"
|
EXTRA_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"
|
||||||
#EXTRA_OECONF += "--disable-sdl"
|
#EXTRA_OECONF += "--disable-sdl"
|
||||||
|
|
||||||
inherit autotools
|
inherit autotools
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require qemu.inc
|
require qemu.inc
|
||||||
|
|
||||||
PR = "r16"
|
PR = "r17"
|
||||||
|
|
||||||
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
|
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
|
||||||
FILESDIR = "${WORKDIR}"
|
FILESDIR = "${WORKDIR}"
|
||||||
@@ -17,6 +17,7 @@ SRC_URI = "\
|
|||||||
file://init-info.patch \
|
file://init-info.patch \
|
||||||
file://qemu-vmware-vga-depth.patch \
|
file://qemu-vmware-vga-depth.patch \
|
||||||
file://qemu-ppc-hack.patch \
|
file://qemu-ppc-hack.patch \
|
||||||
|
file://enable-i386-linux-user.patch \
|
||||||
file://powerpc_rom.bin"
|
file://powerpc_rom.bin"
|
||||||
|
|
||||||
do_install_append () {
|
do_install_append () {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
require qemu.inc
|
require qemu.inc
|
||||||
|
|
||||||
PV = "0.12.4"
|
PV = "0.12.4"
|
||||||
PR = "r9"
|
PR = "r10"
|
||||||
|
|
||||||
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
|
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
|
||||||
FILESDIR = "${WORKDIR}"
|
FILESDIR = "${WORKDIR}"
|
||||||
@@ -15,7 +15,8 @@ SRC_URI = "\
|
|||||||
file://fix-nogl.patch \
|
file://fix-nogl.patch \
|
||||||
file://qemugl-allow-glxcontext-release.patch \
|
file://qemugl-allow-glxcontext-release.patch \
|
||||||
file://linker-flags.patch \
|
file://linker-flags.patch \
|
||||||
file://qemu-vmware-vga-depth.patch"
|
file://qemu-vmware-vga-depth.patch \
|
||||||
|
file://enable-i386-linux-user.patch"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user