[oe-commits] Laurentiu Palcu : Revert "qemu.bbclass: Use the correct qemu binary in multilib cases"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dylan
Commit: e57f9b992192f7d7877fbb69af764357a21fce70
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e57f9b992192f7d7877fbb69af764357a21fce70

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Fri Apr 26 11:04:00 2013 +0300

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 master rev: 15408466515cec7cbb4c394aa203c87b6165f884)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/qemu.bbclass |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 930c6b0..3d437b0 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":