diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-12 18:55:19 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:08:26 +0000 |
commit | 3a0c5de055d41f964aef8e3e901168114a3dc082 (patch) | |
tree | d3378bf2c38bdb29a0edc105e6888338425503b2 | |
parent | 9d4cad3a6b91ed744f2648f60a2d516aae4cc0f3 (diff) | |
download | ast2050-yocto-poky-3a0c5de055d41f964aef8e3e901168114a3dc082.zip ast2050-yocto-poky-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>
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index c9a5d32..49415c1 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" RDEPENDS_${PN}_class-target += "bash python" require qemu-targets.inc -inherit autotools-brokensep +inherit autotools BBCLASSEXTEND = "native nativesdk" +PR = "r1" + # QEMU_TARGETS is overridable variable QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64" @@ -37,13 +39,13 @@ do_configure_prepend_class-native() { fi # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed - sed -i 's/-lX11//g' Makefile.target + sed -i 's/-lX11//g' ${S}/Makefile.target } do_configure_prepend_class-nativesdk() { if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then # Undo the -lX11 added by linker-flags.patch - sed -i 's/-lX11//g' Makefile.target + sed -i 's/-lX11//g' ${S}/Makefile.target fi } |