summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-14 18:44:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 14:32:47 +0100
commit04e3654834596f59d5847e4cec44564e2cbdab5f (patch)
tree942a8831f6807757597bb70c26c66b36bc0c4c0e
parente080d8e18e62949c046023962ead58109dc7caef (diff)
downloadpoky-04e3654834596f59d5847e4cec44564e2cbdab5f.tar.gz
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>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc10
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.14.0.bb2
-rw-r--r--meta/recipes-devtools/qemu/qemu_git.bb7
3 files changed, 13 insertions, 6 deletions
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 @@
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" 4DEPENDS = "zlib alsa-lib qemugl"
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"
@@ -16,7 +16,6 @@ EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --di
16 16
17#EXTRA_OECONF += "--disable-sdl" 17#EXTRA_OECONF += "--disable-sdl"
18 18
19COMPATIBLE_MACHINES = "qemux86 qemuppc"
20 19
21inherit autotools 20inherit autotools
22 21
@@ -43,9 +42,14 @@ do_configure() {
43 chmod a+x ${S}/target-i386/beginend_funcs.sh 42 chmod a+x ${S}/target-i386/beginend_funcs.sh
44} 43}
45 44
46SRC_URI_append_virtclass-nativesdk = " file://glflags.patch;patch=1" 45SRC_URI_append_virtclass-nativesdk = " file://glflags.patch"
46DEPENDS_virtclass-native = "zlib-native alsa-lib-native"
47DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" 47DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk"
48RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" 48RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
49EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls" 49EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls"
50 50
51BBCLASSEXTEND = "native nativesdk" 51BBCLASSEXTEND = "native nativesdk"
52
53# Qemu target will not build in world build for ARM or Mips
54BROKEN_qemuarm = "1"
55BROKEN_qemumips = "1"
diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
index f0a4beae1c..ccf5ee4f2d 100644
--- a/meta/recipes-devtools/qemu/qemu_0.14.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
@@ -3,7 +3,7 @@ require qemu.inc
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 5
6PR = "r1" 6PR = "r2"
7 7
8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
9FILESDIR = "${WORKDIR}" 9FILESDIR = "${WORKDIR}"
diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb
index 2d6a8bdd65..59fc7f1396 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -5,8 +5,8 @@ SRCREV = "56a60dd6d619877e9957ba06b92d2f276e3c229d"
5LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
6 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 6 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
7 7
8PV = "0.14" 8PV = "0.14.0"
9PR = "r0" 9PR = "r1"
10 10
11FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" 11FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
12FILESDIR = "${WORKDIR}" 12FILESDIR = "${WORKDIR}"
@@ -23,3 +23,6 @@ SRC_URI = "\
23 23
24S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"
25 25
26DEFAULT_PREFERENCE = "-1"
27
28