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

 Summary:	Linux API header files

 Name:		linux-api-headers

 Version:	4.9.94

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GPLv2

 URL:		http://www.kernel.org/

 Group:		System Environment/Kernel

@@ -25,6 +25,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

+-   Add full retpoline support by building with retpoline-enabled gcc.

 *   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

 -   Update to version 4.9.94

 *   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-aws

 Version:        4.9.94

-Release:        1%{?kat_build:.%kat_build}%{?dist}

+Release:        2%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -434,6 +434,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

+-   Add full retpoline support by building with retpoline-enabled gcc.

 *   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

 -   Update to version 4.9.94. Fix panic in ip_set.

 *   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-esx

 Version:        4.9.94

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -232,6 +232,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

+-   Add full retpoline support by building with retpoline-enabled gcc.

 *   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

 -   Update to version 4.9.94. Fix panic in ip_set.

 *   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-secure

 Version:        4.9.94

-Release:        1%{?kat_build:.%kat_build}%{?dist}

+Release:        2%{?kat_build:.%kat_build}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -321,6 +321,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

+-   Add full retpoline support by building with retpoline-enabled gcc.

 *   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

 -   Update to version 4.9.94. Fix panic in ip_set.

 *   Mon Apr 02 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.92-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        4.9.94

-Release:        1%{?kat_build:.%kat_build}%{?dist}

+Release:        2%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -355,6 +355,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Mon Apr 23 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.94-2

+-   Add full retpoline support by building with retpoline-enabled gcc.

 *   Wed Apr 18 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.94-1

 -   Update to version 4.9.94. Fix panic in ip_set.

 -   .config: disable XEN_BALLOON_MEMORY_HOTPLUG

@@ -1,9 +1,87 @@

 {

-    "dummy_package": { 

+    "dummy_package": {

         "files": [

-                     {"src": "path_to_file1_to_be_copied", "dst": "file1_destination"}, 

+                     {"src": "path_to_file1_to_be_copied", "dst": "file1_destination"},

                      {"src": "path_to_file2_to_be_copied", "dst": "file2_destination"}

-        ], 

-        "macros": ["macro1 value1","macro2 value2"]

+        ],

+        "macros": ["macro1 value1","macro2 value2"],

+        "override_toolchain": [

+                     {"package": "package_name", "version": "version_to_use"}

+        ]

+    },

+

+    "linux-api-headers": {

+        "files": [],

+        "macros": [],

+        "override_toolchain": [

+                     {"package": "gcc", "version": "7.3.0"},

+                     {"package": "libgcc", "version": "7.3.0"},

+                     {"package": "libgcc-devel", "version": "7.3.0"},

+                     {"package": "libgcc-atomic", "version": "7.3.0"},

+                     {"package": "libstdc++", "version": "7.3.0"},

+                     {"package": "libstdc++-devel", "version": "7.3.0"},

+                     {"package": "libgomp", "version": "7.3.0"},

+                     {"package": "libgomp-devel", "version": "7.3.0"}

+        ]

+    },

+

+    "linux": {

+        "files": [],

+        "macros": [],

+        "override_toolchain": [

+                     {"package": "gcc", "version": "7.3.0"},

+                     {"package": "libgcc", "version": "7.3.0"},

+                     {"package": "libgcc-devel", "version": "7.3.0"},

+                     {"package": "libgcc-atomic", "version": "7.3.0"},

+                     {"package": "libstdc++", "version": "7.3.0"},

+                     {"package": "libstdc++-devel", "version": "7.3.0"},

+                     {"package": "libgomp", "version": "7.3.0"},

+                     {"package": "libgomp-devel", "version": "7.3.0"}

+        ]

+    },

+

+    "linux-esx": {

+        "files": [],

+        "macros": [],

+        "override_toolchain": [

+                     {"package": "gcc", "version": "7.3.0"},

+                     {"package": "libgcc", "version": "7.3.0"},

+                     {"package": "libgcc-devel", "version": "7.3.0"},

+                     {"package": "libgcc-atomic", "version": "7.3.0"},

+                     {"package": "libstdc++", "version": "7.3.0"},

+                     {"package": "libstdc++-devel", "version": "7.3.0"},

+                     {"package": "libgomp", "version": "7.3.0"},

+                     {"package": "libgomp-devel", "version": "7.3.0"}

+        ]

+    },

+

+    "linux-secure": {

+        "files": [],

+        "macros": [],

+        "override_toolchain": [

+                     {"package": "gcc", "version": "7.3.0"},

+                     {"package": "libgcc", "version": "7.3.0"},

+                     {"package": "libgcc-devel", "version": "7.3.0"},

+                     {"package": "libgcc-atomic", "version": "7.3.0"},

+                     {"package": "libstdc++", "version": "7.3.0"},

+                     {"package": "libstdc++-devel", "version": "7.3.0"},

+                     {"package": "libgomp", "version": "7.3.0"},

+                     {"package": "libgomp-devel", "version": "7.3.0"}

+        ]

+    },

+

+    "linux-aws": {

+        "files": [],

+        "macros": [],

+        "override_toolchain": [

+                     {"package": "gcc", "version": "7.3.0"},

+                     {"package": "libgcc", "version": "7.3.0"},

+                     {"package": "libgcc-devel", "version": "7.3.0"},

+                     {"package": "libgcc-atomic", "version": "7.3.0"},

+                     {"package": "libstdc++", "version": "7.3.0"},

+                     {"package": "libstdc++-devel", "version": "7.3.0"},

+                     {"package": "libgomp", "version": "7.3.0"},

+                     {"package": "libgomp-devel", "version": "7.3.0"}

+        ]

     }

 }

