From 047db049234854b0f21db462d13176e2b5cf70de Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 13 Aug 2012 21:01:16 +0800 Subject: qemu.inc: disable curl for qemu-nativesdk We had added the --disable-curl to EXTRA_OECONF, but there is an EXTRA_OECONF_virtclass-nativesdk += "foo", the "EXTRA_OECONF_virtclass-nativesdk +=" equals to "EXTRA_OECONF_virtclass-nativesdk =" (the "+" has no effect here), so we should add the "--disable-curl" to EXTRA_OECONF_virtclass-nativesdk. And change the "+=" to "=" to not confuse people. [YOCTO #2305] (From OE-Core rev: a69df1807af3e099685b766dac4d6c6919b01852) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 4 +++- meta/recipes-devtools/qemu/qemu_0.15.1.bb | 2 +- meta/recipes-devtools/qemu/qemu_git.bb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index f9368f3485..bf41b3bdfb 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -45,7 +45,9 @@ DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk \ ${@base_contains('DISTRO_FEATURES', 'x11', 'qemugl-nativesdk', '', d)}" RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" -EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls" +EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ + --disable-curl \ + " BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb index 983e8314e1..7b862ed0dd 100644 --- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb +++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb @@ -3,7 +3,7 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -PR = "r10" +PR = "r11" 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 bcec9bba8c..6d5e2507e7 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 = "r3" +PR = "r4" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" FILESDIR = "${WORKDIR}" -- cgit v1.2.3-54-g00ecf