From 0d340fb85444563f79a6309a9032bb62663f9ccf Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Dec 10 2019 17:35:39 +0000 Subject: Linux v5.5-rc1 --- diff --git a/kernel-tools.spec b/kernel-tools.spec index 03400c7..a9045ad 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -4,8 +4,8 @@ # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 1 -%global baserelease 2 +%global released_kernel 0 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -31,7 +31,7 @@ %global upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 0 +%global rcrev 1 # Set rpm version accordingly %global rpmversion 5.%{upstream_sublevel}.0 %endif @@ -141,6 +141,19 @@ of the Linux kernel. written in the Python programming language to use the interface \ to manipulate perf events. +%package -n perf-debuginfo +Summary: Debug information for package perf +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release} +AutoReqProv: no +%description -n perf-debuginfo +This package provides debug information for the perf package. + +# Note that this pattern only works right to match the .build-id +# symlinks because of the trailing nonmatching alternation and +# the leading .*, because of find-debuginfo.sh's buggy handling +# of matching the pattern against the symlinks file. +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|.*%%{_libdir}/traceevent/plugins/.*|.*%%{_libdir}/libperf-jvmti.so(\.debug)?|XXX' -o perf-debuginfo.list} + %package -n python3-perf Summary: %{pythonperfsum} %{?python_provide:%python_provide python3-perf} @@ -378,6 +391,7 @@ popd %{_bindir}/perf %dir %{_libdir}/traceevent %{_libdir}/traceevent/plugins/ +%{_libdir}/libperf-jvmti.so %{_libexecdir}/perf-core %{_datadir}/perf-core/ %{_mandir}/man[1-8]/perf* @@ -390,6 +404,8 @@ popd %license linux-%{kversion}/COPYING %{python3_sitearch}/* +%files -f perf-debuginfo.list -n perf-debuginfo + %files -n kernel-tools -f cpupower.lang %{_bindir}/cpupower %{_datadir}/bash-completion/completions/cpupower @@ -442,7 +458,7 @@ popd %files -n libbpf %{_libdir}/libbpf.so.0 -%{_libdir}/libbpf.so.0.0.5 +%{_libdir}/libbpf.so.0.0.6 %license linux-%{kversion}/COPYING %files -n libbpf-devel @@ -450,6 +466,11 @@ popd %{_libdir}/libbpf.so %{_libdir}/pkgconfig/libbpf.pc %{_includedir}/bpf/bpf.h +%{_includedir}/bpf/bpf_core_read.h +%{_includedir}/bpf/bpf_endian.h +%{_includedir}/bpf/bpf_helper_defs.h +%{_includedir}/bpf/bpf_helpers.h +%{_includedir}/bpf/bpf_tracing.h %{_includedir}/bpf/btf.h %{_includedir}/bpf/libbpf.h %{_includedir}/bpf/libbpf_util.h diff --git a/sources b/sources index 302ffe6..55898b3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f +SHA512 (patch-5.5-rc1.xz) = 151d993746f5947827617468b79541f8376502f9ad2285b675f4e4464dfd427e5874a2a9976af1fa9867ac1728c9fda13cad85ac810e12b1fc039a9b2ee5a174