@@ -4,13 +4,17 @@ import os

 class CommandUtils(object):

     def __init__(self):

         self.findBinary = "find"

+        self.sortBinary = "sort"

     def findFile (self, filename, sourcePath):

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

-        returnVal = process.wait()

+        # Perform an alphabetical sort of the output from find, to get consistent ordering.

+        processFind = subprocess.Popen([self.findBinary,  "-L", sourcePath,  "-name", filename, "-not", "-type", "d"],  stdout=subprocess.PIPE)

+        processSort = subprocess.Popen([self.sortBinary,  "-d"], stdin=processFind.stdout, stdout=subprocess.PIPE)

+        processFind.stdout.close() # Allow processFind to receive a SIGPIPE if processSort exits.

+        returnVal = processSort.wait()

         if returnVal != 0:

             return None

-        result=process.communicate()[0]

+        result=processSort.communicate()[0]

         if result is None:

             return None

         return result.split()

@@ -40,7 +40,7 @@ class PackageBuilderBase(object):

         packageIsAlreadyBuilt=True

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

         for pkg in listRPMPackages:

-            if pkgUtils.findRPMFileForGivenPackage(pkg, index) is None:

+            if pkgUtils.findRPMFileForGivenPackage(pkg, "*", index) is None:

                 packageIsAlreadyBuilt=False

                 break

         return packageIsAlreadyBuilt

@@ -81,7 +81,7 @@ class PackageBuilder(PackageBuilderBase):

             if not returnVal:

                 raise Exception("Unable to prepare build root")

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

-            tUtils.installToolChainRPMS(chrootID, self.package, self.logPath)

+            tUtils.installToolChainRPMS(chrootID, self.package, self.listBuildOptionPackages, self.pkgBuildOptionFile, self.logPath)

         except Exception as e:

             if chrootID is not None:

                 self.logger.debug("Deleting chroot: " + chrootID)

@@ -290,10 +290,15 @@ class PackageUtils(object):

                     listSRPMFiles.append(listcontents[1])

         return listRPMFiles,listSRPMFiles

-    def findRPMFileForGivenPackage(self,package, index=0):

+    def findRPMFileForGivenPackage(self, package, version = "*", index=0):

         cmdUtils = CommandUtils()

-        version = SPECS.getData().getVersion(package,index)

-        release = SPECS.getData().getRelease(package,index)

+        release = "*"

+

+        # If no version is specified, use the latest from the source

+        # code.

+        if version == "*":

+            version = SPECS.getData().getVersion(package,index)

