From 69d7ebf6d5dc4fee3d1b0b33a3dfe22e85a08ff1 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Sep 19 2022 15:16:59 +0000 Subject: Drop patch no longer needed Signed-off-by: Justin M. Forbes --- diff --git a/0002-perf-Don-t-make-sourced-script-executable.patch b/0002-perf-Don-t-make-sourced-script-executable.patch deleted file mode 100644 index 5932867..0000000 --- a/0002-perf-Don-t-make-sourced-script-executable.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6e7db4598211d4022c97d699142cd02740faa4e Mon Sep 17 00:00:00 2001 -From: Laura Abbott -Date: Tue, 19 Dec 2017 11:45:52 -0800 -Subject: [PATCH 2/2] perf: Don't make sourced script executable - -rpm lint flagged this: - -perf.x86_64: E: executable-sourced-script /etc/bash_completion.d/perf 755 - -Make this not be executable - -Signed-off-by: Laura Abbott ---- - tools/perf/Makefile.perf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf -index 68cf1360a3f3..a072790f5fad 100644 ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -789,7 +789,7 @@ ifndef NO_LIBPYTHON - $(INSTALL) $(DLFILTERS) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/dlfilters'; - $(call QUIET_INSTALL, perf_completion-script) \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \ -- $(INSTALL) perf-completion.sh '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' -+ $(INSTALL) -m 644 perf-completion.sh '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' - $(call QUIET_INSTALL, perf-tip) \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(tip_instdir_SQ)'; \ - $(INSTALL) Documentation/tips.txt -t '$(DESTDIR_SQ)$(tip_instdir_SQ)' --- -2.14.3 - diff --git a/kernel-tools.spec b/kernel-tools.spec index eed21a0..a95275b 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -114,8 +114,7 @@ Source5000: patch-%{upstream_major}.%{upstream_sublevel}-rc%{rcrev}.xz %endif %endif -# rpmlint cleanup -Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch +# Patch1: Name: kernel-tools Summary: Assortment of tools for the Linux kernel @@ -219,7 +218,7 @@ cd linux-%{kversion} xzcat %{SOURCE5000} | patch -p1 -F1 -s %endif -%patch6 -p1 +# %patch1 -p1 # END OF PATCH APPLICATIONS