summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-01-31 10:27:22 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-06 09:37:23 +0000
commitf33014f60722efd9ca7dd03aeee3dd46d8035616 (patch)
treec37918c9e836d3d66ea857c7541d68aba828ceb9
parent49f5daf9b71a4bd9c839b348c9819019903a5f2e (diff)
downloadpoky-f33014f60722efd9ca7dd03aeee3dd46d8035616.tar.gz
qemu.bbclass: return qemuwrapper instead of qemu-allarch
When qemu bbclass is inherited from a recipe that is not architecture dependent, qemu_run_binary will return "qemu-allarch". However this binary does not exist. Instead, return "qemuwrapper" which will, in turn, execute the right binary for the target the image was built for. [YOCTO #2599] (From OE-Core rev: 149a564bba7d3e1c2054ae6d908835ebd95b9084) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/qemu.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 13af3390aa..9cefabbf84 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -23,10 +23,14 @@ def qemu_target_binary(data):
23# ${@qemu_run_binary(d, '$D', '/usr/bin/test_app')} [test_app arguments] 23# ${@qemu_run_binary(d, '$D', '/usr/bin/test_app')} [test_app arguments]
24# 24#
25def qemu_run_binary(data, rootfs_path, binary): 25def qemu_run_binary(data, rootfs_path, binary):
26 qemu_binary = qemu_target_binary(data)
27 if qemu_binary == "qemu-allarch":
28 qemu_binary = "qemuwrapper"
29
26 dynamic_loader = rootfs_path + '$(readelf -l ' + rootfs_path + \ 30 dynamic_loader = rootfs_path + '$(readelf -l ' + rootfs_path + \
27 binary + '| grep "Requesting program interpreter"|sed -e \'s/^.*\[.*: \(.*\)\]/\\1/\')' 31 binary + '| grep "Requesting program interpreter"|sed -e \'s/^.*\[.*: \(.*\)\]/\\1/\')'
28 library_path = rootfs_path + data.getVar("base_libdir", True) + ":" + \ 32 library_path = rootfs_path + data.getVar("base_libdir", True) + ":" + \
29 rootfs_path + data.getVar("libdir", True) 33 rootfs_path + data.getVar("libdir", True)
30 34
31 return qemu_target_binary(data) + " " + dynamic_loader + " --library-path " + library_path \ 35 return qemu_binary + " " + dynamic_loader + " --library-path " + library_path \
32 + " " + rootfs_path + binary 36 + " " + rootfs_path + binary