@@ -1,17 +1,16 @@

-%define LINUX_VERSION 4.4.8

 Summary:	initramfs

 Name:		initramfs

 Version:	1.0

-Release:	4%{?dist}

+Release:	4%{?kernelsubrelease}%{?dist}

 License:	Apache License

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

 Distribution:	Photon

 Provides:	initramfs

-BuildRequires:       linux = %{LINUX_VERSION}

+BuildRequires:       linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

 BuildRequires:       dracut

 BuildRequires:       ostree

-Requires:	     linux = %{LINUX_VERSION}

+Requires:	     linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

 %description

 Photon release files such as yum configs and other /etc/ release related files

@@ -29,7 +28,7 @@ echo 'add_drivers+="tmem xen-acpi-processor xen-evtchn xen-gntalloc xen-gntdev x

 echo 'add_dracutmodules+=" ostree systemd "' > /etc/dracut.conf.d/ostree.conf

 %build

-dracut --force --kver %{LINUX_VERSION} initrd.img-no-kmods

+dracut --force --kver %{KERNEL_VERSION} initrd.img-no-kmods

 %install

 rm -rf $RPM_BUILD_ROOT

 install -d $RPM_BUILD_ROOT/boot

@@ -46,6 +45,8 @@ rm -rf $RPM_BUILD_ROOT

 /boot/initrd.img-no-kmods 

 %changelog

+*   Mon Aug 1 2016 Divya Thaluru <dthaluru@vmware.com> 1.0-4

+-   Added kernel macros

 *   Thu Jun 30 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0-4

 -   Exapand setup macro and remove the source file.

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0-3

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

-# This package depends on exact version of kernel rpm

-# since it provides kernel modules 

-%define LINUX_VERSION 4.4.8

-

 Summary: A New Scripting Dynamic Tracing Tool For Linux

 Name:    ktap

 Version: 0.4

-Release: 3%{?dist}

+Release: 3%{?kernelsubrelease}%{?dist}

 License: GPLv2

 URL: https://github.com/ktap/ktap

 Source: %{name}-master.zip

@@ -15,11 +11,11 @@ Vendor:     VMware, Inc.

 Patch0:        linux-4.4-support.patch

 Distribution:  Photon

 BuildRequires: elfutils-devel

-BuildRequires: linux-dev = %{LINUX_VERSION}

-BuildRequires: linux = %{LINUX_VERSION}

+BuildRequires: linux-dev = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

+BuildRequires: linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

 BuildRequires: unzip

 Requires: kmod

-Requires: linux = %{LINUX_VERSION}

+Requires: linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

 %description

 ktap is a new scripting dynamic tracing tool for Linux, it uses a scripting language and lets users trace the Linux kernel dynamically. ktap is designed to give operational insights with interoperability that allows users to tune, troubleshoot and extend the kernel and applications. It's similar to Linux Systemtap and Solaris Dtrace.

@@ -33,11 +29,11 @@ make ktap

 # ugly hack: disable security hardening to build kernel module

 # we need to remove sec hard specs file for that.

 rm -f `dirname $(gcc --print-libgcc-file-name)`/../specs

-make KVERSION=%{LINUX_VERSION} mod

+make KVERSION=%{KERNEL_VERSION} mod

 %install

 mkdir -p %{buildroot}%{_bindir}

-make install DESTDIR=%{buildroot} KVERSION=%{LINUX_VERSION}

+make install DESTDIR=%{buildroot} KVERSION=%{KERNEL_VERSION}

 %post

 /sbin/depmod -a

@@ -49,9 +45,11 @@ make install DESTDIR=%{buildroot} KVERSION=%{LINUX_VERSION}

 %defattr(-, root, root, 0755)

 %doc README.md

 %{_bindir}/ktap

-/lib/modules/%{LINUX_VERSION}/extra/ktapvm.ko

+/lib/modules/%{KERNEL_VERSION}/extra/ktapvm.ko

 %changelog

+*   Mon Aug 1 2016 Divya Thaluru <dthaluru@vmware.com> 0.4-3

+-   Added kernel macros

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.4-3

 -	GA - Bump release of all rpms

 *   Thu Apr 28 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-2

@@ -1,9 +1,8 @@

 %global security_hardening none

-%define LINUX_VERSION 4.4.8

 Summary:	Sysdig is a universal system visibility tool with native support for containers.

 Name:		sysdig

 Version:	0.10.1

-Release:	2%{?dist}

+Release:	2%{?kernelsubrelease}%{?dist}

 License:	GPLv2	  

 URL:		http://www.sysdig.org/

 Group:		Applications/System	

