@@ -44,7 +44,7 @@ endif

 ifdef PHOTON_ENABLE_RPMCHECK

 PHOTON_RPMCHECK_OPTION := -u

 else

-PHOTON_RPMCHECK_OPTION := 

+PHOTON_RPMCHECK_OPTION :=

 endif

 TOOLS_BIN := $(SRCROOT)/tools/bin

@@ -78,14 +78,13 @@ micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

 packages-micro: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists

 	@echo "Building all Micro RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) -o full \

+        $(PHOTON_PACKAGE_BUILDER) \

                 -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_GENERATED_DATA_DIR)/$(MICRO_PACKAGE_LIST_FILE) \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

@@ -141,14 +140,13 @@ live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso

 packages-minimal: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) -o full \

+        $(PHOTON_PACKAGE_BUILDER) \

                 -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_GENERATED_DATA_DIR)/$(MINIMAL_PACKAGE_LIST_FILE) \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

@@ -198,8 +196,6 @@ src-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

                 -p $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

                 -o $(PHOTON_STAGE)/common/data \

                 -s $(PHOTON_DATA_DIR) \

-                -u $(PHOTON_DATA_DIR)/pkg_info.json\

-                -z $(PHOTON_STAGE)/pkg_info.txt\

                 -f > \

                 $(PHOTON_LOGS_DIR)/sourceiso-installer.log 2>&1

@@ -213,12 +209,12 @@ imgtree:

 who-needs:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

-		$(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -i who-needs -p $(pkg) 

+		$(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -i who-needs -p $(pkg)

 packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) -o full \

+        $(PHOTON_PACKAGE_BUILDER) \

                 -s $(PHOTON_SPECS_DIR) \

                 -r $(PHOTON_RPMS_DIR) \

                 -a $(PHOTON_SRPMS_DIR) \

@@ -226,12 +222,11 @@ packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTA

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -j $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

-                -w $(PHOTON_DATA_DIR)/pkg_info.json \

+                -w $(PHOTON_STAGE)/pkg_info.json \

                 -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

                 $(PHOTON_RPMCHECK_OPTION) \

                 -t ${THREADS}

@@ -239,14 +234,13 @@ packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTA

 updated-packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building only updated RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) -o full \

+        $(PHOTON_PACKAGE_BUILDER) \

                 -s $(PHOTON_SPECS_DIR) \

                 -r $(PHOTON_UPDATED_RPMS_DIR) \

                 -x $(PHOTON_SRCS_DIR) \

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -j $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

@@ -258,7 +252,7 @@ updated-packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

 tool-chain-stage1: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) -o full \

+        $(PHOTON_PACKAGE_BUILDER) \

                 -s $(PHOTON_SPECS_DIR) \

                 -r $(PHOTON_RPMS_DIR) \

                 -a $(PHOTON_SRPMS_DIR) \

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

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -j $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

                 -t ${THREADS} \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

@@ -278,7 +271,7 @@ tool-chain-stage1: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES

 tool-chain-stage2: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) -o full \

+        $(PHOTON_PACKAGE_BUILDER) \

                 -s $(PHOTON_SPECS_DIR) \

                 -r $(PHOTON_RPMS_DIR) \

                 -a $(PHOTON_SRPMS_DIR) \

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

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -j $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

                 -t ${THREADS} \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

@@ -107,7 +107,7 @@ def create_additional_file_list_to_copy_in_iso(base_path, build_install_option):

     file_list = []

     for install_option in options_sorted:

         if install_option[1].has_key("additional-files"):

-            file_list = file_list + map(lambda filename: os.path.join(base_path, filename), install_option[1].get("additional-files")) 

+            file_list = file_list + map(lambda filename: os.path.join(base_path, filename), install_option[1].get("additional-files"))

     return file_list

 def get_live_cd_status_string(build_install_option):

@@ -121,21 +121,6 @@ def get_live_cd_status_string(build_install_option):

                 return "true"

     return "false"

-def generate_pkginfo_text_file(list_rpms, pkg_info_json_file_path, pkg_info_text_file_path):

-    if not os.path.isfile(pkg_info_json_file_path):

-        return

-    pkg_info_json_file = open(pkg_info_json_file_path,'r')

-    data = json.load(pkg_info_json_file)

-    pkg_info_json_file.close()

-    list_lines = []

-    list_lines.append("#%{name},%{version},%{release},%{arch},%{sourcerpm}\n") 

-    for rpm in list_rpms:

-       if data.has_key(rpm):

-           list_lines.append(data[rpm]["name"]+","+data[rpm]["version"]+","+data[rpm]["release"]+","+data[rpm]["arch"]+","+data[rpm]["sourcerpm"]+"\n") 

-    pkg_info_text_file = open(pkg_info_text_file_path,'w')

-    pkg_info_text_file.writelines(list_lines)

-    pkg_info_text_file.close()

-

 if __name__ == '__main__':

     usage = "Usage: %prog [options] <config file> <tools path>"

     parser = OptionParser(usage)

@@ -153,8 +138,6 @@ if __name__ == '__main__':

     parser.add_option("-m", "--stage-path", dest="stage_path", default="../stage")

     parser.add_option("-c", "--dracut-configuration", dest="dracut_configuration_file", default="../common/data/dracut_configuration.json")

     parser.add_option("-s", "--json-data-path", dest="json_data_path", default="../stage/common/data/")

-    parser.add_option("-u", "--pkginfo-json-file", dest="pkginfo_json_file", default="../common/data/pkg_info.json")

-    parser.add_option("-z", "--pkginfo-txt-file", dest="pkginfo_txt_file", default="../stage/pkg_info.txt")

     (options,  args) = parser.parse_args()

     if options.iso_path or options.src_iso_path:

@@ -262,7 +245,6 @@ if __name__ == '__main__':

         list_rpms = rpm_list.split(" ")

         list_rpms = list(set(list_rpms))

         list_rpms.sort()

-        generate_pkginfo_text_file(list_rpms, options.pkginfo_json_file, options.pkginfo_txt_file)

     # Cleaning up for vmdk

     if 'vmdk_install' in config and config['vmdk_install']:

@@ -8,7 +8,7 @@ from constants import constants

 import shutil

 class PackageBuilder(object):

-    

+

     def __init__(self,mapPackageToCycles,listAvailableCyclicPackages,listBuildOptionPackages,pkgBuildOptionFile,logName=None,logPath=None):

         if logName is None:

             logName = "PackageBuilder"

@@ -22,7 +22,7 @@ class PackageBuilder(object):

         self.listNodepsPackages = ["glibc","gmp","zlib","file","binutils","mpfr","mpc","gcc","ncurses","util-linux","groff","perl","texinfo","rpm","openssl","go"]

         self.listBuildOptionPackages=listBuildOptionPackages

         self.pkgBuildOptionFile=pkgBuildOptionFile

-        

+

     def prepareBuildRoot(self,chrootName,isToolChainPackage=False):

         chrootID=None

         try:

@@ -42,7 +42,7 @@ class PackageBuilder(object):

                 chrUtils.destroyChroot(chrootID)

             raise e

         return chrootID

-    

+

     def findPackageNameFromRPMFile(self,rpmfile):

         rpmfile=os.path.basename(rpmfile)

         releaseindex=rpmfile.rfind("-")

@@ -55,7 +55,7 @@ class PackageBuilder(object):

             return None

         packageName=rpmfile[0:versionindex]

         return packageName

-    

+

     def findInstalledPackages(self,chrootID):

         pkgUtils = PackageUtils(self.logName,self.logPath)

         listInstalledRPMs=pkgUtils.findInstalledRPMPackages(chrootID)

@@ -65,7 +65,7 @@ class PackageBuilder(object):

             if packageName is not None:

                 listInstalledPackages.append(packageName)

         return listInstalledPackages

-    

+

     def buildPackageThreadAPI(self,package,outputMap, threadName,):

         try:

             self.buildPackage(package)

@@ -85,7 +85,7 @@ class PackageBuilder(object):

                 break

         return packageIsAlreadyBuilt

-    def buildPackage(self,package):

+    def buildPackage(self, package):

         #do not build if RPM is already built

         if self.checkIfPackageIsAlreadyBuilt(package):

             self.logger.info("Skipping building the package:"+package)

