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:56 +0100
commit0404123e2da7fb1d6345dfb515a167adbb968f28 (patch)
tree8ff3681c66a100553d33808621b69f85be79e3cb
parent7b0e2e9141f2e3bd8e6a66e6b85e9edad1ad3b8e (diff)
downloadpoky-0404123e2da7fb1d6345dfb515a167adbb968f28.tar.gz
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. (From OE-Core rev: 3d9c0cbf1f9b9802d7374c4fa1672c26fc5db5cb) 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 () {
9 9
10 echo "#!/bin/sh" > ${D}${bindir_crossscripts}/qemuwrapper 10 echo "#!/bin/sh" > ${D}${bindir_crossscripts}/qemuwrapper
11 qemu_binary=${@qemu_target_binary(d)} 11 qemu_binary=${@qemu_target_binary(d)}
12 echo "$qemu_binary \"\$@\"" >> ${D}${bindir_crossscripts}/qemuwrapper 12 qemu_options='${@d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or d.getVar('QEMU_OPTIONS', True) or ""}'
13 echo "$qemu_binary $qemu_options \"\$@\"" >> ${D}${bindir_crossscripts}/qemuwrapper
13 fallback_qemu_bin= 14 fallback_qemu_bin=
14 case $qemu_binary in 15 case $qemu_binary in
15 "qemu-i386") 16 "qemu-i386")