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/README.en.md b/README.en.md deleted file mode 100644 index e2cc0059df450420f4c8a4ab0b9bfa00f0f3469d..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# sos - -#### Description -A set of tools to gather troubleshooting information from a system - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 71854b354ad08fefec4499bcbe6571217e5b837a..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# sos - -#### 介绍 -A set of tools to gather troubleshooting information from a system - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) 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 new file mode 100644 index 0000000000000000000000000000000000000000..162b5083d3e3be8c5ea627a89935c6e23257fced --- /dev/null +++ b/sos.spec @@ -0,0 +1,50 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Name: sos +Version: 3.6 +Release: 5 +Summary: A set of tools to gather troubleshooting information from a system +License: GPLv2+ +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 +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. + +%package_help + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +%py3_build + +%install +%py3_install '--install-scripts=%{_sbindir}' +install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf + +%find_lang %{name} || echo 0 + +%files -f %{name}.lang +%license LICENSE +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/sos.conf +%{_sbindir}/sosreport +%{python3_sitelib}/* + +%files help +%defattr(-,root,root) +%doc AUTHORS README.md +%{_mandir}/man1/sosreport.1.gz +%{_mandir}/man5/sos.conf.5.gz + +%changelog +* Mon Feb 17 2020 openEuler Buildteam - 3.6-5 +- Package init