@@ -104,12 +104,12 @@ class PackageBuilder(object):

             if not os.path.isdir(destLogPath):

                 cmdUtils = CommandUtils()

                 cmdUtils.runCommandInShell("mkdir -p "+destLogPath)

-            

+

             listInstalledPackages=self.findInstalledPackages(chrootID)

             self.logger.info("List of installed packages")

             self.logger.info(listInstalledPackages)

             listDependentPackages=self.findBuildTimeRequiredPackages(package)

-            

+

             pkgUtils = PackageUtils(self.logName,self.logPath)

             if len(listDependentPackages) != 0:

                 self.logger.info("Installing the build time dependent packages......")

@@ -129,16 +129,16 @@ class PackageBuilder(object):

             raise e

         if chrootID is not None:

             chrUtils.destroyChroot(chrootID)

-        

-        

+

+

     def findRunTimeRequiredRPMPackages(self,rpmPackage):

         listRequiredPackages=constants.specData.getRequiresForPackage(rpmPackage)

         return listRequiredPackages

-    

+

     def findBuildTimeRequiredPackages(self,package):

         listRequiredPackages=constants.specData.getBuildRequiresForPackage(package)

         return listRequiredPackages

-    

+

     def installPackage(self,pkgUtils,package,chrootID,destLogPath,listInstalledPackages):

         if package in listInstalledPackages:

             return

@@ -3,42 +3,56 @@ from Logger import Logger

 from constants import constants

 import os.path

 from CommandUtils import CommandUtils

+from PackageUtils import PackageUtils

-class SourcePackageInfo(object):

-     sourcePkgList = {}

-     logger = None

+class PackageInfo(object):

-

-     @staticmethod

-     def setLogging(logName=None,logPath=None):

+    def __init__(self, logName=None, logPath=None):

         if logName is None:

-            logName = "SourcePackageInfo"

+            logName = "PackageInfo"

         if logPath is None:

             logPath = constants.logPath

-        SourcePackageInfo.logger=Logger.getLogger(logName,logPath)

-

-     @staticmethod

-     def loadPkgInfoFromFile(filePath):

-         SourcePackageInfo.logger.info("Loading source package list from the json file")

-         if not os.path.isfile(filePath):

-             return

-         pkgInfoFile = open(filePath,'r')

-         SourcePackageInfo.sourcePkgList = json.load(pkgInfoFile)

-         pkgInfoFile.close()

+        self.logName=logName

+        self.logPath=logPath

+        self.logger=Logger.getLogger(logName,logPath)

+        self.pkgList = {}

-     @staticmethod

-     def addSRPMData(packageName,version,release,arch,srpmFile):

-         listPkgAttributes={"name":packageName,"version":version,"release":release,"arch":arch,"sourcerpm":srpmFile}

-         SourcePackageInfo.sourcePkgList[packageName]=listPkgAttributes

-         SourcePackageInfo.logger.info("Added source package to the list:"+packageName)

+    def loadPackagesData(self):

+        listPackages =  constants.specData.getListPackages()

+        listPackages.sort()

+        listRPMFiles = []

+        cmdUtils = CommandUtils()

+        for package in listPackages:

+            release = constants.specData.getRelease(package)

+            version = constants.specData.getVersion(package)

+            listRPMPackages = constants.specData.getRPMPackages(package)

+            srpmFileName = package+"-"+version+"-"+release+".src.rpm"

+            srpmFiles = cmdUtils.findFile(srpmFileName, constants.sourceRpmPath)

+            srpmFile = None

+            if len(srpmFiles) == 1:

+                srpmFile = srpmFiles[0]

+            debugrpmFileName = package+"-debuginfo-"+version+"-"+release+"*"

+            debugrpmFiles = cmdUtils.findFile(debugrpmFileName, constants.rpmPath)

+            debugrpmFile = None

+            if len(debugrpmFiles) == 1:

+                debugrpmFile = debugrpmFiles[0]

+            pkgUtils = PackageUtils(self.logName,self.logPath)

+            for rpmPkg in listRPMPackages:

+                rpmFile = pkgUtils.findRPMFileForGivenPackage(rpmPkg)

+                if rpmFile is not None:

+                    listRPMFiles.append(rpmFile)

