package update

kernel-dont-collect-some-tracing-instance-files.patch

@@ -1,34 +0,0 @@
-From d6379b5ba0f381ea8ec2403b9985100a946a5866 Mon Sep 17 00:00:00 2001
-From: Pavel Moravec <pmoravec@redhat.com>
-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 <pmoravec@redhat.com>
----
- 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

sos.spec

@@ -1,19 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:          sos
-Version:       3.6
+Version:       3.9.1
-Release:       5
+Release:       2
 Summary:       A set of tools to gather troubleshooting information from a system
 License:       GPLv2+
-URL:           http://github.com/sosreport/sos
+URL:           https://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.
@@ -46,5 +44,8 @@ install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 %{_mandir}/man5/sos.conf.5.gz
 
 %changelog
+* Mon Jun 1 2020 chengzihan <chengzihan2@huawei.com> - 3.9.1-2
+- Package update
+
 * Mon Feb 17 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.6-5
 - Package init