From 8d3aed0ee67d77e0d28d09b664f780a3bbc17362f523cca9b457626d2a81bbfc Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Mar 2011 15:58:07 +0000 Subject: [PATCH] Accepting request 64204 from home:jirislaby:branches:devel:tools OBS-URL: https://build.opensuse.org/request/show/64204 OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=25 --- ...ONE_STOPPED-to-stop-module-compilati.patch | 29 +++++++++++++++++++ systemtap.changes | 5 ++++ systemtap.spec | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch diff --git a/0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch b/0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch new file mode 100644 index 0000000..e82f0bf --- /dev/null +++ b/0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch @@ -0,0 +1,29 @@ +From b30b7ed14e6734e0b5b216729aad0e465412c4b1 Mon Sep 17 00:00:00 2001 +From: Lukas Berk +Date: Mon, 24 Jan 2011 12:09:29 -0500 +Subject: adding #ifdef CLONE_STOPPED to stop module compilation error +Patch-mainline: yes +Git-commit: b30b7ed14e6734e0b5b216729aad0e465412c4b1 + +Signed-off-by: Jiri Slaby +--- + tapset/aux_syscalls.stp | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp +index e9a9750..25ca345 100644 +--- a/tapset/aux_syscalls.stp ++++ b/tapset/aux_syscalls.stp +@@ -1616,7 +1616,9 @@ static const _stp_val_array const _stp_fork_list[] = { + V(CLONE_DETACHED), + V(CLONE_UNTRACED), + V(CLONE_CHILD_SETTID), ++#ifdef CLONE_STOPPED + V(CLONE_STOPPED), ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) + V(CLONE_NEWUTS), + V(CLONE_NEWIPC), +-- +1.6.0.2 + diff --git a/systemtap.changes b/systemtap.changes index 1822e93..537f2b8 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 15 17:50:11 CET 2011 - jslaby@suse.de + +- add ifdef CLONE_STOPPED to fix compilation on newer kernels + ------------------------------------------------------------------- Fri Jan 21 18:46:18 UTC 2011 - tonyj@novell.com diff --git a/systemtap.spec b/systemtap.spec index ea98c32..8a8e812 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -39,6 +39,7 @@ Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{pac # need -docdir patch even though docs are packaged by systemtap-docs.spec # so that they are installed into directories matching below rm -rf's Patch1: systemtap-docdir-fix.diff +Patch2: 0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch Requires: libebl1 Requires: %{name}-runtime = %{version}-%{release} @@ -100,6 +101,7 @@ This package contains the support tools for static probes. %setup -n %{name}-%{package_version} -q %endif %patch1 -p1 +%patch2 -p1 %build autoreconf -fi