+                    listPkgAttributes = {"sourcerpm":srpmFile, "rpm":rpmFile, "debugrpm":debugrpmFile}

+                    self.pkgList[rpmPkg] = listPkgAttributes

+                    self.logger.debug("Added "+rpmPkg +" rpm package to the list")

+                else:

+                    self.logger.error("Missing rpm file for package:"+rpmPkg)

-     @staticmethod

-     def writePkgListToFile(fileName):

-         SourcePackageInfo.logger.info("Writing source package list to the json file")

+    def writePkgListToFile(self, fileName):

+         self.logger.info("Writing package list to the json file")

          cmdUtils=CommandUtils()

          dirPath=os.path.basename(fileName)

          if not os.path.isdir(dirPath):

              cmdUtils.runCommandInShell("mkdir -p "+dirPath)

          pkgInfoFile = open(fileName,'w+')

-         json.dump(SourcePackageInfo.sourcePkgList, pkgInfoFile,indent=4)

+         json.dump(self.pkgList, pkgInfoFile, indent=4)

          pkgInfoFile.close()

@@ -6,12 +6,11 @@ from constants import constants

 import re

 from time import sleep

 import PullSources

-from PackageInfo import SourcePackageInfo

 import json

 import collections

 class PackageUtils(object):

-    

+

     def __init__(self,logName=None,logPath=None):

         if logName is None:

             self.logName = "PackageUtils"

@@ -24,7 +23,7 @@ class PackageUtils(object):

         self.rpmBinary = "rpm"

         self.installRPMPackageOptions = "-Uvh"

         self.nodepsRPMPackageOptions = "--nodeps"

-        

+

         self.rpmbuildBinary = "rpmbuild"

         self.rpmbuildBuildallOption = "-ba --clean"

         self.rpmbuildNocheckOption = "--nocheck"

@@ -36,7 +35,7 @@ class PackageUtils(object):

         self.packagesToInstallInAOneShot=""

         self.noDepsRPMFilesToInstallInAOneShot=""

         self.noDepsPackagesToInstallInAOneShot=""

-    

+

     def getRPMArch(self,rpmName):

         arch=""

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

@@ -49,7 +48,7 @@ class PackageUtils(object):

         arch = self.getRPMArch(rpmName)

         rpmDestDir=rpmDir+"/"+arch

         return rpmDestDir

-    

+

     def copyRPM(self,rpmFile,destDir):

         cmdUtils = CommandUtils()

         rpmName=os.path.basename(rpmFile)

@@ -60,11 +59,11 @@ class PackageUtils(object):

                 cmdUtils.runCommandInShell("mkdir -p "+rpmDestDir)

             shutil.copyfile(rpmFile,  rpmDestPath)

         return rpmDestPath

-    

+

     def installRPM(self,package,chrootID,noDeps=False,destLogPath=None):

 #        self.logger.info("Installing rpm for package:"+package)

 #        self.logger.debug("No deps:"+str(noDeps))

-        

+

         rpmfile=self.findRPMFileForGivenPackage(package)

         if rpmfile is None:

             self.logger.error("No rpm file found for package:"+package)

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

         else:

             self.rpmFilesToInstallInAOneShot += " " + rpmFile

             self.packagesToInstallInAOneShot += " " + package

- 

+

     def installRPMSInAOneShot(self,chrootID,destLogPath):

         chrootCmd=self.runInChrootCommand+" "+chrootID

         rpmInstallcmd=self.rpmBinary+" "+ self.installRPMPackageOptions

@@ -104,8 +103,8 @@ class PackageUtils(object):

             if not returnVal:

                 self.logger.error("Unable to install rpms")

                 raise Exception("RPM installation failed")

-        

-    

+

+

     def copySourcesTobuildroot(self,listSourceFiles,package,destDir):

         cmdUtils = CommandUtils()

         for source in listSourceFiles:

@@ -133,7 +132,7 @@ class PackageUtils(object):

                 raise Exception("Multiple sources found")

             self.logger.info("Copying... Source path :" + source + " Source filename: " + sourcePath[0])

             shutil.copy2(sourcePath[0], destDir)

-    

