From cf76b424f578fbe6a7ab78640463612088442bca Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Fri, 26 Apr 2013 11:04:00 +0300 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/qemu.bbclass | 4 +--- 1 file changed, 1 insertion(+), 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":