@@ -12,11 +11,12 @@ Distribution:	Photon

 Source0:	https://github.com/draios/sysdig/archive/%{name}-%{version}.tar.gz

 %define sha1 sysdig=272b95ad02be4d194bba66d360ff935084d9c842

 BuildRequires:	cmake 

-BuildRequires:  linux-dev = %{LINUX_VERSION}

+BuildRequires:  linux-dev = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

 BuildRequires:	openssl-devel

 BuildRequires:	curl

 BuildRequires:	zlib-devel

 BuildRequires:	ncurses-devel

+Requires:   linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

 Requires:	zlib

 Requires:	ncurses

 Requires:	openssl

@@ -39,17 +39,17 @@ cmake \

 	-DUSE_BUNDLED_ZLIB=OFF \

 	-DUSE_BUNDLED_NCURSES=OFF ..

-make KERNELDIR="/lib/modules/%{LINUX_VERSION}/build" 

+make KERNELDIR="/lib/modules/%{KERNEL_VERSION}/build" 

 %install

 cd build

-make install DESTDIR=%{buildroot} KERNELDIR="/lib/modules/%{LINUX_VERSION}/build"

+make install DESTDIR=%{buildroot} KERNELDIR="/lib/modules/%{KERNEL_VERSION}/build"

 mv %{buildroot}/usr/src/sysdig* %{buildroot}/usr/src/sysdig-%{version}

 mkdir -p %{buildroot}/etc/

 mv %{buildroot}/usr/etc/bash_completion.d %{buildroot}/etc/

 rm -rf %{buildroot}/usr/share/zsh/

-mkdir -p %{buildroot}/lib/modules/%{LINUX_VERSION}/extra

-mv driver/sysdig-probe.ko %{buildroot}/lib/modules/%{LINUX_VERSION}/extra

+mkdir -p %{buildroot}/lib/modules/%{KERNEL_VERSION}/extra