+

     def copyAdditionalBuildFiles(self,listAdditionalFiles,chrootID):

         cmdUtils = CommandUtils()

         for additionalFile in listAdditionalFiles:

@@ -144,7 +143,7 @@ class PackageUtils(object):

                     shutil.copy(source, destDir)

                 else:

                     shutil.copytree(source, destDir)

-        

+

     def buildRPMSForGivenPackage(self,package,chrootID,listBuildOptionPackages,pkgBuildOptionFile,destLogPath=None):

         self.logger.info("Building rpm's for package:"+package)

@@ -152,13 +151,13 @@ class PackageUtils(object):

         listPatchFiles =  constants.specData.getPatches(package)

         specFile = constants.specData.getSpecFile(package)

         specName = constants.specData.getSpecName(package) + ".spec"

-        

+

         chrootSourcePath=chrootID+constants.topDirPath+"/SOURCES/"

         chrootSpecPath=constants.topDirPath+"/SPECS/"

         chrootLogsFilePath=chrootID+constants.topDirPath+"/LOGS/"+package+".log"

         chrootCmd=self.runInChrootCommand+" "+chrootID

         shutil.copyfile(specFile, chrootID+chrootSpecPath+specName )

-        

+

 # FIXME: some sources are located in SPECS/.. how to mount?

 #        if os.geteuid()==0:

         self.copySourcesTobuildroot(listSourcesFiles,package,chrootSourcePath)

@@ -180,7 +179,7 @@ class PackageUtils(object):

                     macrolist = pkg[1]["macros"]

                     for macro in macrolist:

                         macros.append(str(macro.encode('utf-8')))

-            

+

             self.copyAdditionalBuildFiles(listAdditionalFiles,chrootID)

         #Adding rpm macros

@@ -200,26 +199,22 @@ class PackageUtils(object):

                 shutil.copy2(chrootLogsFilePath, destLogPath)

         self.logger.info("RPM build is successful")

         arch = self.getRPMArch(listRPMFiles[0])

-       

+

         for rpmFile in listRPMFiles:

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

-        

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

+

         for srpmFile in listSRPMFiles:

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

-            srpmName = os.path.basename(srpmFile)

-            package,version,release = self.findPackageInfoFromSourceRPMFile(srpmFile)

-            SourcePackageInfo.addSRPMData(package,version,release,arch,srpmName)

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

-    

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

-        

+

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

         if not constants.rpmCheck:

             rpmBuildcmd+=" "+self.rpmbuildNocheckOption

         for macro in macros:

             rpmBuildcmd+=' --define \\\"%s\\\"' % macro

         rpmBuildcmd+=" "+specFile

-        

+

         cmdUtils = CommandUtils()

         self.logger.info("Building rpm....")

         self.logger.info(rpmBuildcmd)

@@ -227,7 +222,7 @@ class PackageUtils(object):

         if not returnVal:

             self.logger.error("Building rpm is failed "+specFile)

             raise Exception("RPM Build failed")

-        

+

         #Extracting rpms created from log file

         logfile=open(logFile,'r')

         fileContents=logfile.readlines()

@@ -241,8 +236,8 @@ class PackageUtils(object):

                     listRPMFiles.append(listcontents[1])

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

                     listSRPMFiles.append(listcontents[1])

-        return listRPMFiles,listSRPMFiles    

-    

+        return listRPMFiles,listSRPMFiles

+

     def findRPMFileForGivenPackage(self,package):

         cmdUtils = CommandUtils()

         version = constants.specData.getVersion(package)

@@ -251,7 +246,7 @@ class PackageUtils(object):

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

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

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

         if len(listFoundRPMFiles) == 1 :

             return listFoundRPMFiles[0]

         if len(listFoundRPMFiles) == 0 :

@@ -259,7 +254,7 @@ class PackageUtils(object):

         if len(listFoundRPMFiles) > 1 :

             self.logger.error("Found multiple rpm files for given package in rpm directory.Unable to determine the rpm file for package:"+package)

             raise Exception("Multiple rpm files found")

-    

+

     def findPackageNameFromRPMFile(self,rpmfile):

         rpmfile=os.path.basename(rpmfile)

         releaseindex=rpmfile.rfind("-")

