]> code.ossystems Code Review - openembedded-core.git/commitdiff
qemu-targets.inc: Update to handle mingw/darwin
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 17 Aug 2014 08:51:01 +0000 (09:51 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 17 Aug 2014 09:01:30 +0000 (10:01 +0100)
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>
meta/recipes-devtools/qemu/qemu-targets.inc

index 9f009bf888de8c9ef6b4c686fd0029139d3a23a0..5c3565544e2a26eb7df93f85d67f2ac99a6e9859 100644 (file)
@@ -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(',')