+            release = SPECS.getData().getRelease(package,index)

         listFoundRPMFiles = sum([cmdUtils.findFile(package+"-"+version+"-"+release+"."+platform.machine()+".rpm",constants.rpmPath),

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

         if constants.inputRPMSPath is not None:

@@ -8,6 +8,8 @@ import os.path

 import platform

 import traceback

 import shutil

+import json

+import collections

 class ToolChainUtils(object):

@@ -56,9 +58,9 @@ class ToolChainUtils(object):

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

-    def findRPMFileInGivenLocation(self,package,rpmdirPath):

+    def findRPMFileInGivenLocation(self, package, rpmdirPath, version = "*"):

         cmdUtils = CommandUtils()

-        listFoundRPMFiles = cmdUtils.findFile(package+"-*.rpm",rpmdirPath)

+        listFoundRPMFiles = cmdUtils.findFile(package+"-"+version+"-*.rpm",rpmdirPath)

         listFilterRPMFiles=[]

         for f in listFoundRPMFiles:

             rpmFileName=os.path.basename(f)

@@ -71,8 +73,13 @@ class ToolChainUtils(object):

         if len(listFilterRPMFiles) == 0 :

             return None

         if len(listFilterRPMFiles) > 1 :

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

-            return None

+            # We use findRPMFileInGivenLocation() only when bootstrapping;

+            # so it is okay to use any version for the core toolchain packages.

+            if package in constants.listToolChainRPMsToInstall:

+                return listFilterRPMFiles[0]

+            else:

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

+                return None

     def buildCoreToolChainPackages(self, listBuildOptionPackages, pkgBuildOptionFile):

         self.logger.info("Building core toolchain packages.....")

@@ -95,7 +102,7 @@ class ToolChainUtils(object):

                 if not returnVal:

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

                     raise Exception("creating chroot failed")

-                self.installToolChainRPMS(chrootID, package, destLogPath)

+                self.installToolChainRPMS(chrootID, package, listBuildOptionPackages, pkgBuildOptionFile, destLogPath)

                 pkgUtils.adjustGCCSpecs(package, chrootID, destLogPath)

                 pkgUtils.buildRPMSForGivenPackage(package, chrootID, listBuildOptionPackages, pkgBuildOptionFile, destLogPath)

                 pkgCount += 1

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

             raise e

         return pkgCount

-    def installToolChainRPMS(self,chrootID, packageName, logPath=None):

+    def installToolChainRPMS(self,chrootID, packageName, listBuildOptionPackages, pkgBuildOptionFile, logPath=None):

         if logPath is None:

             logPath=self.logPath

         cmdUtils = CommandUtils()

@@ -122,22 +129,38 @@ class ToolChainUtils(object):

         for package in constants.listToolChainRPMsToInstall:

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

             rpmFile = None

+

+            # Default to any version.

+            version = "*"

+            if packageName in listBuildOptionPackages:

+                jsonData = open(pkgBuildOptionFile)

+                pkg_build_option_json = json.load(jsonData, object_pairs_hook=collections.OrderedDict)

+                jsonData.close()

+                pkgs_sorted = pkg_build_option_json.items()

+                for pkg in pkgs_sorted:

+                    p = str(pkg[0].encode('utf-8'))

+                    if p == packageName:

+                        overridelist = pkg[1]["override_toolchain"]

+                        for override in overridelist:

+                            if package == str(override["package"].encode('utf-8')):

+                                version = str(override["version"].encode('utf-8'))

+

             if constants.rpmCheck:

-                rpmFile=pkgUtils.findRPMFileForGivenPackage(package)

+                rpmFile=pkgUtils.findRPMFileForGivenPackage(package, version)

             else:

                 if (packageName not in constants.listToolChainRPMsToInstall or

                         constants.listToolChainRPMsToInstall.index(packageName) > constants.listToolChainRPMsToInstall.index(package)):

-                    rpmFile=pkgUtils.findRPMFileForGivenPackage(package)

+                    rpmFile=pkgUtils.findRPMFileForGivenPackage(package, version)

             if rpmFile is None:

                 # sqlite-autoconf package was renamed, but it still published as sqlite-autoconf

                 if package == "sqlite":

                     package = "sqlite-autoconf"

-                rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)

+                rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo, version)

                 if rpmFile is None:

                     if package in constants.listOfRPMsProvidedAfterBuild:

                         self.logger.info("No old version of "+package+" exists, skip until the new version is built")

                         continue

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

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

                     raise Exception("Input Error")

             rpmFiles += " " + rpmFile

             packages += " " + package

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

         "mpc",

         "libgcc",

         "libgcc-devel",

+        "libgcc-atomic",

         "libstdc++",

         "libstdc++-devel",

         "libgomp",

@@ -5,7 +5,7 @@ x86_64/python2-devel-2.7.11-1.ph1.x86_64.rpm

 x86_64/nspr-4.11-1.ph1.x86_64.rpm

 x86_64/rpm-4.13.0.1-5.ph2.x86_64.rpm

 x86_64/rpm-libs-4.13.0.1-5.ph2.x86_64.rpm

-x86_64/binutils-devel-2.25.1-1.ph1.x86_64.rpm

+x86_64/binutils-devel-2.30-2.ph1.x86_64.rpm

 x86_64/nss-3.21-1.ph1.x86_64.rpm

 x86_64/mpfr-devel-3.1.3-1.ph1.x86_64.rpm

 x86_64/cpio-2.12-1.ph1.x86_64.rpm

@@ -13,7 +13,8 @@ x86_64/sed-4.2.2-1.ph1.x86_64.rpm

 x86_64/libffi-3.2.1-1.ph1.x86_64.rpm

 x86_64/gmp-6.0.0a-1.ph1.x86_64.rpm

 x86_64/diffutils-3.3-2.ph1.x86_64.rpm

-x86_64/gcc-5.3.0-1.ph1.x86_64.rpm

+x86_64/gcc-5.3.0-4.ph1.x86_64.rpm

