From b9a650135b5033592c7bd9e06b956e50ab706b88c1cdaea6468c98422f8f55be Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Tue, 28 Jan 2020 17:25:01 +0000 Subject: [PATCH 1/2] Accepting request 767822 from home:dimstar:Factory - Replace libebl-devel BuildRequires with libdw-devel: ebl is being absorbed by libdw. Needed for Staging:B / elfutils update OBS-URL: https://build.opensuse.org/request/show/767822 OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=121 --- systemtap-docs.spec | 4 ++-- systemtap-dtrace.spec | 2 +- systemtap-headers.spec | 2 +- systemtap.changes | 6 ++++++ systemtap.spec | 5 ++--- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/systemtap-docs.spec b/systemtap-docs.spec index 38f7e4f..27c090b 100644 --- a/systemtap-docs.spec +++ b/systemtap-docs.spec @@ -1,7 +1,7 @@ # # spec file for package systemtap-docs # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,7 @@ BuildRequires: automake BuildRequires: fop BuildRequires: gcc-c++ BuildRequires: latex2html -BuildRequires: libebl-devel +BuildRequires: libdw-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-setuptools diff --git a/systemtap-dtrace.spec b/systemtap-dtrace.spec index 3a71a77..aa95510 100644 --- a/systemtap-dtrace.spec +++ b/systemtap-dtrace.spec @@ -1,7 +1,7 @@ # # spec file for package systemtap-dtrace # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/systemtap-headers.spec b/systemtap-headers.spec index 7e2fc42..d9a7016 100644 --- a/systemtap-headers.spec +++ b/systemtap-headers.spec @@ -1,7 +1,7 @@ # # spec file for package systemtap-headers # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/systemtap.changes b/systemtap.changes index 2aab884..46bc52e 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 27 11:29:47 UTC 2020 - Dominique Leuenberger + +- Replace libebl-devel BuildRequires with libdw-devel: ebl is + being absorbed by libdw. + ------------------------------------------------------------------- Fri Dec 6 17:29:35 UTC 2019 - Tony Jones diff --git a/systemtap.spec b/systemtap.spec index 9329941..6ba49c9 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,7 +1,7 @@ # # spec file for package systemtap # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,7 @@ BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libavahi-devel BuildRequires: libcap-devel -BuildRequires: libebl-devel +BuildRequires: libdw-devel BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-nss-devel BuildRequires: mozilla-nss-tools @@ -48,7 +48,6 @@ BuildRequires: sqlite-devel BuildRequires: pkgconfig(systemd) Requires: %{name}-dtrace = %{version} Requires: %{name}-runtime = %{version}-%{release} -Requires: libebl1 Obsoletes: systemtap-client < 1.5 %description From b48f10e4254707dd5f0f058294d988db7b4688d521755cacb5a2e5b8f4a3ba43 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Mon, 3 Feb 2020 23:48:47 +0000 Subject: [PATCH 2/2] - Resolve protoype issue when invoking tracebacks (bsc#1161296) Also dependent fix to handle GCC fallthrough New patch: systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch New patch: systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=122 --- ...lback-comment-to-work-with-newer-gcc.patch | 27 +++++++++++++++++++ ...-in-autoconf-stack-trace-save-regs.c.patch | 21 +++++++++++++++ systemtap.changes | 9 +++++++ systemtap.spec | 4 +++ 4 files changed, 61 insertions(+) create mode 100644 systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch create mode 100644 systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch diff --git a/systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch b/systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch new file mode 100644 index 0000000..6def2da --- /dev/null +++ b/systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch @@ -0,0 +1,27 @@ +From: Siddhesh Poyarekar +Date: Mon Jan 27 12:56:22 2020 +0530 +Subject: Amend fallback comment to work with newer gcc +Git-commit: eae455d2091cc67d1bfe1fa08430a368db64fb1e +References: bsc#1161296 +Signed-off-by: Tony Jones + + + Amend fallback comment to work with newer gcc + + Newer gcc does not recognize the fallthrough comment due to the text + following the fallthrough keyword. The "see above" doesn't seem too + valuable, so this patch drops it to fix the build. + +diff --git a/runtime/unwind/unwind.h b/runtime/unwind/unwind.h +index e5a5921ed..7fbe7cc61 100644 +--- a/runtime/unwind/unwind.h ++++ b/runtime/unwind/unwind.h +@@ -160,7 +160,7 @@ static unsigned long read_ptr_sect(const u8 **pLoc, const void *end, + #else + BUILD_BUG_ON(sizeof(u32) != sizeof(value)); + #endif +- /* fallthrough, see above. */ ++ /* fallthrough */ + case DW_EH_PE_absptr: + if (compat_task) + { diff --git a/systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch b/systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch new file mode 100644 index 0000000..10ab008 --- /dev/null +++ b/systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch @@ -0,0 +1,21 @@ +From: Craig Ringer +Date: Sun Dec 29 14:51:47 2019 -0500 +Subject: fix strict-prototypes in autoconf-stack-trace-save-regs.c +Git-commit: 3d571c2ab5797b41d07b51a7bbff626270d1e263 +References: bsc#1161296 +Signed-off-by: Tony Jones + + PR25265: fix strict-prototypes nit autoconf-stack-trace-save-regs.c + +diff --git a/runtime/linux/autoconf-stack-trace-save-regs.c b/runtime/linux/autoconf-stack-trace-save-regs.c +index 8bf33391f..1fd515f8f 100644 +--- a/runtime/linux/autoconf-stack-trace-save-regs.c ++++ b/runtime/linux/autoconf-stack-trace-save-regs.c +@@ -1,6 +1,6 @@ + #include + +-unsigned int foo () ++unsigned int foo (void) + { + unsigned long e[10]; + struct pt_regs* r = 0; diff --git a/systemtap.changes b/systemtap.changes index 46bc52e..197ca83 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 3 23:01:33 UTC 2020 - Tony Jones + +- Resolve protoype issue when invoking tracebacks (bsc#1161296) + Also dependent fix to handle GCC fallthrough + + New patch: systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch + New patch: systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch + ------------------------------------------------------------------- Mon Jan 27 11:29:47 UTC 2020 - Dominique Leuenberger diff --git a/systemtap.spec b/systemtap.spec index 6ba49c9..0e758ac 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -33,6 +33,8 @@ Source3: README-BEFORE-ADDING-PATCHES Source4: README-KEYRING Source5: stap-server.conf Patch1: systemtap-build-source-dir.patch +Patch2: systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch +Patch3: systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -94,6 +96,8 @@ This package contains the support tools for static probes. %prep %setup -q %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -fi