qemuwrapper-cross: Use QEMU_OPTIONS

PATCH New Richard Purdie 1 participant 1 message Jun 13, 2014

Share & tools

Richard Purdie

author

2014-06-13 13:07 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb +2 -1

index 3bfb5bd..d2981b5 100644
@@ -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")