@@ -336,9 +336,9 @@ tool-chain-stage2: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_S

 packages-cached:

 	@echo "Using cached RPMS..."

 	@$(RM) -f $(PHOTON_RPMS_DIR_NOARCH)/* && \

-     $(RM) -f $(PHOTON_RPMS_DIR_X86_64)/* && \

+     $(RM) -f $(PHOTON_RPMS_DIR_ARCH)/* && \

      $(CP) -f $(PHOTON_CACHE_PATH)/RPMS/noarch/* $(PHOTON_RPMS_DIR_NOARCH)/ && \

-     $(CP) -f $(PHOTON_CACHE_PATH)/RPMS/x86_64/* $(PHOTON_RPMS_DIR_X86_64)/

+     $(CP) -f $(PHOTON_CACHE_PATH)/RPMS/$(ARCH)/* $(PHOTON_RPMS_DIR_ARCH)/

 sources:

 	@$(MKDIR) -p $(PHOTON_SRCS_DIR)

@@ -359,13 +359,13 @@ publish-x-rpms:

 publish-rpms-cached:

 	@echo "Using cached publish rpms..."

-	@$(MKDIR) -p $(PHOTON_PUBLISH_RPMS_DIR)/{x86_64,noarch} && \

+	@$(MKDIR) -p $(PHOTON_PUBLISH_RPMS_DIR)/{$(ARCH),noarch} && \

 	cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \

         $(PHOTON_PULL_PUBLISH_RPMS) $(PHOTON_PUBLISH_RPMS_DIR) $(PHOTON_PUBLISH_RPMS_PATH)

 publish-x-rpms-cached:

 	@echo "Using ..."

-	@$(MKDIR) -p $(PHOTON_PUBLISH_XRPMS_DIR)/{x86_64,noarch} && \

+	@$(MKDIR) -p $(PHOTON_PUBLISH_XRPMS_DIR)/{$(ARCH),noarch} && \

 	cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \

         $(PHOTON_PULL_PUBLISH_X_RPMS) $(PHOTON_PUBLISH_XRPMS_DIR) $(PHOTON_PUBLISH_XRPMS_PATH)

@@ -376,12 +376,12 @@ $(PHOTON_STAGE):

 	$(MKDIR) -p $(PHOTON_CHROOT_PATH)

 	@echo "Building RPMS folders..."

 	@test -d $(PHOTON_RPMS_DIR_NOARCH) || $(MKDIR) -p $(PHOTON_RPMS_DIR_NOARCH)

-	@test -d $(PHOTON_RPMS_DIR_X86_64) || $(MKDIR) -p $(PHOTON_RPMS_DIR_X86_64)

+	@test -d $(PHOTON_RPMS_DIR_ARCH) || $(MKDIR) -p $(PHOTON_RPMS_DIR_ARCH)

 	@echo "Building SRPMS folders..."

 	@test -d $(PHOTON_SRPMS_DIR) || $(MKDIR) -p $(PHOTON_SRPMS_DIR)

 	@echo "Building UPDATED_RPMS folders..."

 	@test -d $(PHOTON_UPDATED_RPMS_DIR_NOARCH) || $(MKDIR) -p $(PHOTON_UPDATED_RPMS_DIR_NOARCH)

-	@test -d $(PHOTON_UPDATED_RPMS_DIR_X86_64) || $(MKDIR) -p $(PHOTON_UPDATED_RPMS_DIR_X86_64)

+	@test -d $(PHOTON_UPDATED_RPMS_DIR_ARCH) || $(MKDIR) -p $(PHOTON_UPDATED_RPMS_DIR_ARCH)

 	@echo "Building SOURCES folder..."

 	@test -d $(PHOTON_SRCS_DIR) || $(MKDIR) -p $(PHOTON_SRCS_DIR)

 	@echo "Building LOGS folder..."

new file mode 120000

@@ -0,0 +1 @@

+EFI_x86_64

\ No newline at end of file

deleted file mode 100644

Binary files a/installer/EFI/BOOT/bootx64.efi and /dev/null differ

deleted file mode 100644

Binary files a/installer/EFI/BOOT/grubx64.efi and /dev/null differ

new file mode 100644

Binary files /dev/null and b/installer/EFI_aarch64/BOOT/bootaa64.efi differ

new file mode 100644

Binary files /dev/null and b/installer/EFI_x86_64/BOOT/bootx64.efi differ

new file mode 100644

Binary files /dev/null and b/installer/EFI_x86_64/BOOT/grubx64.efi differ

@@ -395,7 +395,8 @@ class Installer(object):

                 if f in rpms:

                     rpm_paths.append(os.path.join(root, f))

-        rpm_params = ['--root', self.photon_root, '--dbpath', '/var/lib/rpm']

+        # --nodeps is for hosts which do not support rich dependencies

+        rpm_params = ['--nodeps', '--root', self.photon_root, '--dbpath', '/var/lib/rpm']

         if ('type' in self.install_config and (self.install_config['type'] in ['micro', 'minimal'])) or self.install_config['iso_system']:

             rpm_params.append('--excludedocs')

@@ -49,7 +49,7 @@ run_command "# 6" "cp boot/theme.txt ${WORKINGDIR}/boot/grub2/themes/photon/" "$

 run_command "echo : ${WORKINGDIR}" "echo ${WORKINGDIR}" "${LOGFILE}"

 cp BUILD_DVD/isolinux/splash.png ${BUILDROOT}/installer/boot/.

 mkdir -p ${BUILDROOT}/installer/EFI/BOOT

-cp EFI/BOOT/* ${BUILDROOT}/installer/EFI/BOOT/

+cp EFI_$(uname -m)/BOOT/* ${BUILDROOT}/installer/EFI/BOOT/

 #Generate efiboot image

 # efiboot is a fat16 image that has at least EFI/BOOT/bootx64.efi

@@ -68,7 +68,8 @@ dd if=/dev/zero of=${WORKINGDIR}/${EFI_IMAGE} bs=3K count=1024

 mkdosfs ${WORKINGDIR}/${EFI_IMAGE}

 mkdir $EFI_FOLDER

 mount -o loop ${WORKINGDIR}/${EFI_IMAGE} $EFI_FOLDER

-cp -r ./EFI $EFI_FOLDER

+mkdir $EFI_FOLDER/EFI

+cp -r ./EFI_$(uname -m)/BOOT $EFI_FOLDER/EFI

 ls -lR $EFI_FOLDER

 umount $EFI_FOLDER

 rm -rf $EFI_FOLDER

@@ -14,6 +14,7 @@ SHASUM=/usr/bin/shasum

 PACKER=/usr/local/bin/packer

 VAGRANT=/usr/bin/vagrant

 VAGRANT_BUILD=vagrant

+ARCH?=$(shell uname -m)

 SRCROOT := $(realpath $(SRCROOT))

 MAKEROOT := $(realpath $(MAKEROOT))

@@ -52,9 +53,9 @@ PHOTON_CLOUD_IMAGE_BUILDER=$(PHOTON_CLOUD_IMAGE_BUILDER_DIR)/cloud-image-build.s

 PHOTON_CHROOT_CLEANER=$(PHOTON_PKG_BUILDER_DIR)/clean-up-chroot.py

 PHOTON_RPMS_DIR_NOARCH=$(PHOTON_RPMS_DIR)/noarch

-PHOTON_RPMS_DIR_X86_64=$(PHOTON_RPMS_DIR)/x86_64

+PHOTON_RPMS_DIR_ARCH=$(PHOTON_RPMS_DIR)/$(ARCH)

 PHOTON_UPDATED_RPMS_DIR_NOARCH?=$(PHOTON_UPDATED_RPMS_DIR)/noarch

-PHOTON_UPDATED_RPMS_DIR_X86_64?=$(PHOTON_UPDATED_RPMS_DIR)/x86_64

+PHOTON_UPDATED_RPMS_DIR_ARCH?=$(PHOTON_UPDATED_RPMS_DIR)/$(ARCH)

 PHOTON_PACKER_TEMPLATES=$(SRCROOT)/support/packer-templates

 PHOTON_CHROOT_PATH:=$(PHOTON_STAGE)/photonroot

@@ -1,6 +1,7 @@

 from CommandUtils import CommandUtils

 from Logger import Logger

 import os

+import platform

 import shutil

 from constants import constants

 import re

@@ -44,6 +45,8 @@ class PackageUtils(object):

         arch=""

         if rpmName.find("x86_64") != -1:

             arch="x86_64"

+        elif rpmName.find("aarch64") != -1:

+            arch="aarch64"

         elif rpmName.find("noarch") != -1:

             arch="noarch"

         return arch

@@ -281,10 +284,10 @@ class PackageUtils(object):

         cmdUtils = CommandUtils()

         version = SPECS.getData().getVersion(package)

         release = SPECS.getData().getRelease(package)

-        listFoundRPMFiles = sum([cmdUtils.findFile(package+"-"+version+"-"+release+".x86_64.rpm",constants.rpmPath),

+        listFoundRPMFiles = sum([cmdUtils.findFile(package+"-"+version+"-"+release+"."+platform.machine()+".rpm",constants.rpmPath),

                             cmdUtils.findFile(package+"-"+version+"-"+release+".noarch.rpm",constants.rpmPath)], [])

         if constants.inputRPMSPath is not None:

-            listFoundRPMFiles = sum([cmdUtils.findFile(package+"-"+version+"-"+release+".x86_64.rpm",constants.inputRPMSPath),

+            listFoundRPMFiles = sum([cmdUtils.findFile(package+"-"+version+"-"+release+"."+platform.machine()+".rpm",constants.inputRPMSPath),

                             cmdUtils.findFile(package+"-"+version+"-"+release+".noarch.rpm",constants.inputRPMSPath)], listFoundRPMFiles)

         if len(listFoundRPMFiles) == 1 :

             return listFoundRPMFiles[0]

@@ -309,7 +312,7 @@ class PackageUtils(object):

     def findPackageInfoFromRPMFile(self,rpmfile):

         rpmfile=os.path.basename(rpmfile)

-        rpmfile=rpmfile.replace(".x86_64.rpm","")

+        rpmfile=rpmfile.replace("."+platform.machine()+".rpm","")

         rpmfile=rpmfile.replace(".noarch.rpm","")

         releaseindex=rpmfile.rfind("-")

         if releaseindex == -1:

@@ -396,7 +399,7 @@ class PackageUtils(object):

         if "noarch" in rpmFile:

             rpmPath += "noarch/"

         else:

-            rpmPath += "x86_64/"

+            rpmPath += platform.machine()+"/"

         rpmPath += rpmName

         return rpmPath

@@ -1,5 +1,6 @@

 from SpecUtils import Specutils

 import os

+import platform

 from Logger import Logger

 from distutils.version import StrictVersion

 import Queue

@@ -77,7 +78,7 @@ class SerializableSpecObjectsUtils(object):

     def getListSpecFiles(self,listSpecFiles,path):

         for dirEntry in os.listdir(path):

             dirEntryPath = os.path.join(path, dirEntry)

-            if os.path.isfile(dirEntryPath) and dirEntryPath.endswith(".spec"):

+            if os.path.isfile(dirEntryPath) and dirEntryPath.endswith(".spec") and os.path.basename(dirEntryPath) not in constants.skipSpecsForArch.get(platform.machine(),[]):

                 listSpecFiles.append(dirEntryPath)

             elif os.path.isdir(dirEntryPath):

                 self.getListSpecFiles(listSpecFiles,dirEntryPath)

@@ -307,8 +308,9 @@ class SPECS(object):

         self.specData.addMacro("KERNEL_VERSION",kernelversion)

         #adding openjre8 version rpm macro

-        java8version = self.specData.getVersion("openjre8")

-        self.specData.addMacro("JAVA8_VERSION",java8version)

+        if (platform.machine() == "x86_64"):

+            java8version = self.specData.getVersion("openjre8")

+            self.specData.addMacro("JAVA8_VERSION",java8version)

         #adding kernelrelease rpm macro

         kernelrelease = self.specData.getRelease("linux")

@@ -525,7 +527,7 @@ class SerializedSpecObjects(object):

     def getListSpecFiles(self,listSpecFiles,path):

         for dirEntry in os.listdir(path):

             dirEntryPath = os.path.join(path, dirEntry)

-            if os.path.isfile(dirEntryPath) and dirEntryPath.endswith(".spec"):

+            if os.path.isfile(dirEntryPath) and dirEntryPath.endswith(".spec") and os.path.basename(dirEntryPath) not in constants.skipSpecsForArch.get(platform.machine(),[]):

                 listSpecFiles.append(dirEntryPath)

             elif os.path.isdir(dirEntryPath):

                 self.getListSpecFiles(listSpecFiles,dirEntryPath)

@@ -1,4 +1,5 @@

 import re

+import platform

 from StringUtils import StringUtils

 from SpecStructures import *

 from constants import constants

@@ -46,7 +47,18 @@ class SpecParser(object):

         i=0

         while i < totalLines:

             line = lines[i].strip()

-            if self.isSpecMacro(line):

+            if self.isConditionalArch(line):

+                if (platform.machine() != self.readConditionalArch(line)):

+                    # skip conditional body

+                    deep = 1

+                    while (i < totalLines and deep != 0):

+                        i=i+1

+                        line = lines[i].strip()

+                        if self.isConditionalMacroStart(line):

+                            deep = deep + 1

+                        elif self.isConditionalMacroEnd(line):

+                            deep = deep - 1

+            elif self.isSpecMacro(line):

                 macro,i=self.readMacroFromFile(i, lines)

                 self.updateMacro(macro)

             elif self.isPackageMacro(line):

@@ -78,7 +90,7 @@ class SpecParser(object):

                 self.readDefinition(line)

             elif self.isConditionalCheckMacro(line):

                 self.conditionalCheckMacroEnabled = True

-            elif self.conditionalCheckMacroEnabled and self.isConditionalMacroCompleted(line):

+            elif self.conditionalCheckMacroEnabled and self.isConditionalMacroEnd(line):

                 self.conditionalCheckMacroEnabled = False

             else:

                 self.specAdditionalContent+=line+"\n"

@@ -137,7 +149,12 @@ class SpecParser(object):

         return False

     def isMacro(self,line):

-        return self.isPackageMacro(line) or self.isSpecMacro(line)

+        return self.isPackageMacro(line) or self.isSpecMacro(line) or self.isConditionalMacroStart(line) or self.isConditionalMacroEnd(line)

+

+    def isConditionalArch(self,line):

+        if re.search('^'+'%ifarch',line) :

+            return True

+        return False

     def isSpecMacro(self,line):

         if re.search('^'+'%clean',line) :

@@ -225,6 +242,12 @@ class SpecParser(object):

             return True

         return False

+    def readConditionalArch(self,line):

+        w=line.split()

+        if len(w) == 2:

+           return w[1]

+        return None

+

     def readDefinition(self,line):

         listDefines=line.split()

         if len(listDefines) == 3:

@@ -400,12 +423,8 @@ class SpecParser(object):

             return False

         return True

-    def isConditionalMacroCompleted(self,line):

-        data = line.strip()

-        words = data.split()

-        nrWords = len(words)

-        if(nrWords != 1):

-            return False

-        if(words[0] != "%endif"):

-            return False

-        return True

+    def isConditionalMacroStart(self,line):

+        return line.startswith("%if")

+

+    def isConditionalMacroEnd(self,line):

+        return (line.strip() == "%endif")

@@ -1,3 +1,5 @@

+import platform

+

 class rpmMacro(object):

     def __init__(self):

@@ -29,7 +31,7 @@ class Package(object):

         self.license=""

         self.version=""

         self.release=""

-        self.buildarch="x86_64"

+        self.buildarch=platform.machine()

         self.distribution="Photon"

         self.basePkgName=""

         self.URL=""

@@ -1,5 +1,6 @@

 from SpecParser import SpecParser

 from StringUtils import StringUtils

+import platform

 import os

 class Specutils(object):

@@ -133,7 +134,7 @@ class Specutils(object):

         return None

     def getBuildArch(self, pkgName):

-        buildArch="x86_64"

+        buildArch=platform.machine()

         for key in self.spec.packages.keys():

             pkg = self.spec.packages.get(key)

             if pkg.name == pkgName:

@@ -5,6 +5,7 @@ from PackageUtils import PackageUtils

 from constants import constants

 import subprocess

 import os.path

+import platform

 import traceback

 import shutil

@@ -38,7 +39,7 @@ class ToolChainUtils(object):

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+"/sys")

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+"/tmp")

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath)

-        cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/RPMS/x86_64")

+        cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/RPMS/"+platform.machine())

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/RPMS/noarch")

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/SOURCES")

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/SPECS")

@@ -191,8 +192,8 @@ class ToolChainUtils(object):

             rpmFile = pkgUtils.findRPMFileForGivenPackage(package)

             if rpmFile is None:

                 # sqlite-autoconf package was renamed, but it still published as sqlite-autoconf

-                if package == "sqlite":

-                    package = "sqlite-autoconf"

+#                if package == "sqlite":

+#                    package = "sqlite-autoconf"

                 rpmFile = self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)

                 if rpmFile is None:

                     if package in constants.listOfRPMsProvidedAfterBuild:

@@ -2,6 +2,7 @@

 from argparse import ArgumentParser

 import os.path

+import platform

 from CommandUtils import CommandUtils

 from Logger import Logger

 from constants import constants

@@ -67,11 +68,11 @@ def main():

     if not os.path.isdir(options.publishXRPMSPath):

         logger.error("Given X RPMS Path is not a directory:"+options.publishXRPMSPath)

         errorFlag = True

-    if not os.path.isdir(options.publishRPMSPath+"/x86_64"):

-        logger.error("Given RPMS Path is missing x86_64 sub-directory:"+options.publishRPMSPath)

+    if not os.path.isdir(options.publishRPMSPath+"/" + platform.machine()):

+        logger.error("Given RPMS Path is missing "+platform.machine()+" sub-directory:"+options.publishRPMSPath)

         errorFlag = True

-    if not os.path.isdir(options.publishXRPMSPath+"/x86_64"):

-        logger.error("Given X RPMS Path is missing x86_64 sub-directory:"+options.publishXRPMSPath)

+    if not os.path.isdir(options.publishXRPMSPath+"/" + platform.machine()):

+        logger.error("Given X RPMS Path is missing "+platform.machine()+" sub-directory:"+options.publishXRPMSPath)

         errorFlag = True

     if not os.path.isdir(options.publishRPMSPath+"/noarch"):

         logger.error("Given RPMS Path is missing noarch sub-directory:"+options.publishRPMSPath)

@@ -108,7 +109,7 @@ def main():

     if not os.path.isdir(options.rpmPath):

-        cmdUtils.runCommandInShell("mkdir -p "+options.rpmPath+"/x86_64")

+        cmdUtils.runCommandInShell("mkdir -p "+options.rpmPath+"/"+platform.machine())

         cmdUtils.runCommandInShell("mkdir -p "+options.rpmPath+"/noarch")

     if not os.path.isdir(options.sourceRpmPath):

@@ -346,6 +346,70 @@ class constants(object):

         "/bin/sed":"sed"

     }

+    # list of spec files to skip for parsing for given arch

+    skipSpecsForArch={

+        "x86_64":[],

+        "aarch64":[

+            # fakeroot-ng does not support aarch64

+            "fakeroot-ng.spec",

+            # ipxe does not support aarch64

+            "ipxe.spec",

+            # kexec-tools for arm64 does not support fpic

+            "kexec-tools.spec",

+            # no TXT/tboot on arm64

+            "tboot.spec",

+            # backward-cpp does not support amd64

+            "backward-cpp.spec",

+            "envoy.spec",

+            # only generic linux is for arm64

+            "linux-esx.spec",

+            "linux-secure.spec",

+            # only linux-secure supports aufs

+            "aufs-util.spec",

+            # open-vm-tools does not support aarch64

+            "open-vm-tools.spec",

+            # TODO: mariadb build hangs on amd64

+            "mariadb.spec",

+            # TODO: mysql fails on amd64 with fpic

+            "mysql.spec",

+            # irqbalance for arm64 ?

+            "irqbalance.spec",

+            # no X rpms to build openjdk, skip all java packages

+            "openjdk8.spec",

+            "ant-contrib.spec",

+            "apache-ant.spec",

+            "apache-maven.spec",

+            "apache-tomcat.spec",

+            "cassandra.spec",

+            "commons-daemon.spec",

+            "jna.spec",

+            "kubernetes-dashboard.spec",

+            "lightwave.spec",

+            "mesos.spec",

+            "protobuf.spec",

+            "wavefront-proxy.spec",

+            "zookeeper.spec",

+            # requires lightwave

+            "pmd.spec",

+            # requires protobuf

+            "calico-felix.spec",

+            "lightstep-tracer-cpp.spec",

+            "protobuf-c.spec",

+            "runc.spec",

+            # requires cassandra

+            "python-cqlsh.spec",

+            # requires python-pyinstaller, but it has unresolved glibc deps

+            "calico-k8s-policy.spec",

+            "libcalico.spec",

+            # pcstat requires patching for aarch64

+            "pcstat.spec",

+            # sysdig for aarch64 requires luajit, skip it and falco

+            # https://github.com/draios/sysdig/issues/833

+            "sysdig.spec",

+            "falco.spec"

+        ]

+    }

+

     @staticmethod

     def initialize(options):

         constants.dist = options.dist