@@ -180,6 +180,7 @@ packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTA

         $(PHOTON_PACKAGE_BUILDER) -o full \

                 -s $(PHOTON_SPECS_DIR) \

                 -r $(PHOTON_RPMS_DIR) \

+                -a $(PHOTON_SRPMS_DIR) \

                 -x $(PHOTON_SRCS_DIR) \

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

@@ -215,6 +216,7 @@ tool-chain-stage1: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES

         $(PHOTON_PACKAGE_BUILDER) -o full \

                 -s $(PHOTON_SPECS_DIR) \

                 -r $(PHOTON_RPMS_DIR) \

+                -a $(PHOTON_SRPMS_DIR) \

                 -x $(PHOTON_SRCS_DIR) \

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

@@ -233,6 +235,7 @@ tool-chain-stage2: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES

         $(PHOTON_PACKAGE_BUILDER) -o full \

                 -s $(PHOTON_SPECS_DIR) \

                 -r $(PHOTON_RPMS_DIR) \

+                -a $(PHOTON_SRPMS_DIR) \

                 -x $(PHOTON_SRCS_DIR) \

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

@@ -280,6 +283,8 @@ $(PHOTON_STAGE):

 	@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)

+	@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)

@@ -442,6 +447,7 @@ check-packer-ovf-plugin:

                               -b $(PHOTON_CHROOT_PATH) \

                               -s $(PHOTON_SPECS_DIR) \

                               -r $(PHOTON_RPMS_DIR) \

+                              -a $(PHOTON_SRPMS_DIR) \

                               -x $(PHOTON_SRCS_DIR) \

                               -p $(PHOTON_PUBLISH_RPMS_DIR) \

                               -c $(PHOTON_BINTRAY_CONFIG) \

@@ -21,6 +21,7 @@ MAKEROOT := $(realpath $(MAKEROOT))

 PHOTON_STAGE?=$(SRCROOT)/stage

 PHOTON_LOGS_DIR=$(PHOTON_STAGE)/LOGS

 PHOTON_RPMS_DIR=$(PHOTON_STAGE)/RPMS

+PHOTON_SRPMS_DIR=$(PHOTON_STAGE)/SRPMS

 PHOTON_UPDATED_RPMS_DIR?=$(PHOTON_STAGE)/UPDATED_RPMS

 PHOTON_SPECS_DIR?=$(SRCROOT)/SPECS

 PHOTON_COMMON_DIR?=$(SRCROOT)/common

@@ -141,8 +141,9 @@ class PackageUtils(object):

         self.copySourcesTobuildroot(listPatchFiles,package,chrootSourcePath)

         listRPMFiles=[]

+        listSRPMFiles=[]

         try:

-            listRPMFiles = self.buildRPM(chrootSpecPath+"/"+specName,chrootLogsFilePath, chrootCmd)

+            listRPMFiles,listSRPMFiles = self.buildRPM(chrootSpecPath+"/"+specName,chrootLogsFilePath, chrootCmd)

         except Exception as e:

             self.logger.error("Failed while building rpm:"+package)

             raise e

@@ -153,6 +154,9 @@ class PackageUtils(object):

         for rpmFile in listRPMFiles:

             self.copyRPM(chrootID+"/"+rpmFile, constants.rpmPath)

+        for srpmFile in listSRPMFiles:

+            self.copyRPM(chrootID+"/"+srpmFile, constants.sourceRpmPath)

+

     def buildRPM(self,specFile,logFile,chrootCmd):

         rpmBuildcmd= self.rpmbuildBinary+" "+self.rpmbuildBuildallOption+" "+self.rpmbuildDistOption

@@ -174,13 +178,15 @@ class PackageUtils(object):

         fileContents=logfile.readlines()

         logfile.close()

         listRPMFiles=[]

+        listSRPMFiles=[]

         for i in range(0,len(fileContents)):

             if re.search("^Wrote:",fileContents[i]):

                 listcontents=fileContents[i].split()

                 if (len(listcontents) == 2) and listcontents[1].strip()[-4:] == ".rpm" and listcontents[1].find("/RPMS/") != -1:

                     listRPMFiles.append(listcontents[1])

-        

-        return listRPMFiles    

+                if (len(listcontents) == 2) and listcontents[1].strip()[-8:] == ".src.rpm" and listcontents[1].find("/SRPMS/") != -1:

+                    listSRPMFiles.append(listcontents[1])

+        return listRPMFiles,listSRPMFiles    

     def findRPMFileForGivenPackage(self,package):

         cmdUtils = CommandUtils()

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

     parser.add_option("-n",  "--build-number", dest="buildNumber",  default="0000000")

     parser.add_option("-v",  "--release-version", dest="releaseVersion",  default="NNNnNNN")

     parser.add_option("-u",  "--enable-rpmcheck", dest="rpmCheck",  default=False, action ="store_true")

+    parser.add_option("-a",  "--source-rpm-path",  dest="sourceRpmPath",  default="../../stage/SRPMS")

     (options,  args) = parser.parse_args()

     cmdUtils=CommandUtils()

@@ -83,6 +84,9 @@ def main():

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

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

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

+

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

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

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

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

@@ -16,6 +16,7 @@ class constants(object):

     buildPatch=False

     inputRPMSPath=""

     rpmCheck=False

+    sourceRpmPath=""

     noDepsPackageList=["texinfo","bzip2","gettext","man-db","nspr","xz","bison","openjdk","go"]

     listToolChainPackages=["linux-api-headers", "glibc","zlib", "file",

         "binutils","gmp","mpfr", "mpc","gcc", "pkg-config", "ncurses", "bash", "bzip2", "sed","procps-ng","coreutils", "m4","grep",

@@ -60,6 +61,7 @@ class constants(object):

         constants.specPath = options.specPath

         constants.sourcePath = options.sourcePath

         constants.rpmPath = options.rpmPath

+        constants.sourceRpmPath = options.sourceRpmPath

         constants.topDirPath = options.topDirPath

         constants.logPath = options.logPath

         constants.prevPublishRPMRepo=options.publishRPMSPath