From 383044c7717d02b9af3708fe379704a6f5917a69 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 13 Jun 2014 14:07:15 +0100 Subject: qemuwrapper-cross: Use QEMU_OPTIONS The correct cpu options are needed in order to correctly run some CPU types. This information is available in QEMU_OPTIONS, use it. This avoids architectures like qemuppc failing postinstalls. Signed-off-by: Richard Purdie (cherry picked from commit 3d9c0cbf1f9b9802d7374c4fa1672c26fc5db5cb) Signed-off-by: Andreas Oberritter --- meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb index 18f1892884..f834739b87 100644 --- a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb +++ b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb @@ -10,7 +10,8 @@ do_install () { echo "#!/bin/sh" > ${D}${bindir_crossscripts}/qemuwrapper qemu_binary=${@qemu_target_binary(d)} - echo "$qemu_binary \"\$@\"" >> ${D}${bindir_crossscripts}/qemuwrapper + qemu_options='${@d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or d.getVar('QEMU_OPTIONS', True) or ""}' + echo "$qemu_binary $qemu_options \"\$@\"" >> ${D}${bindir_crossscripts}/qemuwrapper fallback_qemu_bin= case $qemu_binary in "qemu-i386") -- cgit 1.2.3-korg