Patchwork [3/4] Revert "qemu.bbclass: Use the correct qemu binary in multilib cases"

login
register
mail settings
Submitter Laurentiu Palcu
Date April 25, 2013, 12:23 p.m.
Message ID <26aacc9f7a93b0f91f3f503e65bc79e5ba1de7c3.1366892003.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/48879/
State Accepted
Commit 15408466515cec7cbb4c394aa203c87b6165f884
Headers show

Comments

Laurentiu Palcu - April 25, 2013, 12:23 p.m.
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>
---
 meta/classes/qemu.bbclass |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch

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":