summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-04-26 11:04:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-29 14:45:10 +0100
commitcf76b424f578fbe6a7ab78640463612088442bca (patch)
tree165b614d81efdb5d5c25c1ab58a559e8515d1743
parent8f32a0fa03430f2b54d1519a1713643b20dd7518 (diff)
downloadpoky-cf76b424f578fbe6a7ab78640463612088442bca.tar.gz
Revert "qemu.bbclass: Use the correct qemu binary in multilib cases"
This reverts commit 9f5a6f89d9f4a6c7bed3b163e6eaa764d762f523. The reason for reverting this is: * qemuwrapper has now a fallback method; * when using multilib, calling qemu_target_binary from recipes would always point to the qemu binary corresponding to the machine architecture. Hence, postinstalls needing to use qemu would call the wrong qemu user emulation binary; (From OE-Core rev: 15408466515cec7cbb4c394aa203c87b6165f884) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/qemu.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 930c6b082e..3d437b0e45 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -4,9 +4,7 @@
4# 4#
5 5
6def qemu_target_binary(data): 6def qemu_target_binary(data):
7 target_arch = data.getVar("TARGET_ARCH_MULTILIB_ORIGINAL", True) 7 target_arch = data.getVar("TARGET_ARCH", True)
8 if not target_arch:
9 target_arch = data.getVar("TARGET_ARCH", True)
10 if target_arch in ("i486", "i586", "i686"): 8 if target_arch in ("i486", "i586", "i686"):
11 target_arch = "i386" 9 target_arch = "i386"
12 elif target_arch == "powerpc": 10 elif target_arch == "powerpc":