diff --git a/kernel.spec b/kernel.spec index c2d3c5c117f47a6d4ca485c619f40e699779584e..79c1055b402e15c2c9c24bbf2d3e7b411b2da57b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ BuildRequires: ncurses-devel BuildRequires: elfutils-libelf-devel BuildRequires: rpm >= 4.14.2 #BuildRequires: sparse >= 0.4.1 -BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison +BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel perl(ExtUtils::Embed) bison BuildRequires: audit-libs-devel BuildRequires: pciutils-devel gettext BuildRequires: rpm-build, elfutils @@ -154,14 +154,6 @@ Summary: Performance monitoring for the Linux kernel This package contains the perf tool, which enables performance monitoring of the Linux kernel. -%package -n python2-perf -Provides: python-perf = %{version}-%{release} -Obsoletes: python-perf -Summary: Python bindings for apps which will manipulate perf events - -%description -n python2-perf -A Python module that permits applications written in the Python programming -language to use the interface to manipulate perf events. %package -n python3-perf Summary: Python bindings for apps which will manipulate perf events @@ -213,11 +205,6 @@ package or when debugging this package.\ %files -n perf-debuginfo -f perf-debugfiles.list %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%{_bindir}/perf.*(\.debug)?|.*%{_libexecdir}/perf-core/.*|.*%{_libdir}/traceevent/.*|XXX' -o perf-debugfiles.list} - -%debuginfo_template -n python2-perf -%files -n python2-perf-debuginfo -f python2-perf-debugfiles.list -%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%{python2_sitearch}/perf.*(.debug)?|XXX' -o python2-perf-debugfiles.list} - %debuginfo_template -n python3-perf %files -n python3-perf-debuginfo -f python3-perf-debugfiles.list %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%{python3_sitearch}/perf.*(.debug)?|XXX' -o python3-perf-debugfiles.list} @@ -352,11 +339,10 @@ make ARCH=%{Arch} modules %{?_smp_mflags} # perf %global perf_make \ make EXTRA_CFLAGS="-Wl,-z,now -g -Wall -fstack-protector-strong -fPIC" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 prefix=%{_prefix} -%global perf_python2 -C tools/perf PYTHON=%{__python2} + %global perf_python3 -C tools/python3-perf PYTHON=%{__python3} # perf chmod +x tools/perf/check-headers.sh -%{perf_make} %{perf_python2} all # make sure check-headers.sh is executable chmod +x tools/python3-perf/check-headers.sh @@ -605,7 +591,7 @@ popd %if 0%{?with_perf} # perf # perf tool binary and supporting scripts/binaries -%{perf_make} %{perf_python2} DESTDIR=%{buildroot} lib=%{_lib} install-bin install-traceevent-plugins +%{perf_make} %{perf_python3} DESTDIR=%{buildroot} lib=%{_lib} install-bin install-traceevent-plugins # remove the 'trace' symlink. rm -f %{buildroot}%{_bindir}/trace @@ -616,7 +602,6 @@ rm -rf %{buildroot}/usr/lib/perf/include/bpf/ # python-perf extension %{perf_make} %{perf_python3} DESTDIR=%{buildroot} install-python_ext -%{perf_make} %{perf_python2} DESTDIR=%{buildroot} install-python_ext %endif install -d %{buildroot}/%{_mandir}/man1 @@ -787,10 +772,6 @@ fi %{_datadir}/doc/perf-tip/* %license linux-%{KernelVer}/COPYING -%files -n python2-perf -%license linux-%{KernelVer}/COPYING -%{python2_sitearch}/* - %files -n python3-perf %license linux-%{KernelVer}/COPYING %{python3_sitearch}/*