From 1bedd7f3d73c2f9f179f4de4bfaea944a18e49b5 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sat, 14 May 2011 18:44:36 -0700 Subject: qemu: Fix Dependency and compatible machines add DEFAULT_PREFERENCE = "-1" to disable git recipe Added libx11 for GL support to DEPENDS Use BROKEN to disable qemuarm and qemumips world build of qemu target Signed-off-by: Saul Wold --- meta/recipes-devtools/qemu/qemu.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/qemu/qemu.inc') diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 49bcf8e939..18073eb4fc 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -1,7 +1,7 @@ DESCRIPTION = "open source processor emulator" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" -DEPENDS = "zlib alsa-lib" +DEPENDS = "zlib alsa-lib qemugl" # QEMU_TARGETS is overridable variable QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64" @@ -16,7 +16,6 @@ EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --di #EXTRA_OECONF += "--disable-sdl" -COMPATIBLE_MACHINES = "qemux86 qemuppc" inherit autotools @@ -43,9 +42,14 @@ do_configure() { chmod a+x ${S}/target-i386/beginend_funcs.sh } -SRC_URI_append_virtclass-nativesdk = " file://glflags.patch;patch=1" +SRC_URI_append_virtclass-nativesdk = " file://glflags.patch" +DEPENDS_virtclass-native = "zlib-native alsa-lib-native" DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls" BBCLASSEXTEND = "native nativesdk" + +# Qemu target will not build in world build for ARM or Mips +BROKEN_qemuarm = "1" +BROKEN_qemumips = "1" -- cgit 1.2.3-korg