@@ -271,7 +266,7 @@ class PackageUtils(object):

             self.logger.error("Invalid rpm file:"+rpmfile)

             raise Exception("Invalid RPM")

         packageName=rpmfile[0:versionindex]

-        return packageName 

+        return packageName

     def findPackageInfoFromRPMFile(self,rpmfile):

         rpmfile=os.path.basename(rpmfile)

@@ -290,22 +285,6 @@ class PackageUtils(object):

         release=rpmfile[releaseindex+1:]

         return packageName,version,release

-    def findPackageInfoFromSourceRPMFile(self,sourcerpmfile):

-        sourcerpmfile=os.path.basename(sourcerpmfile)

-        sourcerpmfile=sourcerpmfile.replace(".src.rpm","")

-        releaseindex=sourcerpmfile.rfind("-")

-        if releaseindex == -1:

-            self.logger.error("Invalid source rpm file:"+sourcerpmfile)

-            raise Exception("Invalid Source RPM")

-        versionindex=sourcerpmfile[0:releaseindex].rfind("-")

-        if versionindex == -1:

-            self.logger.error("Invalid source rpm file:"+sourcerpmfile)

-            raise Exception("Invalid source RPM")

-        packageName=sourcerpmfile[0:versionindex]

-        version=sourcerpmfile[versionindex+1:releaseindex]

-        release=sourcerpmfile[releaseindex+1:]

-        return packageName,version,release

- 

     def findInstalledRPMPackages(self, chrootID):

         cmd = self.rpmBinary+" "+self.queryRpmPackageOptions

         chrootCmd=self.runInChrootCommand+" "+chrootID

@@ -53,16 +53,16 @@ class SerializableSpecObjectsUtils(object):

             specObj.url=spec.getURL()

             specObj.sourceurl=spec.getSourceURL()

             for specPkg in specObj.listPackages:

-	    	if specPkg in self.mapPackageToSpec:

-		    existingObj = self.mapSerializableSpecObjects[self.mapPackageToSpec[specPkg]]

-		    if self.compareVersions(existingObj,specObj) == 1:

-			skipUpdating = True

-			break;

+                if specPkg in self.mapPackageToSpec:

+                    existingObj = self.mapSerializableSpecObjects[self.mapPackageToSpec[specPkg]]

+                    if self.compareVersions(existingObj,specObj) == 1:

+                        skipUpdating = True

+                        break;

             	specObj.installRequiresPackages[specPkg]=spec.getRequires(specPkg)

-            	self.mapPackageToSpec[specPkg]=specName

+                self.mapPackageToSpec[specPkg]=specName

                 if spec.getIsRPMPackage(specPkg):

                     specObj.listRPMPackages.append(specPkg)

-	    if skipUpdating == False:

+            if skipUpdating == False:

                 self.mapSerializableSpecObjects[specName]=specObj

     def getListSpecFiles(self,listSpecFiles,path):

@@ -169,19 +169,19 @@ class SerializableSpecObjectsUtils(object):

                 return specName

         self.logger.error("Could not able to find "+package+" package from specs")

         raise Exception("Invalid package:"+package)

-    

+

     def isRPMPackage(self,package):

         if self.mapPackageToSpec.has_key(package):

             specName=self.mapPackageToSpec[package]

             if self.mapSerializableSpecObjects.has_key(specName):

                 return True

         return False

-    

+

     def getSecurityHardeningOption(self, package):

         specName=self.getSpecName(package)

         return self.mapSerializableSpecObjects[specName].securityHardening

-    def getListSpecs(self):

+    def getListPackages(self):

         return self.mapSerializableSpecObjects.keys()

     def getURL(self, package):

@@ -12,7 +12,7 @@ from SpecUtils import Specutils

 from StringUtils import StringUtils

 import collections

 import traceback

-from PackageInfo import SourcePackageInfo

+from PackageInfo import PackageInfo

 def main():

     usage = "Usage: %prog [options] <package name>"

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

     parser.add_option("-i",  "--install-package", dest="installPackage",  default=False,  action ="store_true")

     parser.add_option("-p",  "--publish-RPMS-path", dest="publishRPMSPath",  default="../../stage/PUBLISHRPMS")

     parser.add_option("-l",  "--log-path", dest="logPath",  default="../../stage/LOGS")

