summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-12-23 15:57:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-24 10:05:43 +0000
commit1090bc49da410188b8e0cb2851dd9cff3be40cf6 (patch)
treea83adeb633bada5648cc5c6dfdcb2dd5d2caf0b4 /meta/recipes-devtools
parentd350b3168bab234e326c8cf1609d13803e6aba9e (diff)
downloadpoky-1090bc49da410188b8e0cb2851dd9cff3be40cf6.tar.gz
qemu: explicitly disable kvm support for native without kvm header
Addendum to previous fix - instead of just not specifying --enable-kvm, explicitly specify --disable-kvm when building native version and kvm header is unavailable. Fixes reported do_configure failure on earlier CentOS 5.x versions (e.g. 5.4). (From OE-Core rev: a922112e197925db47cf02682c08f3af2bc760b4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.14.0.bb2
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.15.1.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index bd86b4e9cf..33abf96f6c 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -40,7 +40,7 @@ do_configure_prepend_virtclass-native() {
40 40
41do_configure() { 41do_configure() {
42 # Handle distros such as CentOS 5 32-bit that do not have kvm support 42 # Handle distros such as CentOS 5 32-bit that do not have kvm support
43 KVMOPTS="" 43 KVMOPTS="--disable-kvm"
44 if [ "${PN}" != "qemu-native" ] || [ -f /usr/include/linux/kvm.h ] ; then 44 if [ "${PN}" != "qemu-native" ] || [ -f /usr/include/linux/kvm.h ] ; then
45 KVMOPTS="--enable-kvm" 45 KVMOPTS="--enable-kvm"
46 fi 46 fi
diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
index bc0c16bfcd..a3005450a1 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 = "r5" 6PR = "r6"
7 7
8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
9FILESDIR = "${WORKDIR}" 9FILESDIR = "${WORKDIR}"
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index ae683273b4..3a6389b8af 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.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}"