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

 Summary:	The package automatically configure source code

 Name:		autoconf

 Version:	2.69

-Release:	1

+Release:	2

 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

+Distribution: 	Photon

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

+Requires:	perl

 %description

 The package contains programs for producing shell scripts that can

 automatically configure source code.

@@ -27,5 +28,7 @@ rm -rf %{buildroot}%{_infodir}

 %{_mandir}/*/*

 %{_datarootdir}/autoconf/*

 %changelog

+*	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,13 +1,14 @@

 Summary:	Programs for generating Makefiles

 Name:		automake

 Version:	1.14.1

-Release:	1

+Release:	2

 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

+Distribution: 	Photon

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

+BuildRequires:	autoconf

 %description

 Contains programs for generating Makefiles for use with Autoconf.

 %prep

@@ -33,5 +34,7 @@ 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,13 +1,14 @@

 Summary:	Programs that show the differences between files or directories

 Name:		diffutils

 Version:	3.3

-Release:	1

+Release:	2

 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

+Distribution:	Photon

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

+BuildRequires:	coreutils

 %description

 The Diffutils package contains programs that show the

 differences between files or directories.

@@ -30,5 +31,7 @@ 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,7 +1,7 @@

 Summary:	A high-level scripting language

 Name:		python2

 Version:	2.7.9

-Release:	1

+Release:	2

 License:	PSF

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

 Group:		System Environment/Programming

@@ -31,6 +31,7 @@ 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

@@ -182,5 +183,7 @@ 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:	1

+Release:	2

 License:	GPLv3+

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

 Group:		Applications/System

@@ -10,6 +10,7 @@ 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.

@@ -92,5 +93,7 @@ rm -rf %{buildroot}%{_infodir}

 %{_libdir}/libhistory.so

 %{_libdir}/libreadline.so

 %changelog

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

+-	Adding ncurses to run time require package

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

 -	Initial build.	First version

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

 Summary:	Package manager

 Name:		rpm

 Version:	4.11.2

-Release:	1

+Release:	2

 License:	GPLv2+

 URL:		http://rpm.org

 Group:		Applications/System

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

 #Requires: nspr

 Requires: 	nss

 Requires: 	popt

-Requires: 	perl-Module-ScanDeps

 Requires: 	lua

 Requires:	elfutils-libelf

 BuildRequires:	python2

@@ -108,5 +107,7 @@ 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,14 +1,13 @@

 Summary:	Reading, writing, and converting info pages

 Name:		texinfo

 Version:	5.2

-Release:	1

+Release:	2

 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.

@@ -46,5 +45,7 @@ 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

@@ -21,7 +21,7 @@ class CommandUtils(object):

         if logfilePath is None:

             logfilePath=os.devnull

         logfile=open(logfilePath,"w")

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

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

         retval = process.wait()

         logfile.close()

         if retval==0:

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

         self.listAvailableCyclicPackages = listAvailableCyclicPackages

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

-    def prepareBuildRoot(self,chrootName):

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

         chrootID=None

         try:

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

@@ -28,7 +28,10 @@ class PackageBuilder(object):

             if not returnVal:

                 raise Exception("Unable to prepare build root")

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

-            tUtils.installToolChain(chrootID)

+            if isToolChainPackage:

+                tUtils.installCoreToolChainPackages(chrootID)

+            else:

+                tUtils.installToolChain(chrootID)

         except Exception as e:

             if chrootID is not None:

                 chrUtils.destroyChroot(chrootID)

@@ -58,7 +61,7 @@ class PackageBuilder(object):

                 listInstalledPackages.append(packageName)

         return listInstalledPackages

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

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

         try:

             self.buildPackage(package)

             outputMap[threadName]=True

@@ -71,8 +74,11 @@ class PackageBuilder(object):

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

         chrootName="build-"+package

         chrootID=None

+        isToolChainPackage=False

+        if package in constants.listToolChainPackages:

+            isToolChainPackage=True

         try:

-            chrootID = self.prepareBuildRoot(chrootName)

+            chrootID = self.prepareBuildRoot(chrootName,isToolChainPackage)

             destLogPath=constants.logPath+"/build-"+package

             if not os.path.isdir(destLogPath):

                 cmdUtils = CommandUtils()

@@ -118,6 +124,8 @@ class PackageBuilder(object):

             noDeps = True

         if package in self.listNodepsPackages:

             noDeps=True

+        if package in constants.noDepsPackageList:

+            noDeps=True

         pkgUtils.installRPM(package,chrootID,noDeps,destLogPath)

         listInstalledPackages.append(package)

         self.logger.info("Installed the package:"+package)

@@ -86,7 +86,7 @@ class PackageManager(object):

     def buildToolChain(self):

         try:

             tUtils=ToolChainUtils()

-            tUtils.buildToolChain()

+            tUtils.buildCoreToolChainPackages()

         except Exception as e:

             self.logger.error("Unable to build tool chain")

             self.logger.error(e)

@@ -107,32 +107,43 @@ class PackageManager(object):

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

         return numChroots

-    def buildPackages (self, listPackages):

-

+    def buildToolChainPackages(self):

         if not self.buildToolChain():

             return False

-

-        returnVal=self.calculateParams(listPackages)

-        if not returnVal:

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

-            return False

+        return self.buildGivenPackages(constants.listToolChainPackages)

-        statusEvent=threading.Event()

+    def buildPackages(self,listPackages):

+        if not self.buildToolChainPackages():

+            return False

+        return self.buildGivenPackages(listPackages)

+    

+    def initializeThreadPool(self,statusEvent):

+        ThreadPool.clear()

+        ThreadPool.mapPackageToCycle=self.mapPackageToCycle

+        ThreadPool.listAvailableCyclicPackages=self.listAvailableCyclicPackages

+        ThreadPool.logger=self.logger

+        ThreadPool.statusEvent=statusEvent

+    def initializeScheduler(self,statusEvent):

         Scheduler.setLog(self.logName, self.logPath)

         Scheduler.setParams(self.sortedPackageList, self.listOfPackagesAlreadyBuilt)

         Scheduler.setEvent(statusEvent)

+    

+    def buildGivenPackages (self, listPackages):

+        returnVal=self.calculateParams(listPackages)

+        if not returnVal:

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

+            return False

+        statusEvent=threading.Event()

         numWorkerThreads=self.calculatePossibleNumWorkerThreads()

+        if numWorkerThreads > 8:

+            numWorkerThreads = 8

         if numWorkerThreads == 0:

             return False

-        ThreadPool.clear()

-        ThreadPool.mapPackageToCycle=self.mapPackageToCycle

-        ThreadPool.listAvailableCyclicPackages=self.listAvailableCyclicPackages

-        ThreadPool.logger=self.logger

-        ThreadPool.statusEvent=statusEvent

-        

+        self.initializeScheduler(statusEvent)

+        self.initializeThreadPool(statusEvent)

         i=0

         while i < numWorkerThreads:

@@ -142,8 +153,12 @@ class PackageManager(object):

             i = i + 1

         statusEvent.wait()

-        

         Scheduler.stopScheduling=True

+        self.logger.info("Waiting for all remaining worker threads")

+        listWorkerObjs=ThreadPool.getAllWorkerObjects()

+        for w in listWorkerObjs:

+            w.join()

+            

         setFailFlag=False

         allPackagesBuilt=False

@@ -163,9 +178,4 @@ class PackageManager(object):

             else:

                 self.logger.error("Build stopped unexpectedly.Unknown error.")

-        self.logger.info("Waiting for all remaining worker threads")

-        listWorkerObjs=ThreadPool.getAllWorkerObjects()

-        for w in listWorkerObjs:

-            w.join()

-        

         self.logger.info("Terminated")

@@ -21,28 +21,6 @@ class ToolChainUtils(object):

         self.localegenConfig = "./locale-gen.conf"

         self.prepareBuildRootCmd="./prepare-build-root.sh"

-        self.listPkgsRequiredToBuildToolchain=["linux-api-headers", "glibc","glibc-devel",  "zlib","zlib-devel",  "file",

-            "binutils","binutils-devel",  "gmp","gmp-devel", "mpfr", "mpfr-devel", "mpc",

-            "libgcc","libgcc-devel","libstdc++","libstdc++-devel","libgomp","libgomp-devel","gcc",

-            "pkg-config", "ncurses", "bash", "bzip2", "sed","ncurses-devel","procps-ng","coreutils", "m4","grep",

-            "readline", "diffutils","gawk", "findutils", "gettext", "gzip","make",  "patch",

-            "util-linux", "tar", "xz","libtool", "flex",  "bison",

-            "readline-devel", "lua","lua-devel","popt","popt-devel","nspr","sqlite-autoconf","nss","nss-devel",

-            "bzip2-devel","elfutils-libelf","elfutils","elfutils-libelf-devel","elfutils-devel",

-            "expat","libffi","libpipeline", "gdbm","perl","texinfo","autoconf","automake",

-            "openssl","openssl-devel","python2","python2-libs","python2-devel","rpm",

-            "groff", "man-db", "man-pages","cpio"]

-

-        self.listPkgsToInstallToolChain=["linux-api-headers", "glibc","glibc-devel",  "zlib","zlib-devel",  "file",

-            "binutils","binutils-devel",  "gmp","gmp-devel", "mpfr", "mpfr-devel", "mpc",

-            "libgcc","libgcc-devel","libstdc++","libstdc++-devel","libgomp","libgomp-devel","gcc",

-            "pkg-config", "ncurses", "bash", "bzip2", "sed","procps-ng","coreutils", "m4","grep",

-            "readline","diffutils","gawk", "findutils", "gettext", "gzip","make",  "patch",

-            "util-linux", "tar", "xz","libtool", "flex",  "bison",

-            "lua","popt","nspr","sqlite-autoconf","nss","elfutils-libelf",

-            "libpipeline", "gdbm","perl","texinfo","rpm",

-            "autoconf","automake", "groff", "man-db", "man-pages","elfutils","cpio"]

-    

     def prepareChroot(self,chrootID,toolsArchive=None):

         cmdUtils=CommandUtils()

         prepareChrootCmd=self.prepareBuildRootCmd+" "+chrootID+" "+constants.specPath+" "+constants.rpmPath+" "+constants.toolsPath

@@ -60,18 +38,18 @@ class ToolChainUtils(object):

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/SPECS")

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

-    def buildToolChain(self):

-        self.logger.info("Building Tool Chain .....")

+    def buildCoreToolChainPackages(self):

+        self.logger.info("Building core tool chain packages.....")

         chrootID=None

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

         try:

-            chrootName="build-toolchain"

+            chrootName="build-core-toolchain"

             returnVal,chrootID = chrUtils.createChroot(chrootName)

             if not returnVal:

                 raise Exception("creating chroot failed")

             self.prepareChroot(chrootID)

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

-            for package in self.listPkgsRequiredToBuildToolchain:

+            for package in constants.listCoreToolChainRPMPackages:

                 rpmPkg=pkgUtils.findRPMFileForGivenPackage(package)

                 if rpmPkg is None:

                     pkgUtils.buildRPMSForGivenPackage(package, chrootID)

@@ -91,7 +69,7 @@ class ToolChainUtils(object):

         self.logger.info("Installing toolchain.....")

         self.prepareChroot(chrootID,"minimal")

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

-        for package in self.listPkgsToInstallToolChain:

+        for package in constants.listToolChainRPMPkgs:

             pkgUtils.installRPM(package, chrootID, True)

         cmdUtils=CommandUtils()

         cmdUtils.runCommandInShell("rm -rf "+ chrootID+"/tools")

@@ -111,7 +89,17 @@ class ToolChainUtils(object):

             raise Exception("Adjust tool chain script failed")

-        

+    def installCoreToolChainPackages(self,chrootID):

+        self.logger.info("Installing toolchain.....")

+        self.prepareChroot(chrootID)

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

+        for package in constants.listCoreToolChainRPMPackages:

+            pkgUtils.installRPM(package, chrootID, True)

+        cmdUtils=CommandUtils()

+        cmdUtils.runCommandInShell("rm "+ chrootID+"/"+constants.topDirPath+"/RPMS/x86_64/*")

+        cmdUtils.runCommandInShell("rm "+ chrootID+"/"+constants.topDirPath+"/RPMS/noarch/*")

+        self.logger.info("Installed core tool chain packages successfully on chroot:"+chrootID)    

+    

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

 from PackageBuilder import PackageBuilder

 import threading

 import Scheduler

-from constants import constants

 import ThreadPool

 class WorkerThread(threading.Thread):

@@ -13,8 +12,7 @@ class WorkerThread(threading.Thread):

         self.mapPackageToCycle=mapPackageToCycle

         self.listAvailableCyclicPackages=listAvailableCyclicPackages

         self.logger=logger

-    

-    

+        

     def run(self):

         buildThreadFailed=False

         ThreadPool.ThreadPool.makeWorkerThreadActive(self.name)

@@ -25,7 +23,7 @@ class WorkerThread(threading.Thread):

             if pkg is None:

                 break

             self.logger.info("Thread "+self.name+" is building package:"+ pkg)

-            pkgBuilder = PackageBuilder(self.mapPackageToCycle,self.listAvailableCyclicPackages,"build-"+pkg,constants.logPath)

+            pkgBuilder = PackageBuilder(self.mapPackageToCycle,self.listAvailableCyclicPackages,"build-"+pkg)

             t = threading.Thread(target=pkgBuilder.buildPackageThreadAPI,args=(pkg,outputMap,pkg))

             t.start()

             t.join()

@@ -66,10 +66,9 @@ def main():

     constants.initialize(options)

-    listPackages1=["nano","swig","wget"]

-

     pkgManager = PackageManager()

     pkgManager.buildPackages(listPackages)

+    

 if __name__=="__main__":

     main()

\ No newline at end of file

@@ -11,7 +11,29 @@ class constants(object):

     specData=None

     testPath="test"

     buildRootPath="/mnt"

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

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

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

+        "readline", "diffutils","gawk", "findutils", "gettext", "gzip","make",  "patch","util-linux", 

+        "tar", "xz","libtool", "flex",  "bison", "lua","popt","nspr","sqlite-autoconf","nss",

+        "elfutils", "expat","libffi","libpipeline", "gdbm","perl","texinfo","autoconf","automake",

+        "openssl","python2","rpm", "groff", "man-db", "man-pages","cpio"]

+    listCoreToolChainRPMPackages=["linux-api-headers", "glibc","glibc-devel",  "zlib","zlib-devel",  "file",

+        "binutils","binutils-devel",  "gmp","gmp-devel", "mpfr", "mpfr-devel", "mpc",

+        "libgcc","libgcc-devel","libstdc++","libstdc++-devel","libgomp","libgomp-devel","gcc",

+        "pkg-config","bash"]

+    

+    listToolChainRPMPkgs=["linux-api-headers", "glibc","glibc-devel",  "zlib","zlib-devel",  "file",

+        "binutils","binutils-devel",  "gmp","gmp-devel", "mpfr", "mpfr-devel", "mpc",

+        "libgcc","libgcc-devel","libstdc++","libstdc++-devel","libgomp","libgomp-devel","gcc",

+        "pkg-config", "ncurses", "bash", "bzip2", "sed","procps-ng","coreutils", "m4","grep",

+        "readline","diffutils","gawk", "findutils", "gettext", "gzip","make",  "patch",

+        "util-linux", "tar", "xz","libtool", "flex",  "bison",

+        "lua","popt","nspr","sqlite-autoconf","nss","elfutils-libelf",

+        "libpipeline", "gdbm","perl","texinfo","rpm",

+        "autoconf","automake", "groff", "man-db", "man-pages","elfutils","cpio"]

+

     @staticmethod

     def initialize(options):