summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-13 14:07:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-14 08:43:40 +0100
commit3d9c0cbf1f9b9802d7374c4fa1672c26fc5db5cb (patch)
tree036a14f64b1edf44951e48c32384b736461d5070
parent5995fdbe81799f1ecf5de722cb2eb95ccb2aa860 (diff)
downloadopenembedded-core-contrib-3d9c0cbf1f9b9802d7374c4fa1672c26fc5db5cb.tar.gz
openembedded-core-contrib-3d9c0cbf1f9b9802d7374c4fa1672c26fc5db5cb.tar.bz2
openembedded-core-contrib-3d9c0cbf1f9b9802d7374c4fa1672c26fc5db5cb.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>
-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 3bfb5bde80..d2981b5575 100644
--- a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
@@ -9,7 +9,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")