summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-08-11 15:13:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-17 15:14:55 +0100
commit5440cb560d43c585a67a86684a05c8743e947a6b (patch)
tree15234b97b26de089c605cb2b9952d792c1379b0c
parent2df547206ab58632d1b770b97fa3178d00314a77 (diff)
downloadpoky-5440cb560d43c585a67a86684a05c8743e947a6b.tar.gz
qemu: Make qemu buildable inside qemux86/qemuppc target
It requires libx11 and libGL(if enabled GL) for building, which introduce extra dependence in qemuppc target. Futhermore, qemu's GL code is x86-oriented, thus some hacks needed for building in qemupcc. For simplicity, just make qemu GL's code for native only, so that qemu building is okay in world build. [YOCTO #1011] got fixed. (From OE-Core rev: e744d4e2d33d914b2ca31be2d4eadab9fbcc3251) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc5
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.14.0.bb24
2 files changed, 21 insertions, 8 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 85476d6d93..e5414ff7f7 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -1,7 +1,7 @@
1DESCRIPTION = "open source processor emulator" 1DESCRIPTION = "open source processor emulator"
2HOMEPAGE = "http://qemu.org" 2HOMEPAGE = "http://qemu.org"
3LICENSE = "GPLv2 & LGPLv2.1" 3LICENSE = "GPLv2 & LGPLv2.1"
4DEPENDS = "zlib alsa-lib qemugl" 4DEPENDS = "zlib alsa-lib virtual/libx11"
5 5
6# QEMU_TARGETS is overridable variable 6# QEMU_TARGETS is overridable variable
7QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64" 7QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
@@ -40,7 +40,7 @@ do_configure_prepend_virtclass-native() {
40 40
41do_configure() { 41do_configure() {
42 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} 42 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF}
43 chmod a+x ${S}/target-i386/beginend_funcs.sh 43 test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh
44} 44}
45 45
46do_install () { 46do_install () {
@@ -50,7 +50,6 @@ do_install () {
50 install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu 50 install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu
51} 51}
52 52
53SRC_URI_append_virtclass-nativesdk = " file://glflags.patch"
54DEPENDS_virtclass-native = "zlib-native alsa-lib-native" 53DEPENDS_virtclass-native = "zlib-native alsa-lib-native"
55DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" 54DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk"
56RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" 55RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
index de12f62072..055321ec3e 100644
--- a/meta/recipes-devtools/qemu/qemu_0.14.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
@@ -11,22 +11,36 @@ FILESDIR = "${WORKDIR}"
11SRC_URI = "\ 11SRC_URI = "\
12 http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \ 12 http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \
13 file://powerpc_rom.bin \ 13 file://powerpc_rom.bin \
14 file://qemu-git-qemugl-host.patch \
15 file://no-strip.patch \ 14 file://no-strip.patch \
16 file://fix-nogl.patch \
17 file://qemugl-allow-glxcontext-release.patch \
18 file://linker-flags.patch \ 15 file://linker-flags.patch \
19 file://init-info.patch \
20 file://qemu-vmware-vga-depth.patch \ 16 file://qemu-vmware-vga-depth.patch \
21 file://enable-i386-linux-user.patch \
22 file://fix-configure-checks.patch \ 17 file://fix-configure-checks.patch \
23 file://fallback-to-safe-mmap_min_addr.patch \ 18 file://fallback-to-safe-mmap_min_addr.patch \
24 file://spice-qxl-locking-fix-for-qemu-kvm.patch \ 19 file://spice-qxl-locking-fix-for-qemu-kvm.patch \
25 file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \ 20 file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \
26 file://larger_default_ram_size.patch \ 21 file://larger_default_ram_size.patch \
22 "
23
24# Only use the GL passthrough patches for native/nativesdk versions
25QEMUGLPATCHES = "\
26 file://qemu-git-qemugl-host.patch \
27 file://fix-nogl.patch \
28 file://qemugl-allow-glxcontext-release.patch \
29 file://init-info.patch \
30 file://enable-i386-linux-user.patch \
27 file://qemugl-fix.patch \ 31 file://qemugl-fix.patch \
28 file://opengl-sdl-fix.patch \ 32 file://opengl-sdl-fix.patch \
29 " 33 "
34
35SRC_URI_append_virtclass-native = "\
36 ${QEMUGLPATCHES} \
37 "
38
39SRC_URI_append_virtclass-nativesdk = "\
40 ${QEMUGLPATCHES} \
41 file://glflags.patch \
42 "
43
30SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970" 44SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970"
31SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108" 45SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108"
32 46