From 6fb56e4ac227ae5f544d2727a8612d7cbf66db7e Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Jun 18 2018 18:42:24 +0000 Subject: Linux v4.18-rc1 --- diff --git a/0001-tools-power-Don-t-make-man-pages-executable.patch b/0001-tools-power-Don-t-make-man-pages-executable.patch deleted file mode 100644 index 16cb72e..0000000 --- a/0001-tools-power-Don-t-make-man-pages-executable.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2c54dcb09fd790cb75535f01c466725f813b8d6b Mon Sep 17 00:00:00 2001 -From: Laura Abbott -Date: Tue, 19 Dec 2017 11:43:53 -0800 -Subject: [PATCH 1/2] tools/power: Don't make man pages executable - -rpm-lint flagged these as being executable: - -kernel-tools.x86_64: W: spurious-executable-perm /usr/share/man/man8/turbostat.8.gz -kernel-tools.x86_64: W: spurious-executable-perm /usr/share/man/man8/x86_energy_perf_policy.8.gz - -Fix this - -Signed-off-by: Laura Abbott ---- - tools/power/x86/turbostat/Makefile | 2 +- - tools/power/x86/x86_energy_perf_policy/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile -index a9bc914a8fe8..2ab25aa38263 100644 ---- a/tools/power/x86/turbostat/Makefile -+++ b/tools/power/x86/turbostat/Makefile -@@ -25,4 +25,4 @@ install : turbostat - install -d $(DESTDIR)$(PREFIX)/bin - install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat - install -d $(DESTDIR)$(PREFIX)/share/man/man8 -- install turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 -+ install -m 644 turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 -diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile -index 2447b1bbaacf..f4534fb8b951 100644 ---- a/tools/power/x86/x86_energy_perf_policy/Makefile -+++ b/tools/power/x86/x86_energy_perf_policy/Makefile -@@ -24,5 +24,5 @@ install : x86_energy_perf_policy - install -d $(DESTDIR)$(PREFIX)/bin - install $(BUILD_OUTPUT)/x86_energy_perf_policy $(DESTDIR)$(PREFIX)/bin/x86_energy_perf_policy - install -d $(DESTDIR)$(PREFIX)/share/man/man8 -- install x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 -+ install -m 644 x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 - --- -2.14.3 - diff --git a/kernel-tools.spec b/kernel-tools.spec index 21306cc..bbb227b 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -4,7 +4,7 @@ # 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 released_kernel 0 %global baserelease 1 %global fedora_build %{baserelease} @@ -30,7 +30,7 @@ # The next upstream release sublevel (base_sublevel+1) %global upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 0 +%global rcrev 1 # Set rpm version accordingly %global rpmversion 4.%{upstream_sublevel}.0 %endif @@ -108,7 +108,6 @@ Patch0: 0001-iio-Use-event-header-from-kernel-tree.patch Patch1: 0001-perf-Remove-FSF-address.patch Patch3: 0001-tools-include-Sync-vmx.h-header-for-FSF-removal.patch Patch4: 0001-tools-lib-Remove-FSF-address.patch -Patch5: 0001-tools-power-Don-t-make-man-pages-executable.patch Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch Patch8: 0001-Switch-to-python3.patch Name: kernel-tools @@ -198,7 +197,6 @@ cd linux-%{kversion} %patch1 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch8 -p1 @@ -282,6 +280,15 @@ rm -f %{buildroot}%{_bindir}/trace # remove the perf-tips rm -rf %{buildroot}%{_docdir}/perf-tip +# For both of the below, yes, this should be using a macro but right now +# it's hard coded and we don't actually want it anyway right now. +# Whoever wants examples can fix it up! + +# remove examples +rm -rf %{buildroot}/usr/lib/examples/perf +# remove the stray header file that somehow got packaged in examples +rm -rf %{buildroot}/usr/lib/include/perf/bpf/bpf.h + # python-perf extension %{perf_make} %{perf_python3} DESTDIR=%{buildroot} install-python_ext %{perf_make} %{perf_python2} DESTDIR=%{buildroot} install-python_ext @@ -414,10 +421,14 @@ popd %{_mandir}/man8/bpftool-cgroup.8.gz %{_mandir}/man8/bpftool-map.8.gz %{_mandir}/man8/bpftool-prog.8.gz +%{_mandir}/man8/bpftool-perf.8.gz %{_mandir}/man8/bpftool.8.gz %license linux-%{kversion}/COPYING %changelog +* Mon Jun 18 2018 Laura Abbott - 4.18.0-0.rc1.git0.1 +- Linux v4.18-rc1 + * Mon Jun 04 2018 Justin M. Forbes - 4.17.0-1 - Linux v4.17 diff --git a/sources b/sources index 0144b07..96cfa17 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db +SHA512 (patch-4.18-rc1.xz) = ead128244b67261c538b6e183eae2c8a33de3a335f6d3fee677e3c30c2345df13732140335060038537320c39716dca0ce2a7e379b30db827c8d7ea6c2fff6e3