[oprofile] Rebase on oprofile-0.9.7.
William Eden Cohen
wcohen at fedoraproject.org
Tue Nov 29 17:19:30 UTC 2011
commit 637f44d79823df92cad09549f1f082af4c9c4ca9
Author: William Cohen <wcohen at redhat.com>
Date: Tue Nov 29 12:17:27 2011 -0500
Rebase on oprofile-0.9.7.
.gitignore | 1 +
oprofile-0.7-libs.patch | 134 --
...ile-0.9.5-xen.patch => oprofile-0.9.7-xen.patch | 145 +-
oprofile-amd.patch | 2147 --------------------
oprofile-check.patch | 82 -
oprofile-iaperf.patch | 16 -
oprofile-nehalem.patch | 46 -
oprofile-opcontrol.patch | 325 ---
oprofile-qt4.patch | 381 ----
oprofile-sect.patch | 92 -
oprofile-unmutable.patch | 12 -
oprofile-westmere.patch | 712 -------
oprofile.spec | 64 +-
sources | 2 +-
14 files changed, 84 insertions(+), 4075 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 552dd49..1859d64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
oprofile-0.9.6.tar.gz
+/oprofile-0.9.7.tar.gz
diff --git a/oprofile-0.9.5-xen.patch b/oprofile-0.9.7-xen.patch
similarity index 81%
rename from oprofile-0.9.5-xen.patch
rename to oprofile-0.9.7-xen.patch
index cc99eda..7ad0ac7 100644
--- a/oprofile-0.9.5-xen.patch
+++ b/oprofile-0.9.7-xen.patch
@@ -1,7 +1,7 @@
-diff -Naur oprofile-0.9.5/daemon/init.c oprofile-0.9.5-xen/daemon/init.c
---- oprofile-0.9.5/daemon/init.c 2009-07-31 10:10:19.000000000 -0700
-+++ oprofile-0.9.5-xen/daemon/init.c 2009-11-18 15:03:02.000000000 -0800
-@@ -309,6 +309,8 @@
+diff -up oprofile-0.9.7/daemon/init.c.xen oprofile-0.9.7/daemon/init.c
+--- oprofile-0.9.7/daemon/init.c.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/daemon/init.c 2011-11-28 16:25:07.577000010 -0500
+@@ -312,6 +312,8 @@ static void opd_26_init(void)
opd_create_vmlinux(vmlinux, kernel_range);
opd_create_xen(xenimage, xen_range);
@@ -10,10 +10,10 @@ diff -Naur oprofile-0.9.5/daemon/init.c oprofile-0.9.5-xen/daemon/init.c
opd_buf_size = opd_read_fs_int("/dev/oprofile/", "buffer_size", 1);
kernel_pointer_size = opd_read_fs_int("/dev/oprofile/", "pointer_size", 1);
-diff -Naur oprofile-0.9.5/daemon/opd_kernel.c oprofile-0.9.5-xen/daemon/opd_kernel.c
---- oprofile-0.9.5/daemon/opd_kernel.c 2009-07-31 10:10:19.000000000 -0700
-+++ oprofile-0.9.5-xen/daemon/opd_kernel.c 2009-11-18 15:03:02.000000000 -0800
-@@ -34,11 +34,22 @@
+diff -up oprofile-0.9.7/daemon/opd_kernel.c.xen oprofile-0.9.7/daemon/opd_kernel.c
+--- oprofile-0.9.7/daemon/opd_kernel.c.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/daemon/opd_kernel.c 2011-11-28 16:25:07.579000010 -0500
+@@ -34,11 +34,22 @@ static struct kernel_image vmlinux_image
static struct kernel_image xen_image;
@@ -36,7 +36,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_kernel.c oprofile-0.9.5-xen/daemon/opd_kern
/* for no vmlinux */
if (no_vmlinux) {
vmlinux_image.name = "no-vmlinux";
-@@ -57,13 +68,22 @@
+@@ -57,13 +68,22 @@ void opd_create_vmlinux(char const * nam
vmlinux_image.start, vmlinux_image.end);
exit(EXIT_FAILURE);
}
@@ -59,7 +59,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_kernel.c oprofile-0.9.5-xen/daemon/opd_kern
/* for no xen */
if (no_xen) {
xen_image.name = "no-xen";
-@@ -72,18 +92,106 @@
+@@ -72,18 +92,106 @@ void opd_create_xen(char const * name, c
xen_image.name = xstrdup(name);
@@ -168,7 +168,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_kernel.c oprofile-0.9.5-xen/daemon/opd_kern
/**
* Allocate and initialise a kernel image description
-@@ -210,6 +318,75 @@
+@@ -210,6 +318,75 @@ struct kernel_image * find_kernel_image(
struct list_head * pos;
struct kernel_image * image = &vmlinux_image;
@@ -244,7 +244,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_kernel.c oprofile-0.9.5-xen/daemon/opd_kern
if (no_vmlinux)
return image;
-@@ -222,8 +399,5 @@
+@@ -222,8 +399,5 @@ struct kernel_image * find_kernel_image(
return image;
}
@@ -254,10 +254,10 @@ diff -Naur oprofile-0.9.5/daemon/opd_kernel.c oprofile-0.9.5-xen/daemon/opd_kern
- return NULL;
+ return &vmlinux_image_anon;
}
-diff -Naur oprofile-0.9.5/daemon/opd_kernel.h oprofile-0.9.5-xen/daemon/opd_kernel.h
---- oprofile-0.9.5/daemon/opd_kernel.h 2009-07-31 10:10:19.000000000 -0700
-+++ oprofile-0.9.5-xen/daemon/opd_kernel.h 2009-11-18 15:03:02.000000000 -0800
-@@ -23,8 +23,12 @@
+diff -up oprofile-0.9.7/daemon/opd_kernel.h.xen oprofile-0.9.7/daemon/opd_kernel.h
+--- oprofile-0.9.7/daemon/opd_kernel.h.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/daemon/opd_kernel.h 2011-11-28 16:25:07.580000010 -0500
+@@ -23,8 +23,12 @@ struct transient;
/** create the kernel image */
void opd_create_vmlinux(char const * name, char const * arg);
@@ -270,7 +270,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_kernel.h oprofile-0.9.5-xen/daemon/opd_kern
/** opd_reread_module_info - parse /proc/modules for kernel modules */
void opd_reread_module_info(void);
-@@ -33,6 +37,7 @@
+@@ -33,6 +37,7 @@ struct kernel_image {
char * name;
vma_t start;
vma_t end;
@@ -278,10 +278,10 @@ diff -Naur oprofile-0.9.5/daemon/opd_kernel.h oprofile-0.9.5-xen/daemon/opd_kern
struct list_head list;
};
-diff -Naur oprofile-0.9.5/daemon/opd_sfile.c oprofile-0.9.5-xen/daemon/opd_sfile.c
---- oprofile-0.9.5/daemon/opd_sfile.c 2009-07-31 10:10:19.000000000 -0700
-+++ oprofile-0.9.5-xen/daemon/opd_sfile.c 2009-11-18 15:03:02.000000000 -0800
-@@ -240,7 +240,7 @@
+diff -up oprofile-0.9.7/daemon/opd_sfile.c.xen oprofile-0.9.7/daemon/opd_sfile.c
+--- oprofile-0.9.7/daemon/opd_sfile.c.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/daemon/opd_sfile.c 2011-11-28 16:25:07.582000010 -0500
+@@ -240,7 +240,7 @@ struct sfile * sfile_find(struct transie
}
/* we might need a kernel image start/end to hash on */
@@ -290,9 +290,9 @@ diff -Naur oprofile-0.9.5/daemon/opd_sfile.c oprofile-0.9.5-xen/daemon/opd_sfile
ki = find_kernel_image(trans);
if (!ki) {
verbprintf(vsamples, "Lost kernel sample %llx\n", trans->pc);
-diff -Naur oprofile-0.9.5/daemon/opd_trans.c oprofile-0.9.5-xen/daemon/opd_trans.c
---- oprofile-0.9.5/daemon/opd_trans.c 2009-07-31 10:10:19.000000000 -0700
-+++ oprofile-0.9.5-xen/daemon/opd_trans.c 2009-11-18 15:03:02.000000000 -0800
+diff -up oprofile-0.9.7/daemon/opd_trans.c.xen oprofile-0.9.7/daemon/opd_trans.c
+--- oprofile-0.9.7/daemon/opd_trans.c.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/daemon/opd_trans.c 2011-11-28 16:25:07.584000010 -0500
@@ -31,6 +31,8 @@
#include <stdio.h>
#include <errno.h>
@@ -302,7 +302,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_trans.c oprofile-0.9.5-xen/daemon/opd_trans
extern size_t kernel_pointer_size;
-@@ -203,6 +205,9 @@
+@@ -203,6 +205,9 @@ static void code_kernel_enter(struct tra
{
verbprintf(vmisc, "KERNEL_ENTER_SWITCH to kernel\n");
trans->in_kernel = 1;
@@ -312,7 +312,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_trans.c oprofile-0.9.5-xen/daemon/opd_trans
clear_trans_current(trans);
/* subtlety: we must keep trans->cookie cached,
* even though it's meaningless for the kernel -
-@@ -216,6 +221,9 @@
+@@ -216,6 +221,9 @@ static void code_user_enter(struct trans
{
verbprintf(vmisc, "USER_ENTER_SWITCH to user-space\n");
trans->in_kernel = 0;
@@ -322,7 +322,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_trans.c oprofile-0.9.5-xen/daemon/opd_trans
clear_trans_current(trans);
clear_trans_last(trans);
}
-@@ -244,17 +252,34 @@
+@@ -244,17 +252,34 @@ static void code_trace_begin(struct tran
static void code_xen_enter(struct transient * trans)
{
verbprintf(vmisc, "XEN_ENTER_SWITCH to xen\n");
@@ -364,7 +364,7 @@ diff -Naur oprofile-0.9.5/daemon/opd_trans.c oprofile-0.9.5-xen/daemon/opd_trans
extern void code_spu_profiling(struct transient * trans);
extern void code_spu_ctx_switch(struct transient * trans);
-@@ -278,7 +303,7 @@
+@@ -278,7 +303,7 @@ handler_t handlers[LAST_CODE + 1] = {
&code_spu_profiling,
&code_spu_ctx_switch,
#else
@@ -373,9 +373,9 @@ diff -Naur oprofile-0.9.5/daemon/opd_trans.c oprofile-0.9.5-xen/daemon/opd_trans
&code_unknown,
#endif
&code_ibs_fetch_sample,
-diff -Naur oprofile-0.9.5/daemon/opd_trans.h oprofile-0.9.5-xen/daemon/opd_trans.h
---- oprofile-0.9.5/daemon/opd_trans.h 2009-07-31 10:10:19.000000000 -0700
-+++ oprofile-0.9.5-xen/daemon/opd_trans.h 2009-11-18 15:03:02.000000000 -0800
+diff -up oprofile-0.9.7/daemon/opd_trans.h.xen oprofile-0.9.7/daemon/opd_trans.h
+--- oprofile-0.9.7/daemon/opd_trans.h.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/daemon/opd_trans.h 2011-11-28 16:25:07.585000010 -0500
@@ -21,6 +21,10 @@
#include <stdint.h>
@@ -387,10 +387,10 @@ diff -Naur oprofile-0.9.5/daemon/opd_trans.h oprofile-0.9.5-xen/daemon/opd_trans
struct sfile;
struct anon_mapping;
-diff -Naur oprofile-0.9.5/daemon/oprofiled.c oprofile-0.9.5-xen/daemon/oprofiled.c
---- oprofile-0.9.5/daemon/oprofiled.c 2009-07-31 10:10:19.000000000 -0700
-+++ oprofile-0.9.5-xen/daemon/oprofiled.c 2009-11-18 15:03:02.000000000 -0800
-@@ -71,6 +71,7 @@
+diff -up oprofile-0.9.7/daemon/oprofiled.c.xen oprofile-0.9.7/daemon/oprofiled.c
+--- oprofile-0.9.7/daemon/oprofiled.c.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/daemon/oprofiled.c 2011-11-28 16:25:07.587000010 -0500
+@@ -71,6 +71,7 @@ char * session_dir;
int no_xen;
char * xenimage;
char * xen_range;
@@ -398,7 +398,7 @@ diff -Naur oprofile-0.9.5/daemon/oprofiled.c oprofile-0.9.5-xen/daemon/oprofiled
static char * verbose;
static char * binary_name_filter;
static char * events;
-@@ -91,6 +92,7 @@
+@@ -91,6 +92,7 @@ static struct poptOption options[] = {
{ "xen-range", 0, POPT_ARG_STRING, &xen_range, 0, "Xen VMA range", "start-end", },
{ "xen-image", 0, POPT_ARG_STRING, &xenimage, 0, "Xen image", "file", },
{ "image", 0, POPT_ARG_STRING, &binary_name_filter, 0, "image name filter", "profile these comma separated image" },
@@ -406,20 +406,20 @@ diff -Naur oprofile-0.9.5/daemon/oprofiled.c oprofile-0.9.5-xen/daemon/oprofiled
{ "separate-lib", 0, POPT_ARG_INT, &separate_lib, 0, "separate library samples for each distinct application", "[0|1]", },
{ "separate-kernel", 0, POPT_ARG_INT, &separate_kernel, 0, "separate kernel samples for each distinct application", "[0|1]", },
{ "separate-thread", 0, POPT_ARG_INT, &separate_thread, 0, "thread-profiling mode", "[0|1]" },
-diff -Naur oprofile-0.9.5/daemon/oprofiled.h oprofile-0.9.5-xen/daemon/oprofiled.h
---- oprofile-0.9.5/daemon/oprofiled.h 2009-07-31 10:10:19.000000000 -0700
-+++ oprofile-0.9.5-xen/daemon/oprofiled.h 2009-11-18 15:03:02.000000000 -0800
-@@ -65,5 +65,6 @@
+diff -up oprofile-0.9.7/daemon/oprofiled.h.xen oprofile-0.9.7/daemon/oprofiled.h
+--- oprofile-0.9.7/daemon/oprofiled.h.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/daemon/oprofiled.h 2011-11-28 16:25:07.588000010 -0500
+@@ -65,5 +65,6 @@ extern char * kernel_range;
extern int no_xen;
extern char * xenimage;
extern char * xen_range;
+extern char * xen_passive_setup;
#endif /* OPROFILED_H */
-diff -Naur oprofile-0.9.5/doc/opcontrol.1.in oprofile-0.9.5-xen/doc/opcontrol.1.in
---- oprofile-0.9.5/doc/opcontrol.1.in 2009-07-31 10:10:18.000000000 -0700
-+++ oprofile-0.9.5-xen/doc/opcontrol.1.in 2009-11-18 15:03:02.000000000 -0800
-@@ -149,12 +149,41 @@
+diff -up oprofile-0.9.7/doc/opcontrol.1.in.xen oprofile-0.9.7/doc/opcontrol.1.in
+--- oprofile-0.9.7/doc/opcontrol.1.in.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/doc/opcontrol.1.in 2011-11-28 16:25:07.590000010 -0500
+@@ -158,12 +158,41 @@ Xen image
.br
.TP
.BI "--active-domains="<list>
@@ -463,10 +463,10 @@ diff -Naur oprofile-0.9.5/doc/opcontrol.1.in oprofile-0.9.5-xen/doc/opcontrol.1.
.br
.SH ENVIRONMENT
-diff -Naur oprofile-0.9.5/libpp/format_output.cpp oprofile-0.9.5-xen/libpp/format_output.cpp
---- oprofile-0.9.5/libpp/format_output.cpp 2009-07-31 10:10:18.000000000 -0700
-+++ oprofile-0.9.5-xen/libpp/format_output.cpp 2009-11-18 15:03:14.000000000 -0800
-@@ -287,8 +287,8 @@
+diff -up oprofile-0.9.7/libpp/format_output.cpp.xen oprofile-0.9.7/libpp/format_output.cpp
+--- oprofile-0.9.7/libpp/format_output.cpp.xen 2011-07-04 22:25:04.000000000 -0400
++++ oprofile-0.9.7/libpp/format_output.cpp 2011-11-28 16:25:07.592000010 -0500
+@@ -287,8 +287,8 @@ string formatter::format_app_name(field_
{
return get_image_name(f.symbol.app_name,
long_filenames
@@ -477,15 +477,15 @@ diff -Naur oprofile-0.9.5/libpp/format_output.cpp oprofile-0.9.5-xen/libpp/forma
extra_found_images);
}
-diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
---- oprofile-0.9.5/utils/opcontrol 2009-07-31 10:10:18.000000000 -0700
-+++ oprofile-0.9.5-xen/utils/opcontrol 2009-11-18 15:03:02.000000000 -0800
-@@ -159,9 +159,16 @@
- --cpu-buffer-size=num per-cpu buffer size in units (2.6 only)
- --note-table-size kernel notes buffer size in notes units (2.4 only)
+diff -up oprofile-0.9.7/utils/opcontrol.xen oprofile-0.9.7/utils/opcontrol
+--- oprofile-0.9.7/utils/opcontrol.xen 2011-07-20 15:36:48.000000000 -0400
++++ oprofile-0.9.7/utils/opcontrol 2011-11-28 16:28:56.431000248 -0500
+@@ -236,9 +236,16 @@ opcontrol: usage:
+ --note-table-size kernel notes buffer size in notes units (2.4
+ kernel)
- --xen Xen image (for Xen only)
-- --active-domains=<list> List of domains in profiling session (for Xen only)
+- --active-domains=<list> List of domains in profiling session (for Xen)
- (list contains domain ids separated by commas)
+ --xen=file Xen image (for Xen only)
+ --active-domains=id[,ids] list of domains in multiple domain profiling session (Xen)
@@ -500,9 +500,9 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
EOF
}
-@@ -310,6 +317,9 @@
- SETUP_DIR="/root/.oprofile"
+@@ -388,6 +395,9 @@ do_init()
SETUP_FILE="$SETUP_DIR/daemonrc"
+ SEC_SETUP_FILE="$SETUP_DIR/daemonrc_new"
+ # location for passing info about passive domains to daemon
+ PASSIVE_SETUP_FILE="$SETUP_DIR/xendomain.setup"
@@ -510,7 +510,7 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
# initialize daemon vars
decide_oprofile_device_mount
CPUTYPE=`cat $MOUNT/cpu_type`
-@@ -420,7 +430,7 @@
+@@ -539,7 +549,7 @@ do_load_setup()
}
@@ -519,7 +519,7 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
{
if test -z "$VMLINUX"; then
echo "No vmlinux file specified. You must specify the correct vmlinux file, e.g." >&2
-@@ -441,8 +451,12 @@
+@@ -560,8 +570,12 @@ check_valid_args()
echo "The specified vmlinux file \"$VMLINUX\" doesn't exist." >&2
exit 1
@@ -532,7 +532,7 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
if test -f "$XENIMAGE"; then
return
fi
-@@ -503,6 +517,77 @@
+@@ -622,6 +636,77 @@ get_image_range()
}
@@ -610,24 +610,29 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
# validate --separate= parameters. This function is called with IFS=,
# so on each argument is splitted
validate_separate_args()
-@@ -819,6 +904,16 @@
+@@ -932,10 +1017,20 @@ do_options()
+ DO_SETUP=yes
+ ;;
+ --active-domains)
+- error_if_invalid_arg $arg $val
++ error_if_invalid_arg "$arg" "$val"
ACTIVE_DOMAINS=$val
DO_SETUP=yes
;;
+ --passive-domains|--domains)
-+ error_if_empty $arg $val
++ error_if_invalid_arg "$arg" "$val"
+ PASSIVE_DOMAINS=$val
+ DO_SETUP=yes
+ ;;
+ --passive-images|--domain-images)
-+ error_if_empty $arg $val
++ error_if_invalid_arg "$arg" "$val"
+ PASSIVE_IMAGES=$val
+ DO_SETUP=yes
+ ;;
--note-table-size)
- error_if_empty $arg $val
if test "$KERNEL_SUPPORT" = "yes"; then
-@@ -1251,6 +1346,16 @@
+ echo "\"$arg\" meaningless on this kernel" >&2
+@@ -1366,6 +1461,16 @@ check_event_mapping_data()
exit 1
fi
fi
@@ -644,7 +649,7 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
}
-@@ -1289,6 +1394,15 @@
+@@ -1404,6 +1509,15 @@ do_param_setup()
fi
fi
@@ -660,7 +665,7 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
if test $NOTE_SIZE != 0; then
set_param notesize $NOTE_SIZE
fi
-@@ -1437,7 +1551,8 @@
+@@ -1566,7 +1680,8 @@ do_start_daemon()
fi
do_setup
@@ -670,7 +675,7 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
get_image_range "linux"
get_image_range "xen"
do_param_setup
-@@ -1467,6 +1582,10 @@
+@@ -1600,6 +1715,10 @@ do_start_daemon()
OPD_ARGS="$OPD_ARGS --image=$IMAGE_FILTER"
fi
@@ -681,7 +686,7 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
if test -n "$VERBOSE"; then
OPD_ARGS="$OPD_ARGS --verbose=$VERBOSE"
fi
-@@ -1663,6 +1782,8 @@
+@@ -1805,6 +1924,8 @@ do_save_session()
fi
hup_daemon
@@ -690,7 +695,7 @@ diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
}
-@@ -1713,7 +1834,8 @@
+@@ -1855,7 +1976,8 @@ do_operations()
fi
if test "$SETUP" = "yes"; then
diff --git a/oprofile.spec b/oprofile.spec
index 91f2d14..e97fa62 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,7 +1,7 @@
Summary: System wide profiler
Name: oprofile
-Version: 0.9.6
-Release: 21%{?dist}
+Version: 0.9.7
+Release: 1%{?dist}
License: GPLv2
Group: Development/System
#
@@ -11,19 +11,7 @@ Requires: which
Requires(pre): shadow-utils
Requires(postun): shadow-utils
Patch10: oprofile-0.4-guess2.patch
-Patch63: oprofile-0.7-libs.patch
-Patch83: oprofile-0.9.5-xen.patch
-#Patch104: oprofile-jvmpi-lgpl.patch
-#Patch105: oprofile-0.9.5-timer.patch
-Patch106: oprofile-sect.patch
-Patch120: oprofile-iaperf.patch
-Patch121: oprofile-nehalem.patch
-Patch122: oprofile-amd.patch
-Patch123: oprofile-westmere.patch
-Patch124: oprofile-check.patch
-Patch130: oprofile-unmutable.patch
-Patch131: oprofile-qt4.patch
-Patch132: oprofile-opcontrol.patch
+Patch83: oprofile-0.9.7-xen.patch
URL: http://oprofile.sf.net
@@ -90,17 +78,7 @@ agent library.
%prep
%setup -q -n %{name}-%{version}
%patch10 -p1 -b .guess2
-%patch63 -p1 -b .libs
-%patch83 -p1
-%patch106 -p1 -b .sect
-%patch120 -p1
-%patch121 -p1
-%patch122 -p1
-%patch123 -p1
-%patch124 -p1
-%patch130 -p1
-%patch131 -p1
-%patch132 -p1
+%patch83 -p1 -b .xen
./autogen.sh
@@ -152,24 +130,6 @@ make DESTDIR=${RPM_BUILD_ROOT} install
mkdir docs.installed
mv $RPM_BUILD_ROOT%{_datadir}/doc/oprofile/* docs.installed/
-#hack to make header files available
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
-install -m 755 libop/op_events.h $RPM_BUILD_ROOT/%{_includedir}
-install -m 755 libop/op_cpu_type.h $RPM_BUILD_ROOT/%{_includedir}
-install -m 755 libop/op_config.h $RPM_BUILD_ROOT/%{_includedir}
-install -m 755 libop/op_sample_file.h $RPM_BUILD_ROOT/%{_includedir}
-install -m 755 libutil/op_types.h $RPM_BUILD_ROOT/%{_includedir}
-install -m 755 libutil/op_list.h $RPM_BUILD_ROOT/%{_includedir}
-install -m 755 libdb/odb.h $RPM_BUILD_ROOT/%{_includedir}
-
-#hack to make .a files available
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
-install -m 755 libop/libop.a $RPM_BUILD_ROOT/%{_libdir}
-install -m 755 libdb/libodb.a $RPM_BUILD_ROOT/%{_libdir}
-install -m 755 libutil/liboputil.a $RPM_BUILD_ROOT/%{_libdir}
-install -m 755 libutil++/liboputil++.a $RPM_BUILD_ROOT/%{_libdir}
-install -m 755 libabi/libopabi.a $RPM_BUILD_ROOT/%{_libdir}
-
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{_libdir}/oprofile" > %{buildroot}/etc/ld.so.conf.d/oprofile-%{_arch}.conf
@@ -216,21 +176,8 @@ test "$1" != 0 || groupdel oprofile &>/dev/null || :
%files devel
%defattr(-,root,root)
-%{_includedir}/odb.h
-%{_includedir}/op_config.h
-%{_includedir}/op_cpu_type.h
-%{_includedir}/op_events.h
-%{_includedir}/op_list.h
-%{_includedir}/op_sample_file.h
-%{_includedir}/op_types.h
%{_includedir}/opagent.h
-%{_libdir}/libodb.a
-%{_libdir}/libop.a
-%{_libdir}/libopabi.a
-%{_libdir}/liboputil++.a
-%{_libdir}/liboputil.a
-
%files gui
%defattr(-,root,root)
@@ -247,6 +194,9 @@ test "$1" != 0 || groupdel oprofile &>/dev/null || :
/etc/ld.so.conf.d/*
%changelog
+* Mon Nov 29 2011 Will Cohen <wcohen at redhat.com> - 0.9.7-1
+- Rebase on oprofile-0.9.7.
+
* Tue Jun 07 2011 Will Cohen <wcohen at redhat.com> - 0.9.6-21
- Correct CVE-2011-1760. Resolves: rhbz #701508
diff --git a/sources b/sources
index 004289f..80f316e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e407093ac06200185d5a5e6437d7242 oprofile-0.9.6.tar.gz
+8b5d1d9b65f84420bcc3234777ad3be3 oprofile-0.9.7.tar.gz
More information about the scm-commits
mailing list