diff options
-rw-r--r-- | meta/classes/qemu.bbclass | 6 |
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 | # |
25 | def qemu_run_binary(data, rootfs_path, binary): | 25 | def 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 |