summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-17 11:30:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-17 14:08:40 +0100
commitad229f81f4b1722ee3785a31f27b7afe81feed20 (patch)
treebc6c3a087f596c1ada745705d166efdde8ae2a11
parent1e190eef71376fb0ad89c1a661009d9fb46a7d58 (diff)
downloadpoky-ad229f81f4b1722ee3785a31f27b7afe81feed20.tar.gz
poky-ad229f81f4b1722ee3785a31f27b7afe81feed20.tar.bz2
poky-ad229f81f4b1722ee3785a31f27b7afe81feed20.zip
qemu: Disable curl explicitly, its not in DEPENDS
There is an error when build meta-toolchain-sdk on Ubuntu 10.10: | Installing NATIVESDK packages | Processing task-sdk-host-nativesdk... | Processing task-cross-canadian-mips... | error: Failed dependencies: | libcurl.so.4 is needed by qemu-nativesdk-0.15.1-r5.i686 NOTE: package meta-toolchain-gmae-1.0-r7: task do_populate_sdk: Failed ERROR: Task 21 (/buildarea2/lyang1/poky/meta/recipes-core/meta/meta-toolchain-gmae.bb, do_populate_sdk) failed with exit code '1' This is because qemu would depend on curl if it happened to be available at build time and could confuse the -native and -nativesdk librbaries. [YOCTO #2305] (From OE-Core rev: 566ad643efd03db34b59a427f48ca55ce613cf89) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 8dee060338..93325c3bab 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 --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} --disable-curl"
#EXTRA_OECONF += "--disable-sdl"