summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYao Zhao <yao.zhao@windriver.com>2012-07-17 20:44:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-18 17:46:53 +0100
commit63f545b850ea4118a7e9e412aa8a22206dc7da8c (patch)
tree7a417f466db23fdc4e6659bd52c78d8ac1b1c4c9 /meta
parent856019774bbe903833fd9ae9103c71351d773097 (diff)
downloadpoky-63f545b850ea4118a7e9e412aa8a22206dc7da8c.tar.gz
qemu-nativesdk: fix the build failure that linux/kvm.h not found
qemu.inc: on older kernel build hosts that have < 2.6.20 which doesn't support kvm yet, build will fail. Add a check in do_configure to make sure whether linux/kvm.h exists for nativesdk build. (From OE-Core rev: 7d49af3a811472a2a47453bef0813b89c6331ae7) Signed-off-by: Yao Zhao <yao.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index e618c1d6e1..f9368f3485 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -22,8 +22,9 @@ inherit autotools
22do_configure() { 22do_configure() {
23 # Handle distros such as CentOS 5 32-bit that do not have kvm support 23 # Handle distros such as CentOS 5 32-bit that do not have kvm support
24 KVMOPTS="--disable-kvm" 24 KVMOPTS="--disable-kvm"
25 if [ "${PN}" != "qemu-native" ] || [ -f /usr/include/linux/kvm.h ] ; then 25 if [ "${PN}" != "qemu-native" -a "${PN}" != "qemu-nativesdk" ] \
26 KVMOPTS="--enable-kvm" 26 || [ -f /usr/include/linux/kvm.h ] ; then
27 KVMOPTS="--enable-kvm"
27 fi 28 fi
28 29
29 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} $KVMOPTS 30 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} $KVMOPTS