diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-12-14 16:35:11 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:39:05 +0000 |
| commit | 44d9e208c97ec1e3c5ba0a8dc6c10cef12dc270d (patch) | |
| tree | 28c4576c8ee6ba358145657e59e44582d16a1fcd | |
| parent | c3ba7e8f7aca8b49739b3b92aec723c5f3375bc0 (diff) | |
| download | openembedded-core-44d9e208c97ec1e3c5ba0a8dc6c10cef12dc270d.tar.gz | |
qemu: for native, do not fail if kvm is unavailable
When building qemu-native, if the linux kvm header is unavailable (as
it is on CentOS 5.x 32-bit) then do not pass the --enable-kvm switch to
the configure script, thus avoiding failed do_configure.
(From OE-Core rev: 8c21c71f005b601f58925e9912f2cf44127e291d)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 10 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_0.14.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_git.bb | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 86c7d2c1fa..58049b98f3 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -12,7 +12,7 @@ SDL ?= "--disable-sdl" SDL_virtclass-native ?= "" SDL_virtclass-nativesdk ?= "" -EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --enable-kvm --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL}" +EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL}" #EXTRA_OECONF += "--disable-sdl" @@ -39,7 +39,13 @@ do_configure_prepend_virtclass-native() { } do_configure() { - ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} + # Handle distros such as CentOS 5 32-bit that do not have kvm support + KVMOPTS="" + if [ "${PN}" != "qemu-native" ] || [ -f /usr/include/linux/kvm.h ] ; then + KVMOPTS="--enable-kvm" + fi + + ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} $KVMOPTS test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh } diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb index 03519ad7d4..5a0cd55bb9 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 = "r3" +PR = "r4" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}" diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb index 59fc7f1396..3b4369b782 100644 --- a/meta/recipes-devtools/qemu/qemu_git.bb +++ b/meta/recipes-devtools/qemu/qemu_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" PV = "0.14.0" -PR = "r1" +PR = "r2" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" FILESDIR = "${WORKDIR}" |