diff -Nru sosreport-3.6/debian/changelog sosreport-3.6/debian/changelog --- sosreport-3.6/debian/changelog 2018-11-14 09:31:33.000000000 -0500 +++ sosreport-3.6/debian/changelog 2018-11-16 10:52:59.000000000 -0500 @@ -1,3 +1,11 @@ +sosreport (3.6-1ubuntu0.18.10.2) cosmic; urgency=medium + + * d/p/dont-collect-some-tracing-instance-files.patch: (LP: #1803735) + - Ignoring some kernel files as the copy of them make sosreport + hangs in situation where kernel tracing events is in used. + + -- Eric Desrochers Fri, 16 Nov 2018 10:52:59 -0500 + sosreport (3.6-1ubuntu0.18.10.1) cosmic; urgency=medium * New 3.6 upstream release. (LP: #1775195) diff -Nru sosreport-3.6/debian/patches/dont-collect-some-tracing-instance-files.patch sosreport-3.6/debian/patches/dont-collect-some-tracing-instance-files.patch --- sosreport-3.6/debian/patches/dont-collect-some-tracing-instance-files.patch 1969-12-31 19:00:00.000000000 -0500 +++ sosreport-3.6/debian/patches/dont-collect-some-tracing-instance-files.patch 2018-11-16 10:51:55.000000000 -0500 @@ -0,0 +1,22 @@ +Description: [kernel] dont collect some tracing instance files + As copying of them hangs. +Author: Pavel Moravec +Origin: upstream, https://github.com/sosreport/sos/pull/1445/commits/d6379b5ba0f381ea8ec2403b9985100a946a5866 +Bug: https://github.com/sosreport/sos/pull/1445 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1775195 +Index: sosreport-3.6/sos/plugins/kernel.py +=================================================================== +--- sosreport-3.6.orig/sos/plugins/kernel.py ++++ sosreport-3.6/sos/plugins/kernel.py +@@ -93,7 +93,10 @@ class Kernel(Plugin, RedHatPlugin, Debia + '/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([ diff -Nru sosreport-3.6/debian/patches/series sosreport-3.6/debian/patches/series --- sosreport-3.6/debian/patches/series 2018-11-13 15:37:27.000000000 -0500 +++ sosreport-3.6/debian/patches/series 2018-11-16 10:51:55.000000000 -0500 @@ -2,3 +2,4 @@ avoid-distutils.diff archive-fix-stat-typo.patch fix-string-substitution-method.patch +dont-collect-some-tracing-instance-files.patch