@@ -36,6 +36,7 @@ packages: check $(PHOTON_TOOLCHAIN_MINIMAL) $(PHOTON_SOURCES)

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

     $(PHOTON_PACKAGE_BUILDER) -a \

+                              -b $(PHOTON_CHROOT_PATH) \

                               -s $(PHOTON_SPECS_DIR) \

                               -r $(PHOTON_RPMS_DIR) \

                               -o $(PHOTON_SRCS_DIR) \

@@ -1,16 +1,13 @@

 Summary:	The package automatically configure source code

 Name:		autoconf

 Version:	2.69

-Release:	3%{?dist}

+Release:	1%{?dist}

 License:	GPLv2

 URL:		http://www.gnu.org/software/autoconf

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

-Distribution: 	Photon

-Source0:	http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz

-Requires:	perl

-BuildRequires:	m4

-Requires:	m4

+Distribution: Photon

+Source0:		http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz

 %description

 The package contains programs for producing shell scripts that can

 automatically configure source code.

@@ -30,9 +27,5 @@ rm -rf %{buildroot}%{_infodir}

 %{_mandir}/*/*

 %{_datarootdir}/autoconf/*

 %changelog

-*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 2.69-3

--	Adding m4 package to build and run time required package 

-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 2.69-2

--	Adding perl packages to required packages

 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.69-1

 -	Initial build.	First version

@@ -1,14 +1,13 @@

 Summary:	Programs for generating Makefiles

 Name:		automake

 Version:	1.14.1

-Release:	2%{?dist}

+Release:	1%{?dist}

 License:	GPLv2+

 URL:		http://www.gnu.org/software/automake/

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

-Distribution: 	Photon

-Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz

-BuildRequires:	autoconf

+Distribution: Photon

+Source0:		http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz

 %description

 Contains programs for generating Makefiles for use with Autoconf.

 %prep

@@ -34,7 +33,5 @@ rm -rf %{buildroot}%{_infodir}

 %{_defaultdocdir}/%{name}-%{version}/*

 %{_mandir}/*/*

 %changelog

-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 1.14.1-2

--	Adding autoconf package to build time requires packages

 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.14.1-1

 -	Initial build. First version

@@ -1,17 +1,13 @@

 Summary:	Contains a parser generator

 Name:		bison

 Version:	3.0.2

-Release:	2%{?dist}

+Release:	1%{?dist}

 License:	GPLv3+

 URL:		http://www.gnu.org/software/bison

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

 Distribution: 	Photon

 Source0:	http://ftp.gnu.org/gnu/bison/%{name}-%{version}.tar.xz

-BuildRequires:	m4

-Requires:	m4

-BuildRequires:	flex

-Requires:	flex

 %description

 This package contains a parser generator

 %prep

@@ -73,7 +69,5 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %lang(zh_TW) %{_datarootdir}/locale/zh_TW/LC_MESSAGES/bison-runtime.mo

 %{_mandir}/*/*

 %changelog

-*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 3.0.2-2

--	Adding m4, flex package to build and run time required package 

 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.0.2-1

 -	Initial build. First version.

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

 Summary:	Contains programs for compressing and decompressing files

 Name:		bzip2

 Version:	1.0.6

-Release:	3%{?dist}

+Release:	2%{?dist}

 License:	BSD

 URL:		http://www.bzip.org/

 Group:		System Environment/Base

@@ -15,7 +15,6 @@ decompressing files.  Compressing text files with bzip2 yields a much better

 compression percentage than with the traditional gzip.

 %package	devel

 Summary:	Header and development files for bzip2

-Requires:	bzip2

 %description	devel

 It contains the libraries and header files to create applications 

 %prep

@@ -73,9 +72,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %files devel

 %{_includedir}/bzlib.h

 %changelog

-*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 1.0.6-3

--	Adding bzip2 package run time required package for bzip2-devel package 

-*	Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.0.6-2

--	Update according to UsrMove.

+*   Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.0.6-2

+-   Update according to UsrMove.

 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.0.6-1

 -	Initial build.	First version

@@ -1,14 +1,13 @@

 Summary:	Programs that show the differences between files or directories

 Name:		diffutils

 Version:	3.3

-Release:	2%{?dist}

+Release:	1%{?dist}

 License:	GPLv3+

 URL:		http://www.gnu.org/software/diffutils

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

-Distribution:	Photon

-Source0:	http://ftp.gnu.org/gnu/diffutils/%{name}-%{version}.tar.xz

-BuildRequires:	coreutils

+Distribution: Photon

+Source0:		http://ftp.gnu.org/gnu/diffutils/%{name}-%{version}.tar.xz

 %description

 The Diffutils package contains programs that show the

 differences between files or directories.

@@ -31,7 +30,5 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %{_bindir}/*

 %{_mandir}/*/*

 %changelog

