diff --git a/3.6.tar.gz b/3.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c753b74eab41ab8f4935738a4af8a78a805d6e06 Binary files /dev/null and b/3.6.tar.gz differ diff --git a/3.9.1.tar.gz b/3.9.1.tar.gz deleted file mode 100644 index 3625ca0dd96b910aa14f474a0423cce18419d7bc..0000000000000000000000000000000000000000 Binary files a/3.9.1.tar.gz and /dev/null differ diff --git a/kernel-dont-collect-some-tracing-instance-files.patch b/kernel-dont-collect-some-tracing-instance-files.patch new file mode 100644 index 0000000000000000000000000000000000000000..59557cda86239d4b61db3444998690ec8210b9d1 --- /dev/null +++ b/kernel-dont-collect-some-tracing-instance-files.patch @@ -0,0 +1,34 @@ +From d6379b5ba0f381ea8ec2403b9985100a946a5866 Mon Sep 17 00:00:00 2001 +From: Pavel Moravec +Date: Mon, 8 Oct 2018 10:45:04 +0200 +Subject: [PATCH 60/87] [kernel] dont collect some tracing instance files + +reason: dont collect some tracing instance files + +https://github.com/sosreport/sos/pull/1445/files + +Resolves: #1445 + +Signed-off-by: Pavel Moravec +--- + sos/plugins/kernel.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py +index 7310932..558e714 100644 +--- a/sos/plugins/kernel.py ++++ b/sos/plugins/kernel.py +@@ -93,7 +93,10 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): + '/sys/kernel/debug/tracing/events/*', + '/sys/kernel/debug/tracing/free_buffer', + '/sys/kernel/debug/tracing/trace_marker', +- '/sys/kernel/debug/tracing/trace_marker_raw' ++ '/sys/kernel/debug/tracing/trace_marker_raw', ++ '/sys/kernel/debug/tracing/instances/*/per_cpu/*/snapshot_raw', ++ '/sys/kernel/debug/tracing/instances/*/per_cpu/*/trace_pipe*', ++ '/sys/kernel/debug/tracing/instances/*/trace_pipe' + ]) + + self.add_copy_spec([ +-- +1.8.3.1 diff --git a/sos.spec b/sos.spec index df610ae062c98b96eef91c4f065c9b26e0179909..162b5083d3e3be8c5ea627a89935c6e23257fced 100644 --- a/sos.spec +++ b/sos.spec @@ -1,17 +1,19 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: sos -Version: 3.9.1 -Release: 2 +Version: 3.6 +Release: 5 Summary: A set of tools to gather troubleshooting information from a system License: GPLv2+ -URL: https://github.com/sosreport/sos +URL: http://github.com/sosreport/sos Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz + BuildRequires: python3-devel gettext python3-six Requires: libxml2-python3 bzip2 xz python3-six -Conflicts: vdsm <= 4.30.17 BuildArch: noarch +Patch0: kernel-dont-collect-some-tracing-instance-files.patch + %description Sos is an extensible, portable, support data collection tool primarily aimed at Linux distributions and other UNIX-like operating systems. @@ -44,8 +46,5 @@ install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf %{_mandir}/man5/sos.conf.5.gz %changelog -* Mon Jun 1 2020 chengzihan - 3.9.1-2 -- Package update - * Mon Feb 17 2020 openEuler Buildteam - 3.6-5 - Package init diff --git a/sos.yaml b/sos.yaml deleted file mode 100644 index 08c7d8ccb337a2e2ffd9f78c078cca3f99d0345c..0000000000000000000000000000000000000000 --- a/sos.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: github -src_repo: sosreport/sos -tag_prefix: ^v -seperator: .