summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-13 14:07:15 +0100
committerAndreas Oberritter <obi@opendreambox.org>2016-04-06 19:32:45 +0200
commit383044c7717d02b9af3708fe379704a6f5917a69 (patch)
tree2379b1d2e96d7b1a89b9921071567b8df71a964e
parent2f169c6d684f75afaf0542512488d30914e44430 (diff)
downloadopenembedded-core-contrib-383044c7717d02b9af3708fe379704a6f5917a69.tar.gz
openembedded-core-contrib-383044c7717d02b9af3708fe379704a6f5917a69.tar.bz2
openembedded-core-contrib-383044c7717d02b9af3708fe379704a6f5917a69.zip
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 <richard.purdie@linuxfoundation.org> (cherry picked from commit 3d9c0cbf1f9b9802d7374c4fa1672c26fc5db5cb) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb3
1 files changed, 2 insertions, 1 deletions
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")