Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perf for openSUSE:Factory checked in
at 2021-07-29 21:31:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perf (Old)
and /work/SRC/openSUSE:Factory/.perf.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perf"
Thu Jul 29 21:31:55 2021 rev:61 rq:909041 version:MACRO
Changes:
--------
--- /work/SRC/openSUSE:Factory/perf/perf.changes 2021-07-07
18:31:21.114580276 +0200
+++ /work/SRC/openSUSE:Factory/.perf.new.1899/perf.changes 2021-07-29
21:33:01.692692435 +0200
@@ -1,0 +2,7 @@
+Mon Jul 26 07:05:21 UTC 2021 - Jiri Slaby <jsl...@suse.cz>
+
+- Fix for kernel 5.14
+ * add perf-5.14-don-t-install-headers-with-x-permissions.patch
+ * add perf-5.14-remove-shebang-from-scripts-perl-python-.-pl-py.patch
+
+-------------------------------------------------------------------
New:
----
perf-5.14-don-t-install-headers-with-x-permissions.patch
perf-5.14-remove-shebang-from-scripts-perl-python-.-pl-py.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perf.spec ++++++
--- /var/tmp/diff_new_pack.onsTRK/_old 2021-07-29 21:33:02.100691933 +0200
+++ /var/tmp/diff_new_pack.onsTRK/_new 2021-07-29 21:33:02.100691933 +0200
@@ -23,6 +23,10 @@
# perf does not link with LTO
%define _lto_cflags %{nil}
%define version %(rpm -q --qf '%%{VERSION}' kernel-source)
+%define version_pure %(echo %{version}|sed
's@\\([0-9]*\\)\\.\\([0-9]*\\).*@\\1\\2@')
+%if %{version_pure} >= 514
+%bcond_without devel
+%endif
%ifarch s390x s390
%define _perf_unwind NO_LIBUNWIND=1
%else
@@ -36,6 +40,8 @@
License: GPL-2.0-only
Group: Development/Tools/Debuggers
URL: https://perf.wiki.kernel.org/
+Patch0: perf-5.14-don-t-install-headers-with-x-permissions.patch
+Patch1: perf-5.14-remove-shebang-from-scripts-perl-python-.-pl-py.patch
BuildRequires: OpenCSD-devel
BuildRequires: audit-devel
%ifnarch %{arm}
@@ -43,6 +49,7 @@
%endif
BuildRequires: binutils-devel
BuildRequires: bison
+BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gtk2-devel
BuildRequires: kernel-source >= 2.6.31
@@ -71,6 +78,16 @@
This subsystem utilizes the Performance Monitoring Unit (PMU) / hardware
counters of the underlying cpu architecture (if supported).
+%if %{with devel}
+%package devel
+Summary: Development headers for perf
+Group: Development/Libraries/Other
+Requires: %{name} = %{version}
+
+%description devel
+Development headers for perf. This is currently only dlfilter header.
+%endif
+
%prep
# copy necessary files from kernel-source since we need to modify them
(cd %{_prefix}/src/linux ; tar -cf - COPYING CREDITS README tools include
scripts Kbuild Makefile arch/*/{include,lib,Makefile} lib) | tar -xf -
@@ -79,7 +96,10 @@
# don't error out on deprecated definitions in gtk2.h
sed -i 's@ignored "-Wstrict-prototypes"@&\n#pragma GCC diagnostic ignored
"-Wdeprecated-declarations"@' tools/build/feature/test-gtk2.c
-%autopatch -p1
+%if %{version_pure} >= 514
+%patch0 -p1
+%patch1 -p1
+%endif
%build
cd tools/perf
@@ -120,6 +140,8 @@
# temp workaround as perf Makefile is still installing plugins even with
LIBTRACEEVENT_DYNAMIC=1
rm -rf %{buildroot}/%{_libdir}/traceevent
+%fdupes %{buildroot}/%{_prefix}/lib/%{name}-core
+
%files
%license COPYING
%doc CREDITS README tools/perf/design.txt
@@ -137,4 +159,10 @@
%dir %{_docdir}/perf/examples/bpf
%{_docdir}/perf/examples/bpf/*
+%if %{with devel}
+%files devel
+%dir %{_includedir}/perf/
+%{_includedir}/perf/*.h
+%endif
+
%changelog
++++++ perf-5.14-don-t-install-headers-with-x-permissions.patch ++++++
From: Jiri Slaby <jsl...@suse.cz>
Date: Mon, 26 Jul 2021 08:33:23 +0200
Subject: perf: don't install headers with x permissions
Patch-mainline: submitted 2021/07/26 <20210726091434.5000-1-jsl...@suse.cz>
References: fix x perm install
install(1), by default, installs with rwxr-xr-x permissions. Modify
perf's Makefile to pass '-m 644' when installing:
* perf_dlfilter.h header
* trace/strace/groups/*
* scripts/perl/Perf-Trace-Util/lib/Perf/Trace/*
* scripts/perl/*.pl
* perf-completion.sh
* Documentation/tips.txt
* tests/attr.py
* tests/attr/*
* tests/shell/lib/*.sh
All those are supposed to be non-executable. Either they are not scripts
at all, or they don't have shebang.
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
Fixes: 0beb218315e0 (perf build: Install perf_dlfilter.h)
Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: Andi Kleen <a...@linux.intel.com>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Kan Liang <kan.li...@linux.intel.com>
Cc: Leo Yan <leo....@linaro.org>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Arnaldo Carvalho de Melo <a...@redhat.com>
---
tools/perf/Makefile.perf | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 77e7f18c0bd0..01bd153c4f2a 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -925,7 +925,7 @@ install-tools: all install-gtk
$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \
$(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf'
'$(DESTDIR_SQ)$(bindir_SQ)/trace'; \
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(includedir_SQ)/perf'; \
- $(INSTALL) util/perf_dlfilter.h -t
'$(DESTDIR_SQ)$(includedir_SQ)/perf'
+ $(INSTALL) -m 644 util/perf_dlfilter.h -t
'$(DESTDIR_SQ)$(includedir_SQ)/perf'
ifndef NO_PERF_READ_VDSO32
$(call QUIET_INSTALL, perf-read-vdso32) \
$(INSTALL) $(OUTPUT)perf-read-vdso32
'$(DESTDIR_SQ)$(bindir_SQ)';
@@ -960,13 +960,13 @@ endif
ifndef NO_LIBAUDIT
$(call QUIET_INSTALL, strace/groups) \
$(INSTALL) -d -m 755
'$(DESTDIR_SQ)$(STRACE_GROUPS_INSTDIR_SQ)'; \
- $(INSTALL) trace/strace/groups/* -t
'$(DESTDIR_SQ)$(STRACE_GROUPS_INSTDIR_SQ)'
+ $(INSTALL) trace/strace/groups/* -m 644 -t
'$(DESTDIR_SQ)$(STRACE_GROUPS_INSTDIR_SQ)'
endif
ifndef NO_LIBPERL
$(call QUIET_INSTALL, perl-scripts) \
$(INSTALL) -d -m 755
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace';
\
- $(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -t
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace';
\
- $(INSTALL) scripts/perl/*.pl -t
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'; \
+ $(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -m 644
-t
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace';
\
+ $(INSTALL) scripts/perl/*.pl -m 644 -t
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'; \
$(INSTALL) -d -m 755
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'; \
$(INSTALL) scripts/perl/bin/* -t
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'
endif
@@ -980,22 +980,22 @@ ifndef NO_LIBPYTHON
endif
$(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) perf-completion.sh -m 644
'$(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)'
+ $(INSTALL) Documentation/tips.txt -m 644 -t
'$(DESTDIR_SQ)$(tip_instdir_SQ)'
install-tests: all install-gtk
$(call QUIET_INSTALL, tests) \
$(INSTALL) -d -m 755
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
- $(INSTALL) tests/attr.py
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
+ $(INSTALL) tests/attr.py -m 644
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
$(INSTALL) tests/pe-file.exe*
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
$(INSTALL) -d -m 755
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \
- $(INSTALL) tests/attr/*
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \
+ $(INSTALL) tests/attr/* -m 644
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \
$(INSTALL) -d -m 755
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \
$(INSTALL) tests/shell/*.sh
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \
$(INSTALL) -d -m 755
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \
- $(INSTALL) tests/shell/lib/*.sh
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'
+ $(INSTALL) tests/shell/lib/*.sh -m 644
'$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'
install-bin: install-tools install-tests install-traceevent-plugins
--
2.32.0
++++++ perf-5.14-remove-shebang-from-scripts-perl-python-.-pl-py.patch ++++++
From: Jiri Slaby <jsl...@suse.cz>
Date: Mon, 26 Jul 2021 10:43:01 +0200
Subject: perf: remove shebang from scripts/{perl,python}/*.{pl,py}
Patch-mainline: submitted 2021/07/26 <20210726091434.5000-2-jsl...@suse.cz>
References: fix x perm install
The scripts cannot be executed on their own. The python ones were always
installed without x permissions, the perl ones fail anyway:
BEGIN failed--compilation aborted at
/usr/lib/perf-core/scripts/perl/rw-by-pid.pl line 18.
so there is no point to have a shebang in them. This causes rpmlint to
complain too:
W: non-executable-script /usr/lib/perf-core/scripts/perl/rw-by-file.pl 644
/usr/bin/perl -w
Hence drop shebangs in them all and remove x permissions in the
repository. If anyone wants some of them executable, they need to fix
the install scripts first.
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: Andi Kleen <a...@linux.intel.com>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Kan Liang <kan.li...@linux.intel.com>
Cc: Leo Yan <leo....@linaro.org>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Arnaldo Carvalho de Melo <a...@redhat.com>
---
tools/perf/scripts/perl/rw-by-file.pl | 1 -
tools/perf/scripts/perl/rw-by-pid.pl | 1 -
tools/perf/scripts/perl/rwtop.pl | 1 -
tools/perf/scripts/perl/wakeup-latency.pl | 1 -
tools/perf/scripts/python/exported-sql-viewer.py | 1 -
tools/perf/scripts/python/flamegraph.py | 0
tools/perf/scripts/python/libxed.py | 1 -
tools/perf/scripts/python/net_dropmonitor.py | 0
tools/perf/scripts/python/stackcollapse.py | 0
9 files changed, 6 deletions(-)
mode change 100755 => 100644 tools/perf/scripts/python/exported-sql-viewer.py
mode change 100755 => 100644 tools/perf/scripts/python/flamegraph.py
mode change 100755 => 100644 tools/perf/scripts/python/net_dropmonitor.py
mode change 100755 => 100644 tools/perf/scripts/python/stackcollapse.py
diff --git a/tools/perf/scripts/perl/rw-by-file.pl
b/tools/perf/scripts/perl/rw-by-file.pl
index 92a750b8552b..e0e4e23d5597 100644
--- a/tools/perf/scripts/perl/rw-by-file.pl
+++ b/tools/perf/scripts/perl/rw-by-file.pl
@@ -1,4 +1,3 @@
-#!/usr/bin/perl -w
# SPDX-License-Identifier: GPL-2.0-only
# (c) 2009, Tom Zanussi <tzanu...@gmail.com>
diff --git a/tools/perf/scripts/perl/rw-by-pid.pl
b/tools/perf/scripts/perl/rw-by-pid.pl
index d789fe39caab..43fcd4823f21 100644
--- a/tools/perf/scripts/perl/rw-by-pid.pl
+++ b/tools/perf/scripts/perl/rw-by-pid.pl
@@ -1,4 +1,3 @@
-#!/usr/bin/perl -w
# SPDX-License-Identifier: GPL-2.0-only
# (c) 2009, Tom Zanussi <tzanu...@gmail.com>
diff --git a/tools/perf/scripts/perl/rwtop.pl b/tools/perf/scripts/perl/rwtop.pl
index eba4df67af6b..96ce72e53f8e 100644
--- a/tools/perf/scripts/perl/rwtop.pl
+++ b/tools/perf/scripts/perl/rwtop.pl
@@ -1,4 +1,3 @@
-#!/usr/bin/perl -w
# SPDX-License-Identifier: GPL-2.0-only
# (c) 2010, Tom Zanussi <tzanu...@gmail.com>
diff --git a/tools/perf/scripts/perl/wakeup-latency.pl
b/tools/perf/scripts/perl/wakeup-latency.pl
index 53444ff4ec7f..f8b59f0bd949 100644
--- a/tools/perf/scripts/perl/wakeup-latency.pl
+++ b/tools/perf/scripts/perl/wakeup-latency.pl
@@ -1,4 +1,3 @@
-#!/usr/bin/perl -w
# SPDX-License-Identifier: GPL-2.0-only
# (c) 2009, Tom Zanussi <tzanu...@gmail.com>
diff --git a/tools/perf/scripts/python/exported-sql-viewer.py
b/tools/perf/scripts/python/exported-sql-viewer.py
old mode 100755
new mode 100644
index 13f2d8a81610..358438a648a9
--- a/tools/perf/scripts/python/exported-sql-viewer.py
+++ b/tools/perf/scripts/python/exported-sql-viewer.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# SPDX-License-Identifier: GPL-2.0
# exported-sql-viewer.py: view data from sql database
# Copyright (c) 2014-2018, Intel Corporation.
diff --git a/tools/perf/scripts/python/flamegraph.py
b/tools/perf/scripts/python/flamegraph.py
old mode 100755
new mode 100644
diff --git a/tools/perf/scripts/python/libxed.py
b/tools/perf/scripts/python/libxed.py
index 2c70a5a7eb9c..3ea5bb8195c4 100644
--- a/tools/perf/scripts/python/libxed.py
+++ b/tools/perf/scripts/python/libxed.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# SPDX-License-Identifier: GPL-2.0
# libxed.py: Python wrapper for libxed.so
# Copyright (c) 2014-2021, Intel Corporation.
diff --git a/tools/perf/scripts/python/net_dropmonitor.py
b/tools/perf/scripts/python/net_dropmonitor.py
old mode 100755
new mode 100644
diff --git a/tools/perf/scripts/python/stackcollapse.py
b/tools/perf/scripts/python/stackcollapse.py
old mode 100755
new mode 100644
--
2.32.0
