[oe-commits] Laurentiu Palcu : qemu.bbclass: return qemuwrapper instead of qemu-allarch
git at git.openembedded.org
git at git.openembedded.org
Wed Feb 6 09:38:28 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 149a564bba7d3e1c2054ae6d908835ebd95b9084
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=149a564bba7d3e1c2054ae6d908835ebd95b9084
Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date: Thu Jan 31 10:27:22 2013 +0200
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]
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
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 13af339..9cefabb 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -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
More information about the Openembedded-commits
mailing list