[oe-commits] Paul Eggleton : qemu: explicitly disable kvm support for native without kvm header
git at git.openembedded.org
git at git.openembedded.org
Sat Dec 24 10:11:55 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: a922112e197925db47cf02682c08f3af2bc760b4
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a922112e197925db47cf02682c08f3af2bc760b4
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Fri Dec 23 15:57:01 2011 +0000
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).
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-devtools/qemu/qemu.inc | 2 +-
meta/recipes-devtools/qemu/qemu_0.14.0.bb | 2 +-
meta/recipes-devtools/qemu/qemu_0.15.1.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index bd86b4e..33abf96 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -40,7 +40,7 @@ do_configure_prepend_virtclass-native() {
do_configure() {
# Handle distros such as CentOS 5 32-bit that do not have kvm support
- KVMOPTS=""
+ KVMOPTS="--disable-kvm"
if [ "${PN}" != "qemu-native" ] || [ -f /usr/include/linux/kvm.h ] ; then
KVMOPTS="--enable-kvm"
fi
diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
index bc0c16b..a300545 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
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-PR = "r5"
+PR = "r6"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index ae68327..3a6389b 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
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}"
More information about the Openembedded-commits
mailing list