summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-08-13 13:01:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-13 19:10:30 (GMT)
commit047db049234854b0f21db462d13176e2b5cf70de (patch)
tree8ff1f3f38872eb123ed34488e6b4be5928abd6ac
parent2dec760b79bb7e2e79c33c5127fa64685bd86a18 (diff)
downloadpoky-047db049234854b0f21db462d13176e2b5cf70de.tar.gz
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 <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc4
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.15.1.bb2
-rw-r--r--meta/recipes-devtools/qemu/qemu_git.bb2
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index f9368f3..bf41b3b 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"
45DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk \ 45DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk \
46 ${@base_contains('DISTRO_FEATURES', 'x11', 'qemugl-nativesdk', '', d)}" 46 ${@base_contains('DISTRO_FEATURES', 'x11', 'qemugl-nativesdk', '', d)}"
47RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" 47RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
48EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls" 48EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
49 --disable-curl \
50 "
49 51
50BBCLASSEXTEND = "native nativesdk" 52BBCLASSEXTEND = "native nativesdk"
51 53
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index 983e831..7b862ed 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
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 = "r10" 6PR = "r11"
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 bcec9bb..6d5e250 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 = "r3" 9PR = "r4"
10 10
11FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" 11FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
12FILESDIR = "${WORKDIR}" 12FILESDIR = "${WORKDIR}"