summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu.inc
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-12 18:55:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:26 +0000
commit3a0c5de055d41f964aef8e3e901168114a3dc082 (patch)
treed3378bf2c38bdb29a0edc105e6888338425503b2 /meta/recipes-devtools/qemu/qemu.inc
parent9d4cad3a6b91ed744f2648f60a2d516aae4cc0f3 (diff)
downloadpoky-3a0c5de055d41f964aef8e3e901168114a3dc082.tar.gz
qemu: fix B != S
And bump PR to avoid: Makefile:16: *** This is an out of tree build but your source tree (/path/to/qemu-2.2.0) seems to have been used for an in-tree build. You can fix this by running "make distclean && rm -rf *-linux-user *-softmmu" in your source tree. Stop. (From OE-Core rev: 0ba65934fa1c2a4f4bd3ed404ab9a9163bde5309) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu.inc')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index c9a5d328f9..49415c1250 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -5,9 +5,11 @@ DEPENDS = "glib-2.0 zlib pixman"
5RDEPENDS_${PN}_class-target += "bash python" 5RDEPENDS_${PN}_class-target += "bash python"
6 6
7require qemu-targets.inc 7require qemu-targets.inc
8inherit autotools-brokensep 8inherit autotools
9BBCLASSEXTEND = "native nativesdk" 9BBCLASSEXTEND = "native nativesdk"
10 10
11PR = "r1"
12
11# QEMU_TARGETS is overridable variable 13# QEMU_TARGETS is overridable variable
12QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64" 14QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
13 15
@@ -37,13 +39,13 @@ do_configure_prepend_class-native() {
37 fi 39 fi
38 40
39 # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed 41 # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
40 sed -i 's/-lX11//g' Makefile.target 42 sed -i 's/-lX11//g' ${S}/Makefile.target
41} 43}
42 44
43do_configure_prepend_class-nativesdk() { 45do_configure_prepend_class-nativesdk() {
44 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then 46 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
45 # Undo the -lX11 added by linker-flags.patch 47 # Undo the -lX11 added by linker-flags.patch
46 sed -i 's/-lX11//g' Makefile.target 48 sed -i 's/-lX11//g' ${S}/Makefile.target
47 fi 49 fi
48} 50}
49 51