summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-07 13:34:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-07 15:25:07 +0000
commit9f5a6f89d9f4a6c7bed3b163e6eaa764d762f523 (patch)
treea9dc3e35be04945fef992a9ce5317f4c338b5337 /meta
parentc920f1a7cccec62668e44d932a2dc5b44252f7db (diff)
downloadpoky-9f5a6f89d9f4a6c7bed3b163e6eaa764d762f523.tar.gz
qemu.bbclass: Use the correct qemu binary in multilib cases
For example with a lib32 multilib, we need to still use the 64 bit qemu binary in case we do encounter a 64 bit binary. (From OE-Core rev: e8ec13a26217bf473504ae4aab22b134dd9dffff) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/qemu.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 9cefabbf84..cd2e32309d 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -4,7 +4,9 @@
4# 4#
5 5
6def qemu_target_binary(data): 6def qemu_target_binary(data):
7 target_arch = data.getVar("TARGET_ARCH", True) 7 target_arch = data.getVar("TARGET_ARCH_MULTILIB_ORIGINAL", True)
8 if not target_arch:
9 target_arch = data.getVar("TARGET_ARCH", True)
8 if target_arch in ("i486", "i586", "i686"): 10 if target_arch in ("i486", "i586", "i686"):
9 target_arch = "i386" 11 target_arch = "i386"
10 elif target_arch == "powerpc": 12 elif target_arch == "powerpc":