From f6c48730179b8df24d04753a57d39662a099b18e2f33c3af50783dff2c863413 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Mon, 13 Sep 2010 19:06:36 +0000 Subject: [PATCH] Accepting request 48013 from home:coolo:branches:openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/48013 OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=16 --- systemtap-support-2.6.36.diff | 57 +++++++++++++++++++++++++++++++++++ systemtap.changes | 11 +++++++ systemtap.spec | 48 ++--------------------------- 3 files changed, 71 insertions(+), 45 deletions(-) create mode 100644 systemtap-support-2.6.36.diff diff --git a/systemtap-support-2.6.36.diff b/systemtap-support-2.6.36.diff new file mode 100644 index 0000000..04f208e --- /dev/null +++ b/systemtap-support-2.6.36.diff @@ -0,0 +1,57 @@ +From 75a48ca31be58a7f2c31d7bda4069a93105f872f Mon Sep 17 00:00:00 2001 +From: David Smith +Date: Mon, 23 Aug 2010 13:05:33 -0500 +Subject: [PATCH] Fixed PR11940 by getting scripts w/global variables to compile on 2.6.36. + +* runtime/runtime.h: Updated module parameter get/set functions with new + interface for 2.6.36. +--- + runtime/runtime.h | 17 ++++++++++++++--- + 1 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/runtime/runtime.h b/runtime/runtime.h +index 497137d..388216c 100644 +--- a/runtime/runtime.h ++++ b/runtime/runtime.h +@@ -142,10 +142,14 @@ static struct + #endif + #include "addr-map.c" + +- ++#ifdef module_param_cb /* kernels >= 2.6.36 */ ++#define _STP_KERNEL_PARAM_ARG const struct kernel_param ++#else ++#define _STP_KERNEL_PARAM_ARG struct kernel_param ++#endif + + /* Support functions for int64_t module parameters. */ +-static int param_set_int64_t(const char *val, struct kernel_param *kp) ++static int param_set_int64_t(const char *val, _STP_KERNEL_PARAM_ARG *kp) + { + char *endp; + long long ll; +@@ -166,13 +170,20 @@ static int param_set_int64_t(const char *val, struct kernel_param *kp) + return 0; + } + +-static int param_get_int64_t(char *buffer, struct kernel_param *kp) ++static int param_get_int64_t(char *buffer, _STP_KERNEL_PARAM_ARG *kp) + { + return sprintf(buffer, "%lli", (long long)*((int64_t *)kp->arg)); + } + + #define param_check_int64_t(name, p) __param_check(name, p, int64_t) + ++#ifdef module_param_cb /* kernels >= 2.6.36 */ ++static struct kernel_param_ops param_ops_int64_t = { ++ .set = param_set_int64_t, ++ .get = param_get_int64_t, ++}; ++#endif ++#undef _STP_KERNEL_PARAM_ARG + + /************* Module Stuff ********************/ + +-- +1.7.2 + diff --git a/systemtap.changes b/systemtap.changes index a9dae6d..bcaf540 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 13 11:25:26 UTC 2010 - coolo@novell.com + +- take fix for pr11940 from systemtap git + ------------------------------------------------------------------- Sun Sep 5 18:39:44 UTC 2010 - bg@novell.com @@ -10,6 +15,12 @@ Thu Aug 26 01:35:21 UTC 2010 - tonyj@novell.com Upstream release notes: http://sourceware.org/ml/systemtap/2010-q3/msg00098.html +------------------------------------------------------------------- +Wed Jul 21 12:51:32 CEST 2010 - vuntz@opensuse.org + +- Add python Requires to sdt-devel subpackage since dtrace is a + python script. + ------------------------------------------------------------------- Tue May 4 17:38:09 UTC 2010 - tonyj@novell.com diff --git a/systemtap.spec b/systemtap.spec index 66c0c6d..2e349b3 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -40,6 +40,7 @@ Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{pac # so that they are installed into directories matching below rm -rf's Patch1: systemtap-docdir-fix.diff Patch2: systemtap-hppa.diff +Patch3: systemtap-support-2.6.36.diff Requires: libebl1 Requires: %{name}-runtime = %{version}-%{release} @@ -50,15 +51,6 @@ SystemTap is an instrumentation system for systems running Linux 2.6. Developers can write instrumentation to collect data on the operation of the system. - - -Authors: --------- - Frank Ch. Eigler - Graydon Hoare - Martin Hunt - Tom Zanussi - %package runtime License: GPLv2+ Group: Development/Tools/Debuggers @@ -68,15 +60,6 @@ Summary: Runtime environment for systemtap SystemTap is an instrumentation system for systems running Linux 2.6. This package contains the runtime environment for systemtap programs. - - -Authors: --------- - Frank Ch. Eigler - Graydon Hoare - Martin Hunt - Tom Zanussi - %package client License: GPLv2+ Group: Development/Tools/Debuggers @@ -89,15 +72,6 @@ Requires: coreutils avahi avahi-utils mozilla-nss-tools zip unzip SystemTap is an instrumentation system for systems running Linux 2.6. This package contains the client component for systemtap. - - -Authors: --------- - Frank Ch. Eigler - Graydon Hoare - Martin Hunt - Tom Zanussi - %package server License: GPLv2+ Group: Development/Tools/Debuggers @@ -110,34 +84,17 @@ Requires: coreutils avahi avahi-utils mozilla-nss-tools zip unzip SystemTap is an instrumentation system for systems running Linux 2.6. This package contains the server component of systemtap. - - -Authors: --------- - Frank Ch. Eigler - Graydon Hoare - Martin Hunt - Tom Zanussi - %package sdt-devel License: GPLv2+ Group: Development/Tools/Debuggers Summary: Static probe support tools Requires: %{name} = %{version}-%{release} +Requires: python-base %description sdt-devel SystemTap is an instrumentation system for systems running Linux 2.6. This package contains the support tools for static probes. - - -Authors: --------- - Frank Ch. Eigler - Graydon Hoare - Martin Hunt - Tom Zanussi - %prep %if %use_snapshot %setup -n src -q @@ -146,6 +103,7 @@ Authors: %endif %patch1 -p1 %patch2 +%patch3 -p1 %build autoreconf -fi