summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-07-10 00:14:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-12 22:55:44 +0100
commit8d1a344eea51778a4ef0e0bfd6b0a2105c799811 (patch)
tree9657ce3cfe658becfa41a49ab4deaf257c929ff8
parent4e9c3db01efa2bde35634ca698c5df8109d2ae05 (diff)
downloadpoky-8d1a344eea51778a4ef0e0bfd6b0a2105c799811.tar.gz
qemu: remove invalid sed command
The sed command was used for editting to code added by linker-flags.patch, but the patch had been gone in 2013, and verified that there is no -lX11 in Makefile.target, so remove the sed command. (From OE-Core rev: 69dabec0b1c72069290d7d1689d39dd386af4705) 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.inc10
1 files changed, 0 insertions, 10 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index ca94fb223d..d794af9462 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -37,16 +37,6 @@ do_configure_prepend_class-native() {
37 if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then 37 if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
38 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH 38 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
39 fi 39 fi
40
41 # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
42 sed -i 's/-lX11//g' ${S}/Makefile.target
43}
44
45do_configure_prepend_class-nativesdk() {
46 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
47 # Undo the -lX11 added by linker-flags.patch
48 sed -i 's/-lX11//g' ${S}/Makefile.target
49 fi
50} 40}
51 41
52KVMENABLE = "--enable-kvm" 42KVMENABLE = "--enable-kvm"