Patchwork qemu-targets.inc: Update to handle mingw/darwin

login
register
mail settings
Submitter Richard Purdie
Date Aug. 17, 2014, 8:51 a.m.
Message ID <1408265461.24858.1.camel@ted>
Download mbox | patch
Permalink /patch/78389/
State Accepted
Commit 241bdb0cd5370029bd6cb8286b259e4582334fe9
Headers show

Comments

Richard Purdie - Aug. 17, 2014, 8:51 a.m.
For non-linux targets, don't return linux-user qemu targets. This change
also improves readability of the functions through better variable names.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Patch

diff --git a/meta/recipes-devtools/qemu/qemu-targets.inc b/meta/recipes-devtools/qemu/qemu-targets.inc
index 9f009bf..5c35655 100644
--- a/meta/recipes-devtools/qemu/qemu-targets.inc
+++ b/meta/recipes-devtools/qemu/qemu-targets.inc
@@ -5,14 +5,18 @@ 
 def get_qemu_target_list(d):
     import bb
     archs = d.getVar('QEMU_TARGETS', True).split()
-    targets = ""
+    tos = d.getVar('HOST_OS', True)
+    softmmuonly = ""
     for arch in ['mips64', 'mips64el', 'ppcemb']:
         if arch in archs:
-            targets += arch + "-softmmu,"
+            softmmuonly += arch + "-softmmu,"
             archs.remove(arch)
+    linuxuseronly = ""
     for arch in ['armeb', 'alpha', 'ppc64abi32', 'sparc32plus']:
         if arch in archs:
-            targets += arch + "-linux-user,"
+            linuxuseronly += arch + "-linux-user,"
             archs.remove(arch)
-    return targets + ''.join([arch + "-linux-user" + "," + arch + "-softmmu" + "," for arch in archs]).rstrip(',')
+    if 'linux' not in tos:
+        return softmmuonly + ''.join([arch + "-softmmu" + "," for arch in archs]).rstrip(',')
+    return softmmuonly + linuxuseronly + ''.join([arch + "-linux-user" + "," + arch + "-softmmu" + "," for arch in archs]).rstrip(',')