diff --git a/libpfm-4.10.1.tar.gz b/libpfm-4.10.1.tar.gz new file mode 100644 index 0000000..5440c40 --- /dev/null +++ b/libpfm-4.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c61c575378b5c17ccfc5806761e4038828610de76e2e34fac9f7fa73ba844b49 +size 1005988 diff --git a/libpfm-4.9.0.tar.gz b/libpfm-4.9.0.tar.gz deleted file mode 100644 index f626e45..0000000 --- a/libpfm-4.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db0fbe8ee28fd9beeb5d3e80b7cb3b104debcf6a9fcf5cb8b882f0662c79e4e2 -size 933147 diff --git a/libpfm-python3.patch b/libpfm-python3.patch deleted file mode 100644 index 7e8431c..0000000 --- a/libpfm-python3.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: libpfm-4.9.0/python/src/pmu.py -=================================================================== ---- libpfm-4.9.0.orig/python/src/pmu.py -+++ libpfm-4.9.0/python/src/pmu.py -@@ -26,7 +26,7 @@ from perfmon import * - - def public_members(self): - s = "{ " -- for k, v in self.__dict__.iteritems(): -+ for k, v in self.__dict__.items(): - if not k[0] == '_': - s += "%s : %s, " % (k, v) - s += " }" -@@ -94,8 +94,8 @@ if __name__ == '__main__': - for pmu in s.pmus: - info = pmu.info - if info.flags.is_present: -- print info.name, info.size, info.nevents -+ print(info.name, info.size, info.nevents) - for e in pmu.events(): -- print e.info.name, e.info.code -+ print(e.info.name, e.info.code) - for a in e.attrs(): -- print '\t\t', a.name, a.code -+ print('\t\t', a.name, a.code) -Index: libpfm-4.9.0/python/sys.py -=================================================================== ---- libpfm-4.9.0.orig/python/sys.py -+++ libpfm-4.9.0/python/sys.py -@@ -48,7 +48,7 @@ if __name__ == '__main__': - if options.events: - events = options.events.split(",") - else: -- raise "You need to specify events to monitor" -+ raise Exception("You need to specify events to monitor") - - s = perfmon.SystemWideSession(cpus, events) - -@@ -60,4 +60,4 @@ if __name__ == '__main__': - for c in cpus: - for i in range(0, len(events)): - count = struct.unpack("L", s.read(c, i))[0] -- print """CPU%d: %s\t%lu""" % (c, events[i], count) -+ print("""CPU%d: %s\t%lu""" % (c, events[i], count)) -Index: libpfm-4.9.0/python/self.py -=================================================================== ---- libpfm-4.9.0.orig/python/self.py -+++ libpfm-4.9.0/python/self.py -@@ -40,7 +40,7 @@ if __name__ == '__main__': - if options.events: - events = options.events.split(",") - else: -- raise "You need to specify events to monitor" -+ raise Exception("You need to specify events to monitor") - - s = perfmon.PerThreadSession(int(os.getpid()), events) - s.start() -@@ -55,4 +55,4 @@ if __name__ == '__main__': - # read the counts - for i in range(0, len(events)): - count = struct.unpack("L", s.read(i))[0] -- print """%s\t%lu""" % (events[i], count) -+ print("""%s\t%lu""" % (events[i], count)) diff --git a/libpfm.changes b/libpfm.changes index f10b304..137c0cb 100644 --- a/libpfm.changes +++ b/libpfm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Aug 8 14:18:34 UTC 2018 - tchvatal@suse.com + +- Version update to 4.10.1 fate#326340: + * Fix build issues on Cavium Tunder X2 from v4.10 + * Update to Intel Skylake event table + * Intel Skylake X uncore PMUs support (all PMU boxes) + * Intel Knight Mill (KNM) core PMU support + * Cavium Thunder X2 core PMU support + * various event table updates + * various bug fixes +- Drop patch merged upstream: + * libpfm-python3.patch + ------------------------------------------------------------------- Tue Jan 23 08:52:49 UTC 2018 - tchvatal@suse.com diff --git a/libpfm.spec b/libpfm.spec index d5d6055..4d3a140 100644 --- a/libpfm.spec +++ b/libpfm.spec @@ -21,7 +21,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define vname libpfm4 Name: libpfm -Version: 4.9.0 +Version: 4.10.1 Release: 0 Summary: Library to encode performance events License: MIT @@ -29,7 +29,6 @@ Group: Development/Libraries/C and C++ Url: http://perfmon2.sourceforge.net/ Source: http://downloads.sourceforge.net/project/perfmon2/libpfm4/%{name}-%{version}.tar.gz Source1: baselibs.conf -Patch0: libpfm-python3.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros @@ -89,7 +88,6 @@ This package provides python3 bindings for the libpfm4 package and the perf_even %prep %setup -q -%patch0 -p1 # disable werror sed -i \ -e 's:-Werror::g' \