@@ -42,6 +42,8 @@ CONTAIN := $(TOOLS_BIN)/contain

 check check-bison check-g++ check-gawk check-createrepo check-vagrant check-packer check-packer-ovf-plugin check-sanity \

 clean-install clean-chroot

+PARALLEL=False

+

 all: iso

 micro: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

@@ -65,7 +67,8 @@ packages-micro: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -j $(PHOTON_DATA_DIR)/build_install_options_micro.json

+                -j $(PHOTON_DATA_DIR)/build_install_options_micro.json \

+                -e ${PARALLEL}

 minimal: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

 	@echo "Building Photon Minimal ISO..."

@@ -88,7 +91,8 @@ packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -j $(PHOTON_DATA_DIR)/build_install_options_minimal.json

+                -j $(PHOTON_DATA_DIR)/build_install_options_minimal.json \

+                -e ${PARALLEL}

 iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 	@echo "Building Photon FUll ISO..."

@@ -111,7 +115,8 @@ packages: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -j $(PHOTON_DATA_DIR)/build_install_options_all.json

+                -j $(PHOTON_DATA_DIR)/build_install_options_all.json \

+                -e ${PARALLEL}

 packages-cached:

 	@echo "Using cached RPMS..."

@@ -105,13 +105,13 @@ class PackageManager(object):

         self.logger.info("Possible number of worker threads:"+str(numChroots))

         return numChroots

-    def buildToolChainPackages(self):

+    def buildToolChainPackages(self, parallelBuild):

         self.buildToolChain()

-        self.buildGivenPackages(constants.listToolChainPackages)

+        self.buildGivenPackages(constants.listToolChainPackages, parallelBuild)

-    def buildPackages(self,listPackages):

-        self.buildToolChainPackages()

-        self.buildGivenPackages(listPackages)

+    def buildPackages(self,listPackages, parallelBuild):

+        self.buildToolChainPackages(parallelBuild)

+        self.buildGivenPackages(listPackages, parallelBuild)

     def initializeThreadPool(self,statusEvent):

         ThreadPool.clear()

@@ -126,7 +126,11 @@ class PackageManager(object):

         Scheduler.setEvent(statusEvent)

         Scheduler.stopScheduling=False

-    def buildGivenPackages (self, listPackages):

+    def buildGivenPackages (self, listPackages, parallelBuild):

+        defaultThreads = 1

+        if parallelBuild == True:

+            defaultThreads = 8

+

         returnVal=self.calculateParams(listPackages)

         if not returnVal:

             self.logger.error("Unable to set paramaters. Terminating the package manager.")

@@ -135,11 +139,11 @@ class PackageManager(object):

         statusEvent=threading.Event()

         numWorkerThreads=self.calculatePossibleNumWorkerThreads()

         if numWorkerThreads > 8:

-            numWorkerThreads = 1

+            numWorkerThreads = defaultThreads

         if numWorkerThreads == 0:

             self.logger.error("Unable to create worker threads. Terminating the package manager.")

             raise Exception("No Space.")

-         

+

         self.initializeScheduler(statusEvent)

         self.initializeThreadPool(statusEvent)

@@ -22,6 +22,7 @@ def main():

     parser.add_option("-z",  "--top-dir-path", dest="topDirPath",  default="/usr/src/photon")

     parser.add_option("-j",  "--json-file", dest="inputJSONFile",  default="input.json")

     parser.add_option("-b",  "--build-root-path", dest="buildRootPath",  default="/mnt")

+    parser.add_option("-e",  "--parallel-build", dest="parallelBuild",  default=False)

     (options,  args) = parser.parse_args()

@@ -29,6 +30,11 @@ def main():

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

         cmdUtils.runCommandInShell("mkdir -p "+options.logPath)

+    if options.parallelBuild in ["TRUE", "True", "true"]:

+        parallelBuild = True

+    else:

+        parallelBuild = False

+

     logger=Logger.getLogger(options.logPath+"/Main")

     errorFlag=False

@@ -82,7 +88,7 @@ def main():

         logger.info("JSON File :" + options.inputJSONFile)

     else:

         logger.info("Package to build:"+package)

-    

+

     '''    

     listPackages=["acl","attr","autoconf","automake","bash","bc","bindutils","binutils","bison","boost","btrfs-progs","bzip2","ca-certificates","cdrkit","check",

                   "cloud-init","cmake","coreutils","cpio","cracklib","createrepo","curl","cyrus-sasl","db","dbus","deltarpm","diffutils","docbook-xml","docbook-xsl",

@@ -103,9 +109,9 @@ def main():

     try:

         constants.initialize(options)

         if options.installPackage:

-            buildAPackage(package)

+            buildAPackage(package, parallelBuild)

         else:

-            buildPackagesFromGivenJSONFile(options.inputJSONFile, options.buildOption,logger)

+            buildPackagesFromGivenJSONFile(options.inputJSONFile, options.buildOption,logger, parallelBuild)

     except Exception as e:

         logger.error("Caught an exception")

         logger.error(str(e))

@@ -113,13 +119,13 @@ def main():

     sys.exit(0)

-def buildAPackage(package):

+def buildAPackage(package, parallelBuild):

     listPackages=[]

     listPackages.append(package)

     pkgManager = PackageManager()

-    pkgManager.buildPackages(listPackages)

+    pkgManager.buildPackages(listPackages, parallelBuild)

-def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger):

+def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger, parallelBuild):

     listPackages = get_all_package_names(inputJSONFile)

     listPackagesToBuild=[]

@@ -129,7 +135,7 @@ def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger):

     logger.info("List of packages to build:")

     logger.info(listPackagesToBuild)

     pkgManager = PackageManager()

-    pkgManager.buildPackages(listPackagesToBuild)

+    pkgManager.buildPackages(listPackagesToBuild, parallelBuild)

 def get_all_package_names(build_install_option):

     base_path = os.path.dirname(build_install_option)