+mv driver/sysdig-probe.ko %{buildroot}/lib/modules/%{KERNEL_VERSION}/extra

 %clean

 rm -rf %{buildroot}/*

@@ -66,9 +66,11 @@ rm -rf %{buildroot}/*

 %{_bindir}

 /usr/src 

 %{_datadir}

-/lib/modules/%{LINUX_VERSION}/extra/sysdig-probe.ko

+/lib/modules/%{KERNEL_VERSION}/extra/sysdig-probe.ko

 %changelog

+*   Mon Aug 1 2016 Divya Thaluru <dthaluru@vmware.com> 0.10.1-2

+-   Added kernel macros

 *	Thu Jul 14 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.10.1-2

 -	Updated sysdig to build the kernel module 

 *       Tue Jun 28 2016 Anish Swaminathan <anishs@vmware.com> 0.10.1-1

@@ -27,8 +27,6 @@ class PackageUtils(object):

         self.rpmbuildBinary = "rpmbuild"

         self.rpmbuildBuildallOption = "-ba --clean"

-        self.rpmbuildBuildNum = '--define \\\"photon_build_number %s\\\"' % constants.buildNumber

-        self.rpmbuildReleaseVer = '--define \\\"photon_release_version %s\\\"' % constants.releaseVersion

         self.rpmbuildNocheckOption = "--nocheck"

         self.rpmbuildDistOption = '--define \\\"dist %s\\\"' % constants.dist

         self.queryRpmPackageOptions = "-qa"

@@ -185,6 +183,11 @@ class PackageUtils(object):

             self.copyAdditionalBuildFiles(listAdditionalFiles,chrootID)

+        #Adding rpm macros

+        listRPMMacros = constants.specData.getRPMMacros()

+        for macroName in listRPMMacros.keys():

+            macros.append(macroName+" "+listRPMMacros[macroName])

+

         listRPMFiles=[]

         listSRPMFiles=[]

         try:

@@ -215,7 +218,6 @@ class PackageUtils(object):

             rpmBuildcmd+=" "+self.rpmbuildNocheckOption

         for macro in macros:

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

-        rpmBuildcmd+=" "+self.rpmbuildBuildNum+" "+self.rpmbuildReleaseVer

         rpmBuildcmd+=" "+specFile

         cmdUtils = CommandUtils()

@@ -25,6 +25,7 @@ class SerializableSpecObjectsUtils(object):

         self.mapSerializableSpecObjects={}

         self.mapPackageToSpec={}

         self.logger=Logger.getLogger("Serializable Spec objects", logPath )

+        self.userDefinedMacros={}

     def readSpecsAndConvertToSerializableObjects(self,specFilesPath):

         listSpecFiles=[]

@@ -79,10 +80,35 @@ class SerializableSpecObjectsUtils(object):

         if self.mapSerializableSpecObjects[specName].installRequiresPackages.has_key(package):

             return self.mapSerializableSpecObjects[specName].installRequiresPackages[package]

         return None

-    

+

+    def addMacro(self, macroName, macroValue):

+        if macroName == "":

+            self.logger.error("Given invalid macro: name:"+macroName+" value:"+macroValue)

+            return

+        self.userDefinedMacros[macroName]=macroValue

+

+    def getRPMMacros(self):

+        return self.userDefinedMacros

+

+    def processData(self, data):

+        for macroName in self.userDefinedMacros.keys():

+            value = self.userDefinedMacros[macroName]

+            macro="%{?"+macroName+"}"

+            if data.find(macro) != -1:

+                data = data.replace(macro,value)

+                continue

+            macro="%{"+macroName+"}"

+            if data.find(macro) != -1:

+                data = data.replace(macro,value)

+                continue

+            macro="%"+macroName

+            if data.find(macro) != -1:

+                data = data.replace(macro,value)

+        return data

+

     def getRelease(self, package):

         specName=self.getSpecName(package)

-        return self.mapSerializableSpecObjects[specName].release

+        return self.processData(self.mapSerializableSpecObjects[specName].release)

     def getVersion(self, package):

         specName=self.getSpecName(package)

@@ -1,5 +1,3 @@

-import constants

-

 class rpmMacro(object):

     def __init__(self):

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

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

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

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

-            content = content.replace('%{?dist}',constants.constants.dist)

-

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

-            content = content.replace('%{dist}',constants.constants.dist)

-        

         return content

     def updatePackageMacro(self,macro):

@@ -46,7 +46,7 @@ class ToolChainUtils(object):

         rpmFile=pkgUtils.findRPMFileForGivenPackage(package)

         if rpmFile is None:

             specFile=constants.specData.getSpecFile(package)

-            cmd=self.rpmbuildCommand+" -ba --nocheck --define \'_topdir "+chrootID+constants.topDirPath+"\' --define \'_dbpath "+chrootID+"/var/lib/rpm\' --define \'dist "+constants.dist+"\' --define \'photon_build_number "+constants.buildNumber+"\' --define \'photon_release_version "+constants.releaseVersion+"\' "+specFile

+            cmd=self.rpmbuildCommand+" -ba --nocheck --define \'_topdir "+chrootID+constants.topDirPath+"\' --define \'_dbpath "+chrootID+"/var/lib/rpm\' --define \'dist "+constants.dist+"\' "+specFile

             self.logger.info(cmd)

             cmdUtils.runCommandInShell(cmd,self.logPath+"/filesystem.log")

             filesystemrpmFile = cmdUtils.findFile(package+"-[0-9]*.rpm", chrootID+constants.topDirPath+"/RPMS")

@@ -270,8 +270,33 @@ class constants(object):

         constants.pullsourcesConfig = options.pullsourcesConfig

         constants.inputRPMSPath=options.inputRPMSPath

         constants.rpmCheck = options.rpmCheck

+        constants.updateRPMMacros()

+    @staticmethod

+    def updateRPMMacros():

+        #adding distribution rpm macro

+        constants.specData.addMacro("dist",constants.dist)

+        #adding buildnumber rpm macro

+        constants.specData.addMacro("photon_build_number",constants.buildNumber)

+

+        #adding releasenumber rpm macro

+        constants.specData.addMacro("photon_release_version",constants.releaseVersion)

+

+        #adding kernelversion rpm macro

+        kernelversion = constants.specData.getVersion("linux")

+        constants.specData.addMacro("KERNEL_VERSION",kernelversion)

+

+        #adding kernelrelease rpm macro

+        kernelrelease = constants.specData.getRelease("linux")

+        constants.specData.addMacro("KERNEL_RELEASE",kernelrelease)

-        

-    

+        #adding kernelsubrelease rpm macro

+        kernelversion = kernelversion.replace(".","")

+        if kernelversion.isdigit():

+            kernelversion = int(kernelversion) << 8

+        kernelsubrelease = str(kernelversion)+kernelrelease

+        kernelsubrelease = kernelsubrelease.replace(constants.dist,"")

+        if kernelsubrelease:

+            kernelsubrelease = "."+kernelsubrelease

+            constants.specData.addMacro("kernelsubrelease",kernelsubrelease)