summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-14 16:56:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:47 +0100
commit3939d66849ae4556e15d02bd8ff05a1a0adbb629 (patch)
tree332de78d31c9eaf63e24f8b64f6778926161c732 /meta/recipes-devtools/qemu
parent06d6608a89dde81a0c78f07e4aecbf490b0a94b6 (diff)
downloadpoky-3939d66849ae4556e15d02bd8ff05a1a0adbb629.tar.gz
qemu: Overwrite KVM explicitly for darwin/mingw
Force KVM to disabled on mingw/darwin systems since this makes no sense there. (From OE-Core rev: 0bbafc1e0250bc4df6c6fcc749ab9bbbd7de4a89) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 50f1c06e50..2c4991494d 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -47,12 +47,16 @@ do_configure_prepend_class-nativesdk() {
47 fi 47 fi
48} 48}
49 49
50KVMENABLE = "--enable-kvm"
51KVMENABLE_darwin = "--disable-kvm"
52KVMENABLE_mingw32 = "--disable-kvm"
53
50do_configure() { 54do_configure() {
51 # Handle distros such as CentOS 5 32-bit that do not have kvm support 55 # Handle distros such as CentOS 5 32-bit that do not have kvm support
52 KVMOPTS="--disable-kvm" 56 KVMOPTS="--disable-kvm"
53 if [ "${PN}" != "qemu-native" -a "${PN}" != "nativesdk-qemu" ] \ 57 if [ "${PN}" != "qemu-native" -a "${PN}" != "nativesdk-qemu" ] \
54 || [ -f /usr/include/linux/kvm.h ] ; then 58 || [ -f /usr/include/linux/kvm.h ] ; then
55 KVMOPTS="--enable-kvm" 59 KVMOPTS="${KVMENABLE}"
56 fi 60 fi
57 61
58 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --localstatedir=${localstatedir} --disable-strip ${EXTRA_OECONF} $KVMOPTS 62 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --localstatedir=${localstatedir} --disable-strip ${EXTRA_OECONF} $KVMOPTS