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

         shutil.copy2(self.adjustGCCSpecScript,  chrootID+"/tmp/"+self.adjustGCCSpecScript)

         cmdUtils=CommandUtils()

         cmd = "/tmp/"+self.adjustGCCSpecScript+opt

-        logFile = logPath+"adjustGCCSpecScript.log"

+        logFile = logPath+"/adjustGCCSpecScript.log"

         chrootCmd=self.runInChrootCommand+" "+chrootID

         returnVal = cmdUtils.runCommandInShell(cmd, logFile, chrootCmd)

         if not returnVal:

@@ -73,6 +73,12 @@ class Package(object):

         if content.find("%{version}") != -1:

             content = content.replace('%{version}',self.version)

+        if content.find("%{?dist}") != -1:

+            content = content.replace('%{?dist}',self.distribution)

+

+        if content.find("%{dist}") != -1:

+            content = content.replace('%{dist}',self.distribution)

+        

         return content

     def updatePackageMacro(self,macro):

@@ -92,6 +92,12 @@ class Package(object):

         if content.find("%{version}") != -1:

             content = content.replace('%{version}',self.version)

+

+        if content.find("%{?dist}") != -1:

+            content = content.replace('%{?dist}',self.distribution)

+

+        if content.find("%{dist}") != -1:

+            content = content.replace('%{dist}',self.distribution)

         return content

@@ -4,6 +4,7 @@ from Logger import Logger

 from PackageUtils import PackageUtils

 from constants import constants

 import subprocess

+import os.path

 class ToolChainUtils(object):

     __built_successfull=False

@@ -93,16 +94,23 @@ class ToolChainUtils(object):

         try:

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

             for package in constants.listCoreToolChainRPMPackages:

+                rpmPkg=pkgUtils.findRPMFileForGivenPackage(package)

+                if rpmPkg is not None:

+                    continue

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

                 chrootName="build-core-toolchain"

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

+                if not os.path.isdir(destLogPath):

+                    cmdUtils = CommandUtils()

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

                 returnVal,chrootID = chrUtils.createChroot(chrootName)

                 if not returnVal:

                     self.logger.error("Creating chroot failed")

                     raise Exception("creating chroot failed")

                 self.prepareBuildEnvironmentChroot(chrootID)

-                rpmPkg=pkgUtils.findRPMFileForGivenPackage(package)

-                if rpmPkg is None:

-                    pkgUtils.buildRPMSForGivenPackage(package, chrootID)

+                #rpmPkg=pkgUtils.findRPMFileForGivenPackage(package)

+                #if rpmPkg is None:

+                pkgUtils.buildRPMSForGivenPackage(package, chrootID,destLogPath)

                 chrUtils.destroyChroot(chrootID)

                 chrootID=None

             self.logger.info("Successfully built toolchain")

@@ -133,17 +141,17 @@ class ToolChainUtils(object):

                     self.logger.error("Unable to find rpm "+ package +" in current and previous versions")

                     raise "Input Error"

             self.logger.debug("Installing rpm:"+rpmFile)

-            cmd="rpm -i --nodeps --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFile

+            cmd="rpm -i --nodeps --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFile

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

             retval = process.wait()

             if retval != 0:

                 self.logger.error("Installing tool chain package "+package+" failed")

                 raise "RPM installation failed"

-        

+            

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

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

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

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

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

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

-    

\ No newline at end of file

+    

@@ -6,22 +6,28 @@ if [ $# -eq 1 -a "x$1" = "xclean" ]; then

 fi

 cat <<EOF > `dirname $(gcc --print-libgcc-file-name)`/../specs

+# add sec hardening flags for cc1.

 *cc1:

 + %{!fno-stack-protector:-fstack-protector} %{fno-pie|fno-PIE|fpic|fPIC|shared:;:-fPIE -fpie}

+# add sec hardening flags for cc1.

 *cc1plus:

 + %{!fno-stack-protector:-fstack-protector} %{fno-pie|fno-PIE|fpic|fPIC|shared:;:-fPIE -fpie}

+# add -D_FORTIFY_SOURCE=2 for preprocessor.

 *cpp:

 + %{O1|O2|O3|Os|Ofast:-D_FORTIFY_SOURCE=2}

+# add sec hardening flags for linker.

 *link:

-+ %{r|fno-pie|fno-PIE|fpic|fPIC|fno-pic|fno-PIC|shared:;:-pie} %{!norelro:-z relro} %{!nonow:-z now}

++ %{r|nostdlib|fno-pie|fno-PIE|fno-pic|fno-PIC|shared:;:-pie} %{!norelro:-z relro} %{!nonow:-z now}

+# sec hardening flags require shared libgcc_s during linking.

 *libgcc:

 + -lgcc_s

+# replace default startfile rules to use crt that PIE code requires.

 *startfile:

-%{!mandroid|tno-android-ld:%{!shared: %{pg|p|profile:gcrt1.o%s;:Scrt1.o%s}}    crti.o%s %{static:crtbeginT.o%s;:crtbeginS.o%s};:%{shared: crtbegin_so%O%s;:  %{static: crtbegin_static%O%s;: crtbegin_dynamic%O%s}}}

+%{!shared: %{pg|p|profile:gcrt1.o%s;:Scrt1.o%s}}    crti.o%s %{static:crtbeginT.o%s;:crtbeginS.o%s}

 EOF