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

(From OE-Core rev: 1bedd7f3d73c2f9f179f4de4bfaea944a18e49b5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2011-05-14 18:44:36 -07:00 committed by Richard Purdie
parent e080d8e18e
commit 04e3654834
3 changed files with 13 additions and 6 deletions

View File

@ -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"

View File

@ -3,7 +3,7 @@ require qemu.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
PR = "r1"
PR = "r2"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"

View File

@ -5,8 +5,8 @@ SRCREV = "56a60dd6d619877e9957ba06b92d2f276e3c229d"
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
PV = "0.14"
PR = "r0"
PV = "0.14.0"
PR = "r1"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
FILESDIR = "${WORKDIR}"
@ -23,3 +23,6 @@ SRC_URI = "\
S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"