Merge "Remove qcow image support for 0.24.3 Revert "add qcow image support"" into...

diff --git a/mic/imager/fs.py b/mic/imager/fs.py
index d53b29c..4a9e5d7 100644 (file)
--- a/mic/imager/fs.py
+++ b/mic/imager/fs.py
@@ -78,7 +78,6 @@ class FsImageCreator(BaseImageCreator):
             tar = find_binary_path('tar')
             tar_cmdline = [tar, "--numeric-owner",
                                 "--preserve-permissions",
-                                "--preserve-order",
                                 "--one-file-system",
                                 "--directory",
                                 self._instroot]

diff --git a/mic/utils/misc.py b/mic/utils/misc.py
old mode 100644 (file)
new mode 100755 (executable)
index 47f3491..7813921
--- a/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@ -993,7 +993,7 @@ def setup_qemu_emulator(rootdir, arch):
         arm_binary = "qemu-arm"
         if not os.path.exists("/usr/bin/qemu-arm") or not is_statically_linked("/usr/bin/qemu-arm"):
             arm_binary = "qemu-arm-static"
-        if not os.path.exists("/usr/bin/qemu-arm-static"):
+        if not os.path.exists("/usr/bin/%s" % arm_binary):
             raise CreatorError("Please install a statically-linked %s" % arm_binary)
 
     qemu_emulator = "/usr/bin/%s" % arm_binary
@@ -1016,7 +1016,7 @@ def setup_qemu_emulator(rootdir, arch):
     # register qemu emulator for interpreting other arch executable file
     if not os.path.exists(node):
         if arch == "aarch64":
-            qemu_arm_string = ":aarch64:M::\\x7fELF\\x02\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\xb7:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfa\\xff\\xff\\xff:%s:\n" % qemu_emulator
+            qemu_arm_string = ":aarch64:M::\\x7fELF\\x02\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\xb7:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff:%s:\n" % qemu_emulator
         else:
             qemu_arm_string = ":arm:M::\\x7fELF\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x28\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfa\\xff\\xff\\xff:%s:\n" % qemu_emulator
         with open("/proc/sys/fs/binfmt_misc/register", "w") as fd: