@@ -122,6 +122,35 @@ packages: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

                 -j $(PHOTON_DATA_DIR)/build_install_options_all.json \

                 -e ${PARALLEL}

+tool-chain-stage1: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

+	@echo "Building all RPMS..."

+	@cd $(PHOTON_PKG_BUILDER_DIR) && \

+        $(PHOTON_PACKAGE_BUILDER) -o full \

+                -s $(PHOTON_SPECS_DIR) \

+                -r $(PHOTON_RPMS_DIR) \

+                -x $(PHOTON_SRCS_DIR) \

+                -b $(PHOTON_CHROOT_PATH) \

+                -l $(PHOTON_LOGS_DIR) \

+                -p $(PHOTON_PUBLISH_RPMS_DIR) \

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

+                -e ${PARALLEL} \

+                -m stage1

+

+tool-chain-stage2: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

+	@echo "Building all RPMS..."

+	@cd $(PHOTON_PKG_BUILDER_DIR) && \

+        $(PHOTON_PACKAGE_BUILDER) -o full \

+                -s $(PHOTON_SPECS_DIR) \

+                -r $(PHOTON_RPMS_DIR) \

+                -x $(PHOTON_SRCS_DIR) \

+                -b $(PHOTON_CHROOT_PATH) \

+                -l $(PHOTON_LOGS_DIR) \

+                -p $(PHOTON_PUBLISH_RPMS_DIR) \

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

+                -e ${PARALLEL} \

+                -m stage2

+

+

 packages-cached:

 	@echo "Using cached RPMS..."

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

@@ -17,9 +17,6 @@ TEMP_CHROOT=$(pwd)/temp_chroot

 ROOTFS_TAR_FILENAME=photon-rootfs.tar.bz2

 STAGE_DIR=$WORKSPACE_DIR/stage

-

-sudo createrepo $RPMS_DIR

-

 cat > yum.conf <<- "EOF"

 [main]

@@ -67,7 +64,9 @@ rm -rf home/*

 rm -rf var/lib/yum/*

 rm -rf /var/log/*

 tar cpjf ../$ROOTFS_TAR_FILENAME .

-mv ../$ROOTFS_TAR_FILENAME $STAGE_DIR

+mkdir -p $STAGE_DIR

+mv ../$ROOTFS_TAR_FILENAME $STAGE_DIR/

+

 cd ..

 # cleanup

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

     parser.add_option("-j",  "--json-file", dest="inputJSONFile",  default="../../common/data/build_install_options_all.json")

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

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

+    parser.add_option("-m",  "--tool-chain-stage", dest="toolChainStage",  default="None")

     (options,  args) = parser.parse_args()

     cmdUtils=CommandUtils()

@@ -107,7 +108,13 @@ def main():

     '''

     try:

         constants.initialize(options)

-        if options.installPackage:

+        if options.toolChainStage == "stage1":

+            pkgManager = PackageManager()

+            pkgManager.buildToolChain()

+        elif options.toolChainStage == "stage2":

+            pkgManager = PackageManager()

+            pkgManager.buildToolChainPackages(parallelBuild)

+        elif options.installPackage:

             buildAPackage(package, parallelBuild)

         else:

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

@@ -118,6 +125,12 @@ def main():

     sys.exit(0)

+def buildToolChain(parallelBuild):

+    listPackages=[]

+    listPackages.append(package)

+    pkgManager = PackageManager()

+    pkgManager.buildPackages(listPackages, parallelBuild)

+

 def buildAPackage(package, parallelBuild):

     listPackages=[]

     listPackages.append(package)