-    parser.add_option("-o",  "--build-option", dest="buildOption",  default="full")

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

-    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("-t",  "--threads", dest="buildThreads",  default=1, type="int", help="Number of working threads")

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

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

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

-    parser.add_option("-w",  "--pkginfo-file",  dest="pkgInfoFile",  default="../../common/data/pkg_info.json")

+    parser.add_option("-w",  "--pkginfo-file",  dest="pkgInfoFile",  default="../../stage/pkg_info.json")

     parser.add_option("-g",  "--pkg-build-option-file",  dest="pkgBuildOptionFile",  default="../../common/data/pkg_build_options.json")

     (options,  args) = parser.parse_args()

@@ -48,7 +46,7 @@ def main():

     errorFlag=False

     package = None

-    pkgInfoJsonFile=options.pkgInfoFile

+    pkgInfoJsonFile = options.pkgInfoFile

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

         logger.error("Given Sources Path is not a directory:"+options.sourcePath)

         errorFlag = True

@@ -65,9 +63,6 @@ def main():

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

         errorFlag = True

-    if not os.path.isfile(options.inputJSONFile) and not options.installPackage:

-        logger.error("Given JSON File is not a file:"+options.inputJSONFile)

-        errorFlag = True

     if not os.path.isfile(options.pkgBuildOptionFile):

         logger.warning("Given JSON File is not a file:"+options.pkgBuildOptionFile)

@@ -103,19 +98,16 @@ def main():

     logger.info("Log Path :" + options.logPath)

     logger.info("Top Dir Path :" + options.topDirPath)

     logger.info("Publish RPMS Path :" + options.publishRPMSPath)

-    if not options.installPackage:

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

-    else:

+

+    if options.installPackage:

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

     listBuildOptionPackages = get_packages_with_build_options(options.pkgBuildOptionFile)

     try:

         constants.initialize(options)

-        SourcePackageInfo.setLogging()

-        SourcePackageInfo.loadPkgInfoFromFile(pkgInfoJsonFile)

         if package == "packages_list":

-            buildPackagesList(options.specPath, options.buildRootPath+"/../packages_list.csv")

+            buildPackagesList(options.buildRootPath+"/../packages_list.csv")

         elif package == "sources_list":

             if not os.path.isdir("../../stage/yaml_sources"):

                 cmdUtils.runCommandInShell("mkdir -p ../../stage/yaml_sources")

@@ -133,7 +125,7 @@ def main():

         elif options.installPackage:

             buildAPackage(package, listBuildOptionPackages, options.pkgBuildOptionFile, options.buildThreads)

         else:

-            buildPackagesFromGivenJSONFile(options.inputJSONFile, options.buildOption, listBuildOptionPackages, options.pkgBuildOptionFile, logger, options.buildThreads)

+            buildPackagesForAllSpecs(listBuildOptionPackages, options.pkgBuildOptionFile, logger, options.buildThreads, pkgInfoJsonFile)

     except Exception as e:

         logger.error("Caught an exception")

         logger.error(str(e))

@@ -141,26 +133,24 @@ def main():

         traceback.print_exc()

         sys.exit(1)

-    logger.info("Writing Package info to the file:"+pkgInfoJsonFile)

-    SourcePackageInfo.writePkgListToFile(pkgInfoJsonFile)

     sys.exit(0)

 def buildToolChain(buildThreads):

     pkgManager = PackageManager()

     pkgManager.buildToolChainPackages(buildThreads)

-def buildPackagesList(specPath, csvFilename):

+def buildPackagesList(csvFilename):

     csvFile = open(csvFilename, "w")

     csvFile.write("Package,Version,License,URL,Sources,Patches\n")

-    listSpecs =  constants.specData.getListSpecs()

-    listSpecs.sort()

-    for spec in listSpecs:

-        name = spec

-        version = constants.specData.getVersion(spec)

-        license = constants.specData.getLicense(spec)

-        listPatches = constants.specData.getPatches(spec)

-        url = constants.specData.getURL(spec)

-        listSourceNames = constants.specData.getSources(spec)

+    listPackages =  constants.specData.getListPackages()

+    listPackages.sort()

+    for package in listPackages:

