From patchwork Tue Feb 5 09:34:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/8] qemu.bbclass: return qemuwrapper instead of qemu-allarch Date: Tue, 05 Feb 2013 09:34:57 -0000 From: Laurentiu Palcu X-Patchwork-Id: 44063 Message-Id: <8f083e08423bf37206fff61c4da34641a7b1291f.1360055640.git.laurentiu.palcu@intel.com> To: openembedded-core@lists.openembedded.org 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 --- meta/classes/qemu.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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