summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-12-14 16:35:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:43:46 +0000
commitd97ad36d907203e07308c35d8ba27d64079eb375 (patch)
tree5bc93fabf3e678046ea279c715fe2367aedfd921 /meta
parentde7377a170abdc5e925b2d46d445358421c6527d (diff)
downloadpoky-d97ad36d907203e07308c35d8ba27d64079eb375.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) (From OE-Core rev: 44d9e208c97ec1e3c5ba0a8dc6c10cef12dc270d) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc10
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.14.0.bb2
-rw-r--r--meta/recipes-devtools/qemu/qemu_git.bb2
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"
12SDL_virtclass-native ?= "" 12SDL_virtclass-native ?= ""
13SDL_virtclass-nativesdk ?= "" 13SDL_virtclass-nativesdk ?= ""
14 14
15EXTRA_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}" 15EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL}"
16 16
17#EXTRA_OECONF += "--disable-sdl" 17#EXTRA_OECONF += "--disable-sdl"
18 18
@@ -39,7 +39,13 @@ do_configure_prepend_virtclass-native() {
39} 39}
40 40
41do_configure() { 41do_configure() {
42 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} 42 # Handle distros such as CentOS 5 32-bit that do not have kvm support
43 KVMOPTS=""
44 if [ "${PN}" != "qemu-native" ] || [ -f /usr/include/linux/kvm.h ] ; then
45 KVMOPTS="--enable-kvm"
46 fi
47
48 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} $KVMOPTS
43 test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh 49 test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh
44} 50}
45 51
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
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 5
6PR = "r3" 6PR = "r4"
7 7
8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
9FILESDIR = "${WORKDIR}" 9FILESDIR = "${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 \
6 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 6 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
7 7
8PV = "0.14.0" 8PV = "0.14.0"
9PR = "r1" 9PR = "r2"
10 10
11FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" 11FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
12FILESDIR = "${WORKDIR}" 12FILESDIR = "${WORKDIR}"