AArch64(arm64) support

Change-Id: I059b8423b47c67d054c4c78ce507fffd159bd14e
Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 781e0b8d40c8a70596f282cb7f31a460ce5d1c93..1196fe8fe9716427e3b3bcaa0b1652f2f9f62c49 100644 (file)
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -779,11 +779,11 @@ class BaseImageCreator(object):
                   "/usr/bin"):
             fs.makedirs(self._instroot + d)
 
-        if self.target_arch and self.target_arch.startswith("arm"):
+        if self.target_arch and self.target_arch.startswith("arm") or \
+            self.target_arch == "aarch64":
             self.qemu_emulator = misc.setup_qemu_emulator(self._instroot,
                                                           self.target_arch)
 
-
         self.get_cachedir(cachedir)
 
         # bind mount system directories into _instroot

diff --git a/mic/utils/misc.py b/mic/utils/misc.py
index d9260f3f713adf1879a90a64f976c547c5ee0986..10b17d870603c592cb7bc4f66f5a48e3d9c94f0c 100644 (file)
--- a/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@ -966,28 +966,21 @@ def setup_qemu_emulator(rootdir, arch):
 
     # qemu_emulator is a special case, we can't use find_binary_path
     # qemu emulator should be a statically-linked executable file
-    qemu_emulator = "/usr/bin/qemu-arm"
+    if arch == "aarch64":
+        arm_binary = "qemu-arm64"
+    else:
+        arm_binary = "qemu-arm"
+
+    qemu_emulator = "/usr/bin/%s" % arm_binary
     if not os.path.exists(qemu_emulator) or not is_statically_linked(qemu_emulator):
-        qemu_emulator = "/usr/bin/qemu-arm-static"
+        qemu_emulator = "/usr/bin/%s-static" % arm_binary
     if not os.path.exists(qemu_emulator):
-        raise CreatorError("Please install a statically-linked qemu-arm")
-
-    # qemu emulator version check
-    armv7_list = [arch for arch in rpmmisc.archPolicies.keys() if arch.startswith('armv7')]
-    if arch in armv7_list:  # need qemu (>=0.13.0)
-        qemuout = runner.outs([qemu_emulator, "-h"])
-        m = re.search("version\s*([.\d]+)", qemuout)
-        if m:
-            qemu_version = m.group(1)
-            if qemu_version < "0.13":
-                raise CreatorError("Requires %s version >=0.13 for %s" % (qemu_emulator, arch))
-        else:
-            msger.warning("Can't get version info of %s, please make sure it's higher than 0.13.0" % qemu_emulator)
+        raise CreatorError("Please install a statically-linked %s" % arm_binary)
 
     if not os.path.exists(rootdir + "/usr/bin"):
         makedirs(rootdir + "/usr/bin")
-    shutil.copy(qemu_emulator, rootdir + "/usr/bin/qemu-arm-static")
-    qemu_emulator = "/usr/bin/qemu-arm-static"
+    shutil.copy(qemu_emulator, rootdir + qemu_emulator)
+    qemu_emulator = "/usr/bin/%s-static" % arm_binary
 
     # disable selinux, selinux will block qemu emulator to run
     if os.path.exists("/usr/sbin/setenforce"):
@@ -1003,7 +996,10 @@ def setup_qemu_emulator(rootdir, arch):
 
     # register qemu emulator for interpreting other arch executable file
     if not os.path.exists(node):
-        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
+        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
+        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:
             fd.write(qemu_arm_string)
 

diff --git a/mic/utils/rpmmisc.py b/mic/utils/rpmmisc.py
index d8467ece2963cd8c1f97ff80b4f0d73dad2e22cc..14a40b623523d6f35295d176db9bc37aea960d2f 100644 (file)
--- a/mic/utils/rpmmisc.py
+++ b/mic/utils/rpmmisc.py
@@ -291,6 +291,7 @@ archPolicies = {
     "i686":         "i686:i586:i486:i386",
     "i586":         "i586:i486:i386",
     "ia64":         "ia64:i686:i586:i486:i386",
+    "aarch64":      "aarch64",
     "armv7tnhl":    "armv7tnhl:armv7thl:armv7nhl:armv7hl",
     "armv7thl":     "armv7thl:armv7hl",
     "armv7nhl":     "armv7nhl:armv7hl",