mirror of
https://git.yoctoproject.org/poky
synced 2026-04-04 23:02:22 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
49f5daf9b7
commit
f33014f607
@@ -23,10 +23,14 @@ def qemu_target_binary(data):
|
||||
# ${@qemu_run_binary(d, '$D', '/usr/bin/test_app')} [test_app arguments]
|
||||
#
|
||||
def qemu_run_binary(data, rootfs_path, binary):
|
||||
qemu_binary = qemu_target_binary(data)
|
||||
if qemu_binary == "qemu-allarch":
|
||||
qemu_binary = "qemuwrapper"
|
||||
|
||||
dynamic_loader = rootfs_path + '$(readelf -l ' + rootfs_path + \
|
||||
binary + '| grep "Requesting program interpreter"|sed -e \'s/^.*\[.*: \(.*\)\]/\\1/\')'
|
||||
library_path = rootfs_path + data.getVar("base_libdir", True) + ":" + \
|
||||
rootfs_path + data.getVar("libdir", True)
|
||||
|
||||
return qemu_target_binary(data) + " " + dynamic_loader + " --library-path " + library_path \
|
||||
return qemu_binary + " " + dynamic_loader + " --library-path " + library_path \
|
||||
+ " " + rootfs_path + binary
|
||||
|
||||
Reference in New Issue
Block a user