Fix reported issue with CentOS 5.4

Chris Larson reported that the previous fix to automatically disable kvm support in qemu-native didn't work for him on CentOS 5.4 - he needed to explicitly add --disable-kvm rather than just omit --enable-kvm. Although 5.4 is quite old by now if it doesn't cause any harm (and it causes no ill effects on CentOS 5.7) given the trivial nature of the patch I figured it was worthwhile.

The following changes since commit c38693f78c968ab5f4bb557c20d1c8c55393ed6b:

opkg: Fix installation order in feeds with mutiple providers of packages (2011-12-22 22:38:09 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/qemu-kvm2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qemu-kvm2

Paul Eggleton (1):
qemu: explicitly disable kvm support for native without kvm header

 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(-)

1.7.5.4

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).

---
 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(-)

index bd86b4e..33abf96 100644
@@ -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

index bc0c16b..a300545 100644
@@ -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}"

index ae68327..3a6389b 100644
@@ -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}"

1.7.5.4