-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 3.3-2

--	Adding coreutils package to build requires

 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.3-1

 -	Initial build.	First version

@@ -1,15 +1,13 @@

 Summary:	A utility for generating programs that recognize patterns in text

 Name:		flex

 Version:	2.5.38

-Release:	2%{?dist}

+Release:	1%{?dist}

 License:	BSD

 URL:		http://flex.sourceforge.net

 Group:		Applications/System

 Vendor:		VMware, Inc.

 Distribution: 	Photon

 Source0:	http://prdownloads.sourceforge.net/flex/%{name}-%{version}.tar.bz2

-BuildRequires:	m4

-Requires:	m4

 %description

 The Flex package contains a utility for generating programs

 that recognize patterns in text.

@@ -51,7 +49,5 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %{_defaultdocdir}/%{name}-%{version}/*

 %{_mandir}/*/*

 %changelog

-*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 2.5.38-2

--	Adding m4 package to build and run time required package 

 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.5.38-1

 -	Initial build.	First version

@@ -124,7 +124,7 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig

 %{_sysconfdir}/*

 %ifarch x86_64

 %{_lib64}/*

-%{_lib64dir}/*

+/lib64/*

 %else

 %{_lib}/*

 %endif

@@ -75,8 +75,8 @@ cp -v -R doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}

 %{_mandir}/man5/*

 %{_mandir}/man3/*

 %{_datadir}/terminfo/*

-%{_libdir}/libncursesw.so.5

-%{_libdir}/libncursesw.so.5.9

+%{_lib}/libncursesw.so.5

+%{_lib}/libncursesw.so.5.9

 %{_libdir}/libncurses.so

 %{_libdir}/libform.so

 %{_libdir}/libcursesw.so

@@ -73,8 +73,8 @@ find %{buildroot} -name '*.la' -delete

 %{_mandir}/man1/watch.1.gz

 %{_mandir}/man1/ps.1.gz

 %{_mandir}/man5/sysctl.conf.5.gz

-%{_libdir}/libprocps.so.3

-%{_libdir}/libprocps.so.3.0.0

+%{_lib}/libprocps.so.3

+%{_lib}/libprocps.so.3.0.0

 /sbin/sysctl

 %files devel

 %{_includedir}/proc/sig.h

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

 Summary:	A high-level scripting language

 Name:		python2

 Version:	2.7.9

-Release:	2%{?dist}

+Release:	1%{?dist}

 License:	PSF

 URL:		http://www.python.org/

 Group:		System Environment/Programming

@@ -31,7 +31,6 @@ Requires:	sqlite-autoconf

 Requires:	expat >= 2.1.0

 Requires:	libffi >= 3.0.13

 Requires:	ncurses

-Requires:	coreutils

 BuildRequires:	expat >= 2.1.0

 BuildRequires:	libffi >= 3.0.13

 BuildRequires:	sqlite-autoconf

@@ -184,7 +183,5 @@ rm -rf %{buildroot}/*

 %{_bindir}/idle*

 %changelog

-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 2.7.9-2

--	Adding coreutils package to run time required package

 *	Mon Apr 6 2015 Divya Thaluru <dthaluru@vmware.com> 2.7.9-1

 -	Initial build.	First version

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

 Summary:	Command-line editing and history capabilities

 Name:		readline

 Version:	6.3

-Release:	3%{?dist}

+Release:	2%{?dist}

 License:	GPLv3+

 URL:		http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html

 Group:		Applications/System

@@ -10,7 +10,6 @@ Distribution: 	Photon

 Source0:	http://ftp.gnu.org/gnu/readline/%{name}-%{version}.tar.gz

 Patch:		http://www.linuxfromscratch.org/patches/lfs/development/readline-6.3-upstream_fixes-3.patch

 BuildRequires:	ncurses-devel

-Requires:	ncurses

 %description

 The Readline package is a set of libraries that offers command-line

 editing and history capabilities.

@@ -41,10 +40,10 @@ rm -rf %{buildroot}%{_infodir}

 %postun	-p /sbin/ldconfig

 %files

 %defattr(-,root,root)

-%{_libdir}/libreadline.so.6

-%{_libdir}/libhistory.so.6

-%{_libdir}/libhistory.so.6.3

-%{_libdir}/libreadline.so.6.3

+%{_lib}/libreadline.so.6

+%{_lib}/libhistory.so.6

+%{_lib}/libhistory.so.6.3

+%{_lib}/libreadline.so.6.3

 %{_datadir}/%{name}/hist_purgecmd.c

 %{_datadir}/%{name}/rltest.c

 %{_datadir}/%{name}/rlversion.c

@@ -92,9 +91,7 @@ rm -rf %{buildroot}%{_infodir}

 %{_libdir}/libhistory.so

 %{_libdir}/libreadline.so

 %changelog

-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 6.3-3

--	Adding ncurses to run time require package

-*   	Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 6.3-2

--   	Update according to UsrMove.

+*   Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 6.3-2

+-   Update according to UsrMove.

 *	Wed Oct 22 2014 Divya Thaluru <dthaluru@vmware.com> 6.3-1

 -	Initial build.	First version

@@ -13,6 +13,7 @@ Source2:	rpm-system-configuring-scripts-2.0.tar.gz

 #Requires: nspr

 Requires: 	nss

 Requires: 	popt

+Requires: 	perl-Module-ScanDeps

 Requires: 	lua

 Requires:	elfutils-libelf

 BuildRequires:	python2

@@ -107,7 +108,5 @@ rm -rf %{buildroot}

 %{_libdir}/librpm.so

 %changelog

-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 4.11.2-2

--	Removing perl-module-scandeps package from run time required packages

 *	Tue Jan 13 2015 Divya Thaluru <dthaluru@vmware.com> 4.11.2-1

 -	Initial build. First version

@@ -1,13 +1,14 @@

 Summary:	Reading, writing, and converting info pages

 Name:		texinfo

 Version:	5.2

-Release:	2%{?dist}

+Release:	1%{?dist}

 License:	GPLv3+

 URL:		http://www.gnu.org/software/texinfo/

 Group:		Applications/System

 Vendor:		VMware, Inc.

 Distribution: 	Photon

 Source0:	%{name}-%{version}.tar.xz

+Requires:	perl-libintl

 %description

 The Texinfo package contains programs for reading, writing,

 and converting info pages.

@@ -45,7 +46,5 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %lang(pt.us-ascii) %{_datarootdir}/locale/pt.us-ascii/LC_MESSAGES/texinfo_document.mo

 %lang(pt_BR.us-ascii) %{_datarootdir}/locale/pt_BR.us-ascii/LC_MESSAGES/texinfo_document.mo

 %changelog

-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 5.2-2

--	Removing perl-libintl package from run-time required packages

 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.2-1

 -	Upgrade version

@@ -60,8 +60,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %{_bindir}/lzmainfo

 %{_bindir}/xzgrep

 %{_bindir}/xzdec

-%{_libdir}/liblzma.so.5.0.5

-%{_libdir}/liblzma.so.5

+%{_lib}/liblzma.so.5.0.5

+%{_lib}/liblzma.so.5

 %{_mandir}/man1/*

 %{_defaultdocdir}/%{name}-%{version}/*

 %files devel

@@ -33,8 +33,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %files

 %defattr(-,root,root)

 %{_mandir}/man3/zlib.3.gz

-%{_libdir}/libz.so.1

-%{_libdir}/libz.so.1.2.8

+%{_lib}/libz.so.1

+%{_lib}/libz.so.1.2.8

 %files devel

 %{_includedir}/zconf.h

 %{_includedir}/zlib.h

@@ -34,7 +34,7 @@ PHOTON_PKG_BUILDER_DIR=$(SRCROOT)/support/package-builder

 PHOTON_PULL_SOURCES_DIR=$(SRCROOT)/support/pullsources

 PHOTON_INSTALLER_DIR=$(SRCROOT)/installer

 PHOTON_INSTALLER=$(PHOTON_INSTALLER_DIR)/photonInstaller.py

-PHOTON_PACKAGE_BUILDER=$(PHOTON_PKG_BUILDER_DIR)/builder.py

+PHOTON_PACKAGE_BUILDER=$(PHOTON_PKG_BUILDER_DIR)/build_package.py

 PHOTON_PULL_SOURCES=$(PHOTON_PULL_SOURCES_DIR)/pullsources.py

 PHOTON_CHROOT_CLEANER=$(PHOTON_PKG_BUILDER_DIR)/cleanup-build-root.sh

 PHOTON_RPMS_DIR_NOARCH=$(PHOTON_RPMS_DIR)/noarch

deleted file mode 100644

@@ -1,47 +0,0 @@

-from Logger import Logger

-from CommandUtils import CommandUtils

-from constants import constants

-import os.path

-

-class ChrootUtils(object):

-    

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

-        if logName is None:

-            logName = "ChrootUtils"

-        if logPath is None:

-            logPath = constants.logPath

-        self.logName=logName

-        self.logPath=logPath

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

-        

-    def createChroot(self,chrootName):

-        chrootID=constants.buildRootPath+"/"+chrootName

-        if os.path.isdir(chrootID):

-            if not self.destroyChroot(chrootID):

-                self.logger.error("Given chroot "+chrootID+" is already exists. unable to destroy it ")

-                return False,None

-        # need to add timeout for this step

-        # http://stackoverflow.com/questions/1191374/subprocess-with-timeout

-        cmdUtils=CommandUtils()

-        returnVal=cmdUtils.runCommandInShell("mkdir -p "+chrootID)

-        if not returnVal:

-            self.logger.error("Unable to create chroot:"+ chrootID +".Unknown error.")

-            return False,None

-        return True,chrootID

-    

-    def destroyChroot(self,chrootID):

-        # need to add timeout for this step

-        # http://stackoverflow.com/questions/1191374/subprocess-with-timeout

-        cmdUtils=CommandUtils()

-        returnVal=cmdUtils.runCommandInShell("./cleanup-build-root.sh "+chrootID)

-        if not returnVal:

-            self.logger.error("Unable to destroy chroot:"+ chrootID +".Unknown error.")

-            return False

-        

-        returnVal=cmdUtils.runCommandInShell("rm -rf "+chrootID)

-        if not returnVal:

-            self.logger.error("Unable to destroy chroot:"+ chrootID +".Unknown error.")

-            return False

-        self.logger.info("Successfully destroyed chroot:"+chrootID)

-        return True

-    

\ No newline at end of file

deleted file mode 100644

@@ -1,42 +0,0 @@

-import subprocess

-import os

-

-class CommandUtils(object):

-    def __init__(self):

-        self.findBinary = "find"

-

-    def findFile (self, filename, sourcePath):

-        process = subprocess.Popen([self.findBinary,  sourcePath,  "-name", filename],  stdout=subprocess.PIPE)

-        returnVal = process.wait()

-        if returnVal != 0:

-            return None

-        result=process.communicate()[0]

-        if result is None:

-            return None

-        return result.split()

-

-    def runCommandInShell(self,cmd,logfilePath=None,chrootCmd=None):

-        if chrootCmd is not None:

-            cmd = chrootCmd+" "+cmd

-        if logfilePath is None:

-            logfilePath=os.devnull

-        logfile=open(logfilePath,"w")

-        process = subprocess.Popen("%s" %cmd,shell=True,stdout=logfile,stderr=logfile)

-        retval = process.wait()

-        logfile.close()

-        if retval==0:

-            return True

-        return False

-    

-    def runCommandInShell2(self,cmd,chrootCmd=None):

-        if chrootCmd is not None:

-            cmd = chrootCmd+" "+cmd

-        process = subprocess.Popen("%s" %cmd,shell=True,stdout=subprocess.PIPE)

-        retval = process.wait()

-        if retval != 0:

-            return None

-        result = process.communicate()[0]

-        if result is None:

-            return None

-        return result.split()

-

deleted file mode 100644

@@ -1,41 +0,0 @@

-import logging

-import os

-

-class Logger(object):

-    @staticmethod

-    def getLogger (mymodule, logpath=None):

-        logfile=mymodule+".log"

-        if logpath is not None:

-            if not os.path.isdir(logpath):

-                os.makedirs(logpath)

-            logfile=logpath+"/"+logfile

-        logger=logging.getLogger(mymodule)

-        if len(logger.handlers) == 0:

-            #creating file handler

-            fhandler=logging.FileHandler(logfile)

-            # create console handler

-            ch=logging.StreamHandler()

-            formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')

-            # add formatter to handler

-            fhandler.setFormatter(formatter)

-            ch.setFormatter(formatter)

-            

-            logger.addHandler(ch)

-            logger.addHandler(fhandler)

-            logger.setLevel(logging.DEBUG)

-            logger.info("--------------------------------------------------------------------------")

-            logger.info("Staring Log")

-            logger.info("--------------------------------------------------------------------------")

-        return logger

-        

-if __name__ == "__main__":

-    #Logger.getLogger("my module")

-    t1 =  Logger.getLogger("my module")

-    t1.info("test1")

-    t2  = Logger.getLogger("my module")  

-    t2.info("test2")

-    t1.info("test3")

-       

-    

-        

-        

deleted file mode 100644

@@ -1,36 +0,0 @@

-import os.path

-

-class MiscUtils(object):

-    

-    @staticmethod

-    def isOutdated(listInputFiles,listOutputFiles):

-        thresholdTimeStamp=None

-        if len(listInputFiles) == 0:

-            return False

-        if len(listOutputFiles) == 0:

-            return True

-        for f in listOutputFiles:

-            t=os.path.getmtime(f)

-            if thresholdTimeStamp is None:

-                thresholdTimeStamp = t

-            if t < thresholdTimeStamp:

-                thresholdTimeStamp = t 

-        for f in listInputFiles:

-            t=os.path.getmtime(f)

-            if t > thresholdTimeStamp:

-                return True

-        return False

-    

-    @staticmethod

-    def getListSpecFiles(listSpecFiles,path):

-        for dirEntry in os.listdir(path):

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

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

-                listSpecFiles.append(dirEntryPath)

-            elif os.path.isdir(dirEntryPath):

-                MiscUtils.getListSpecFiles(listSpecFiles,dirEntryPath)

-    

-if __name__=="__main__":

-    listInputFiles=["SpecParser.py","Logger.py"]

-    listOutputFiles=["builder.py"]

-    print MiscUtils.isOutdated(listInputFiles, listOutputFiles)

\ No newline at end of file

deleted file mode 100644

@@ -1,287 +0,0 @@

-from Logger import Logger

-from constants import constants

-from sets import Set

-import copy

-

-

-

-def removeDuplicateEntriesInList(myList):

-    myListCopy=[]

-    for p in myList:

-        if p not in myListCopy:

-            myListCopy.append(p)

-    return myListCopy

-      

-class PackageBuildDataGenerator(object):

-    

-    cycleCount=0

-    

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

-        if logName is None:

-            logName = "PackageBuildDataGenerator"

-        if logPath is None:

-            logPath = constants.logPath

-        self.logName=logName

-        self.logPath=logPath

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

-        self.__mapCyclesToPackageList={}

-        self.__mapPackageToCycle={}

-        self.__buildDependencyGraph={}

-        self.__runTimeDependencyGraph={}

-        self.__sortedPackageList=[]

-        self.__sortedBuildDependencyGraph={}

-    

-    def getPackageBuildData(self,listPackages):

-        self.__readDependencyGraphAndCyclesForGivenPackages(listPackages)

-        self.__getSortedBuildOrderListForGivenPackages(listPackages)

-        return self.__mapCyclesToPackageList, self.__mapPackageToCycle, self.__sortedPackageList

-

-    #todo    

-    def findCompleteListOfPackagesRequiredToBuildGivenPackages(self,listPackages):

-        return self.__buildDependencyGraph.keys()    

- 

-    def createSortListForPkg(self,pkg):

-        runTimeDepPkgList=self.__runTimeDependencyGraph[pkg]

-        runTimeDepPkgList.append(pkg)

-        sortListForPkg=[]

-        

-        for p in runTimeDepPkgList:

-            basePkg=constants.specData.getSpecName(p)

-            for bPkg in self.__sortedBuildDependencyGraph[basePkg]:

-                if bPkg not in sortListForPkg:

-                    sortListForPkg.append(bPkg)

-        

-        return sortListForPkg

-    

-    def getCircularDependentPackages(self,pkg):

-        circularDependentPackages=[]

-        if self.__mapPackageToCycle.has_key(pkg):

-            circularDependentPackages.extend(self.__mapCyclesToPackageList[self.__mapPackageToCycle[pkg]])

-            circularDependentPackages.remove(pkg)

-        return circularDependentPackages

-    

-    def __getSortedBuildOrderListForGivenPackages(self,listPackages):

-        

-        alreadyProcessedPackages=[]

-        sortedList=[]

-        completeListPackagesToBuild=self.findCompleteListOfPackagesRequiredToBuildGivenPackages(listPackages)

-        packageIndexInSortedList = 0

-        prevSortListLen=0

-        

-        while completeListPackagesToBuild:

-            

-            # find next package to process

-            pkg=None

-            index=-1

-            lenList=len(sortedList)

-            for  i in range(lenList):

-                if sortedList[i] in alreadyProcessedPackages:

-                    continue

-                pkg = sortedList[i]

-                packageIndexInSortedList = i

-                break

-                

-            if pkg is None:

-                pkg = completeListPackagesToBuild.pop()

-                packageIndexInSortedList = len(sortedList)

-

-            #creating sort list for package

-            sortListForPkg=self.createSortListForPkg(pkg)

-            

-            #remove any cyclic packages in sortListForPkg if they already exists in sortedList

-            circularDependentPackages=self.getCircularDependentPackages(pkg)

-            for p in circularDependentPackages:

-                if p in sortedList and p in sortListForPkg:

-                    sortListForPkg.remove(p)

-            

-            # insert sort list of package in global sorted list

-            index=packageIndexInSortedList

-            subList=[]

-            if packageIndexInSortedList > 0:

-                subList=sortedList[:packageIndexInSortedList]

-            for p in sortListForPkg:

-                if  p not in subList:

-                    sortedList.insert(index, p)

-                    index = index + 1

-            

-            alreadyProcessedPackages.append(p)

-        

-            # Remove duplicate entries in sorted list in intervals

-            if (len(sortedList)-prevSortListLen) > 100 :

-                self.logger.info("Removing duplicates in sortedList")

-                sortedList = removeDuplicateEntriesInList(sortedList)

-            else:

-                prevSortListLen=len(sortedList)

-                

-        self.logger.info("Removing duplicates in sorted list")

-        sortedList = removeDuplicateEntriesInList(sortedList)

-        

-        self.logger.info("Sorted list:")

-        self.logger.info(sortedList)

-        self.__sortedPackageList=sortedList

-    

-    def __constructBuildAndRunTimeDependencyGraph(self,package):

-        

-        basePackage=constants.specData.getSpecName(package)

-

-        addBuildTimeGraph=True

-        addRunTimeGraph=True

-        if self.__buildDependencyGraph.has_key(basePackage):

-            addBuildTimeGraph = False

-        if self.__runTimeDependencyGraph.has_key(basePackage):

-            addRunTimeGraph=False

-        

-        nextPackagesToConstructGraph=[]

-        if addBuildTimeGraph:

-            listDependentRpmPackages=constants.specData.getBuildRequiresForPackage(basePackage)

-            listDependentPackages=[]

-            for rpmPkg in listDependentRpmPackages:

-                basePkg=constants.specData.getSpecName(rpmPkg)

-                if basePkg not in listDependentPackages:

-                    listDependentPackages.append(basePkg)

-            self.__buildDependencyGraph[basePackage]=listDependentPackages

-            nextPackagesToConstructGraph.extend(listDependentPackages)

-        

-        if addRunTimeGraph:

-            listRpmPackages=constants.specData.getPackages(basePackage)

-            for rpmPkg in listRpmPackages:

-                listDependentRpmPackages=constants.specData.getRequiresAllForPackage(rpmPkg)

-                self.__runTimeDependencyGraph[rpmPkg]=listDependentRpmPackages[:]

-                nextPackagesToConstructGraph.extend(listDependentRpmPackages)

-

-        for pkg in nextPackagesToConstructGraph:

-            self.__constructBuildAndRunTimeDependencyGraph(pkg)

-    

-    def __readDependencyGraphAndCyclesForGivenPackages(self,listPackages):

-        for pkg in listPackages:

-            self.__constructBuildAndRunTimeDependencyGraph(pkg)

-        

-        packagesToBUild=self.__buildDependencyGraph.keys()

-        for pkg in packagesToBUild:

-            sortedPackageList,circularDependentPackages = self.topologicalSortPackages(self.__buildDependencyGraph,pkg)

-            if len(circularDependentPackages) > 0 :

-                self.logger.error("Found circular dependency")

-                self.logger.error(circularDependentPackages)

-                raise Exception("Build Time Circular Dependency")

-            self.__sortedBuildDependencyGraph[pkg]=sortedPackageList

-        sortedPackageList,circularDependentPackages = self.topologicalSortPackages(self.__runTimeDependencyGraph)

-        if len(circularDependentPackages) > 0 :

-            self.__findCircularDependencies(circularDependentPackages)

-    

-    def topologicalSortPackages(self, dependencyGraph, package=None):

-        noDepPackages = Set()

-        sortedPackageList = []

-        dependentOfPackage = dict()

-        

-        dependentPackages={}

-        if package is None:

-            dependentPackages=copy.deepcopy(dependencyGraph)

-        else:

-            listDepPkgs= Set()

-            listDepPkgs.add(package)

-            while listDepPkgs:

-                pkg = listDepPkgs.pop()

-                if dependentPackages.has_key(pkg):

-                    continue

-                dependentPackages[pkg]=dependencyGraph[pkg][:]

-                for depPkg in dependencyGraph[pkg]:

-                    listDepPkgs.add(depPkg)

-                    

-        #Find packages with no dependencies and generate dependentof_package edge list

-        for pkg in dependentPackages:

-            if len(dependentPackages[pkg]) == 0:

-                noDepPackages.add(pkg)

-            else:

-                for depPkg in dependentPackages[pkg]:

-                    if not dependentOfPackage.has_key(depPkg):

-                        dependentOfPackage[depPkg]=[pkg]

-                    else:

-                        if pkg not in dependentOfPackage[depPkg]:

-                            dependentOfPackage[depPkg].append(pkg)

-        

-        while noDepPackages:

-            pkg = noDepPackages.pop()

-            sortedPackageList.append(pkg)

-            if dependentOfPackage.get(pkg) is not None:

-                for childPkg in list(dependentOfPackage.get(pkg)):

-                    dependentOfPackage.get(pkg).remove(childPkg)

-                    dependentPackages[childPkg].remove(pkg)

-                    if len(dependentPackages[childPkg])==0:

-                        noDepPackages.add(childPkg)

-        

-        # creating circular dependency graph for given dependency graph

-        circularDependencyGraph={}

-        listCircularPkg = dependentPackages.keys()

-        for pkg in listCircularPkg:

-            if len(dependentPackages[pkg]) != 0:

-                circularDependencyGraph[pkg]=dependentPackages[pkg]

-            

-        #return (non-circular dependent package in sorted order and circular dependent package list in a dependencyGraph)

-        return sortedPackageList,circularDependencyGraph

-    

-    

-    def __constructDependencyMap(self,cyclicDependencyGraph):

-        self.logger.info("Constructing dependency map from circular dependency graph.....")

-        constructDependencyMap={}

-        listNodes=cyclicDependencyGraph.keys()

-        for node in listNodes:

-            tmpDepNodeList=[]

-            tmpDepNodeList.append(node)

-            depNodeList=[]

-            while len(tmpDepNodeList)!=0:

-                currentNode = tmpDepNodeList.pop()

-                addDepNodeList = cyclicDependencyGraph[currentNode]

-                depNodeList.append(currentNode)

-                for depNode in addDepNodeList:

-                    if depNode in depNodeList:

-                        continue

-                    else:

-                        if depNode not in tmpDepNodeList:

-                            tmpDepNodeList.append(depNode)

-            depNodeList.remove(node)

-            constructDependencyMap[node]=depNodeList

-        self.logger.info("Dependency Map:")

-        self.logger.info(constructDependencyMap)

-        return constructDependencyMap

-        

-        

-    def __findCircularDependencies(self,cyclicDependencyGraph):

-        if len(cyclicDependencyGraph) == 0:

-            return

-        #step1: construct dependency map from dependency graph

-        constructDependencyMap=self.__constructDependencyMap(cyclicDependencyGraph)

-        

-        #step2: find cycles in dependency map

-        self.logger.info("Finding and adding cycles using constructed dependency map......")

-        cycleCount=0

-        listNodes=cyclicDependencyGraph.keys()

-        for node in listNodes:

-            listDepPkg=constructDependencyMap[node]

-            cycPkgs=[]

-            if not self.__mapPackageToCycle.has_key(node):

-                for depPkg in listDepPkg:

-                    x = constructDependencyMap[depPkg]

-                    if node in x:

-                        cycPkgs.append(depPkg)

-                

-                if len(cycPkgs) != 0:

-                    cycPkgs.append(node)

-                    cycleName="cycle"+str(PackageBuildDataGenerator.cycleCount)

-                    PackageBuildDataGenerator.cycleCount=PackageBuildDataGenerator.cycleCount+1

-                    for x in cycPkgs:

-                        self.__mapPackageToCycle[x]=cycleName

-                    self.__mapCyclesToPackageList[cycleName]=cycPkgs

-                    self.logger.info("New circular dependency found:")

-                    self.logger.info(cycleName+" "+ ",".join(cycPkgs))

-                    cycleCount = cycleCount + 1

-        

-        if cycleCount > 0 :

-            self.logger.info("Found "+str(cycleCount) + " cycles.")

-            self.logger.info("Successfully added all detected circular dependencies to list.")

-        else:

-            self.logger.info("No circular dependencies found.")

-        

-    

-

-    

-    

\ No newline at end of file

deleted file mode 100644

@@ -1,160 +0,0 @@

-from PackageUtils import PackageUtils

-from Logger import Logger

-from ChrootUtils import ChrootUtils

-from ToolChainUtils import ToolChainUtils

-from CommandUtils import CommandUtils

-import os.path

-from constants import constants

-import shutil

-

-class PackageBuilder(object):

-    

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

-        if logName is None:

-            logName = "PackageBuilder"

-        if logPath is None:

-            logPath = constants.logPath

-        self.logName=logName

-        self.logPath=logPath

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

-        self.mapPackageToCycles = mapPackageToCycles

-        self.listAvailableCyclicPackages = listAvailableCyclicPackages

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

-        self.runInChrootCommand="./run-in-chroot.sh"

-        self.adjustGCCSpecScript="adjust-gcc-specs.sh"

-        

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

-        chrootID=None

-        try:

-            chrUtils = ChrootUtils(self.logName,self.logPath)

-            returnVal,chrootID = chrUtils.createChroot(chrootName)

-            if not returnVal:

-                raise Exception("Unable to prepare build root")

-            tUtils=ToolChainUtils(self.logName,self.logPath)

-            if isToolChainPackage:

-                tUtils.installCoreToolChainPackages(chrootID)

-            else:

-                tUtils.installToolChain(chrootID)

-        except Exception as e:

-            if chrootID is not None: