summaryrefslogtreecommitdiff
path: root/meta/classes
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:43:53 +0100
commit15408466515cec7cbb4c394aa203c87b6165f884 (patch)
treea61b772f8246eed0ec72a01f77173316c8786209 /meta/classes
parent21ae18ca5e3be0b3e5cb0fdcf19b1476dbd38b0c (diff)
downloadopenembedded-core-15408466515cec7cbb4c394aa203c87b6165f884.tar.gz
openembedded-core-15408466515cec7cbb4c394aa203c87b6165f884.tar.bz2
openembedded-core-15408466515cec7cbb4c394aa203c87b6165f884.zip
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; Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes')
-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 @@
#
def qemu_target_binary(data):
- target_arch = data.getVar("TARGET_ARCH_MULTILIB_ORIGINAL", True)
- if not target_arch:
- target_arch = data.getVar("TARGET_ARCH", True)
+ target_arch = data.getVar("TARGET_ARCH", True)
if target_arch in ("i486", "i586", "i686"):
target_arch = "i386"
elif target_arch == "powerpc":