+x86_64/gcc-7.3.0-1.ph1.x86_64.rpm

 x86_64/gmp-devel-6.0.0a-1.ph1.x86_64.rpm

 x86_64/automake-1.15-1.ph1.x86_64.rpm

 x86_64/groff-1.22.2-1.ph1.x86_64.rpm

@@ -28,7 +29,10 @@ x86_64/rpm-devel-4.13.0.1-5.ph2.x86_64.rpm

 x86_64/file-5.24-1.ph1.x86_64.rpm

 x86_64/mpfr-3.1.3-1.ph1.x86_64.rpm

 x86_64/zlib-devel-1.2.8-2.ph1.x86_64.rpm

-x86_64/libgcc-devel-5.3.0-1.ph1.x86_64.rpm

+x86_64/libgcc-devel-5.3.0-4.ph1.x86_64.rpm

+x86_64/libgcc-devel-7.3.0-1.ph1.x86_64.rpm

+x86_64/libgcc-atomic-5.3.0-4.ph1.x86_64.rpm

+x86_64/libgcc-atomic-7.3.0-1.ph1.x86_64.rpm

 x86_64/bison-3.0.4-1.ph1.x86_64.rpm

 x86_64/lua-5.3.2-1.ph1.x86_64.rpm

 x86_64/util-linux-2.27.1-1.ph1.x86_64.rpm

@@ -45,11 +49,13 @@ x86_64/gawk-4.1.3-4.ph1.x86_64.rpm

 x86_64/libtool-2.4.6-1.ph1.x86_64.rpm

 x86_64/zlib-1.2.8-2.ph1.x86_64.rpm

 x86_64/python2-libs-2.7.11-1.ph1.x86_64.rpm

-x86_64/libgomp-5.3.0-1.ph1.x86_64.rpm

+x86_64/libgomp-5.3.0-4.ph1.x86_64.rpm

+x86_64/libgomp-7.3.0-1.ph1.x86_64.rpm

 x86_64/readline-devel-7.0-1.ph1.x86_64.rpm

 x86_64/sqlite-autoconf-3.11.0-1.ph1.x86_64.rpm

 x86_64/flex-2.5.39-1.ph1.x86_64.rpm

-x86_64/libstdc++-devel-5.3.0-1.ph1.x86_64.rpm

+x86_64/libstdc++-devel-5.3.0-4.ph1.x86_64.rpm

+x86_64/libstdc++-devel-7.3.0-1.ph1.x86_64.rpm

 x86_64/openssl-1.0.2g-1.ph1.x86_64.rpm

 x86_64/elfutils-0.165-1.ph1.x86_64.rpm

 x86_64/expat-2.1.0-1.ph1.x86_64.rpm

@@ -61,10 +67,12 @@ x86_64/python2-2.7.11-1.ph1.x86_64.rpm

 x86_64/elfutils-devel-0.165-1.ph1.x86_64.rpm

 x86_64/patch-2.7.5-1.ph1.x86_64.rpm

 x86_64/xz-5.2.2-1.ph1.x86_64.rpm

-x86_64/binutils-2.25.1-1.ph1.x86_64.rpm

-x86_64/libgomp-devel-5.3.0-1.ph1.x86_64.rpm

+x86_64/binutils-2.30-2.ph1.x86_64.rpm

+x86_64/libgomp-devel-5.3.0-4.ph1.x86_64.rpm

+x86_64/libgomp-devel-7.3.0-1.ph1.x86_64.rpm

 x86_64/bzip2-devel-1.0.6-4.ph1.x86_64.rpm

-x86_64/libgcc-5.3.0-1.ph1.x86_64.rpm

+x86_64/libgcc-5.3.0-4.ph1.x86_64.rpm

+x86_64/libgcc-7.3.0-1.ph1.x86_64.rpm

 x86_64/gzip-1.6-1.ph1.x86_64.rpm

 x86_64/elfutils-libelf-devel-0.165-1.ph1.x86_64.rpm

 x86_64/openssl-devel-1.0.2g-1.ph1.x86_64.rpm

@@ -72,7 +80,8 @@ x86_64/pkg-config-0.28-1.ph1.x86_64.rpm

 x86_64/popt-devel-1.16-1.ph1.x86_64.rpm

 x86_64/flex-devel-2.5.39-1.ph1.x86_64.rpm

 x86_64/findutils-4.4.2-1.ph1.x86_64.rpm

-x86_64/libstdc++-5.3.0-1.ph1.x86_64.rpm

+x86_64/libstdc++-5.3.0-4.ph1.x86_64.rpm

+x86_64/libstdc++-7.3.0-1.ph1.x86_64.rpm

 x86_64/libpipeline-1.4.1-1.ph1.x86_64.rpm

 x86_64/make-4.1-1.ph1.x86_64.rpm

 x86_64/glibc-devel-2.22-3.ph1.x86_64.rpm