+        name = package

+        version = constants.specData.getVersion(package)

+        license = constants.specData.getLicense(package)

+        listPatches = constants.specData.getPatches(package)

+        url = constants.specData.getURL(package)

+        listSourceNames = constants.specData.getSources(package)

         sources = ""

         patches = ""

         if listPatches is not None:

@@ -174,25 +164,25 @@ def buildSourcesList(yamlDir, logger, singleFile=True):

     strUtils = StringUtils()

     if singleFile:

         yamlFile = open(yamlDir+"/sources_list.yaml", "w")

-    listSpecs =  constants.specData.getListSpecs()

-    listSpecs.sort()

+    listPackages =  constants.specData.getListPackages()

+    listPackages.sort()

     import PullSources

-    for spec in listSpecs:

-        ossname = spec

-        ossversion = constants.specData.getVersion(spec)

+    for package in listPackages:

+        ossname = package

+        ossversion = constants.specData.getVersion(package)

         modified = False

-        listPatches = constants.specData.getPatches(spec)

+        listPatches = constants.specData.getPatches(package)

         if listPatches is not None and len(listPatches) > 0 :

             modified = True

-        url = constants.specData.getSourceURL(spec)

+        url = constants.specData.getSourceURL(package)

         if url is None:

-            url = constants.specData.getURL(spec)

+            url = constants.specData.getURL(package)

         sourceName = None

-        listSourceNames = constants.specData.getSources(spec)

+        listSourceNames = constants.specData.getSources(package)

         if len(listSourceNames) >0:

             sourceName=listSourceNames[0]

-            sha1 = constants.specData.getSHA1(spec, sourceName)

+            sha1 = constants.specData.getSHA1(package, sourceName)

             if sha1 is not None:

                 PullSources.get(sourceName, sha1, yamlDir, constants.pullsourcesConfig)

@@ -220,13 +210,13 @@ def buildSRPMList(srpmPath, yamlDir, logger, singleFile=True):

     strUtils = StringUtils()

     if singleFile:

         yamlFile = open(yamlDir+"/srpm_list.yaml", "w")

-    listSpecs =  constants.specData.getListSpecs()

-    listSpecs.sort()

+    listPackages =  constants.specData.getListPackages()

+    listPackages.sort()

     cmdUtils = CommandUtils()

-    for spec in listSpecs:

-        ossname = spec

-        ossversion = constants.specData.getVersion(spec)

-        ossrelease = constants.specData.getRelease(spec)

+    for package in listPackages:

+        ossname = package

+        ossversion = constants.specData.getVersion(package)

+        ossrelease = constants.specData.getRelease(package)

         listFoundSRPMFiles = cmdUtils.findFile(ossname+"-"+ossversion+"-"+ossrelease+".src.rpm",srpmPath)

         srpmName = None

@@ -264,17 +254,19 @@ def buildAPackage(package, listBuildOptionPackages, pkgBuildOptionFile, buildThr

     pkgManager = PackageManager()

     pkgManager.buildPackages(listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

-def buildPackagesFromGivenJSONFile(inputJSONFile, buildOption, listBuildOptionPackages, pkgBuildOptionFile, logger, buildThreads):

-    listPackages = get_all_package_names(inputJSONFile)

+def buildPackagesForAllSpecs(listBuildOptionPackages, pkgBuildOptionFile, logger, buildThreads, pkgInfoJsonFile):

+    listPackages = constants.specData.getListPackages()

-    listPackagesToBuild=[]

-    for pkg in listPackages:

-        p =  pkg.encode('utf-8')

-        listPackagesToBuild.append(str(p))

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

-    logger.info(listPackagesToBuild)

+    logger.info(listPackages)

     pkgManager = PackageManager()

-    pkgManager.buildPackages(listPackagesToBuild, listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

+    pkgManager.buildPackages(listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

+

+    #Generating package info file which is required by installer

+    logger.info("Writing Package info to the file:"+pkgInfoJsonFile)

+    pkgInfo = PackageInfo()

+    pkgInfo.loadPackagesData()

+    pkgInfo.writePkgListToFile(pkgInfoJsonFile)

 def get_packages_with_build_options(pkg_build_options_file):

     packages = []