rpms/oprofile/devel .cvsignore, 1.11, 1.12 oprofile-0.7-libs.patch, 1.3, 1.4 oprofile-0.9.1-xen.patch, 1.2, 1.3 oprofile.spec, 1.48, 1.49 sources, 1.12, 1.13

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Sep 22 18:17:24 UTC 2006


Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8351

Modified Files:
	.cvsignore oprofile-0.7-libs.patch oprofile-0.9.1-xen.patch 
	oprofile.spec sources 
Log Message:
Import oprofile 0.9.2




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2005 14:42:38 -0000	1.11
+++ .cvsignore	22 Sep 2006 18:17:22 -0000	1.12
@@ -1,3 +1,4 @@
 oprofile-0.8.2.tar.gz
 oprofile-0.9.tar.gz
 oprofile-0.9.1.tar.gz
+oprofile-0.9.2.tar.gz

oprofile-0.7-libs.patch:
 daemon/Makefile.am       |    4 ++--
 gui/Makefile.am          |    4 ++--
 libabi/Makefile.am       |   10 +++++-----
 libabi/tests/Makefile.am |    6 +++---
 libutil++/Makefile.am    |    4 ++--
 libutil/Makefile.am      |    4 ++--
 pp/Makefile.am           |    4 ++--
 utils/Makefile.am        |    2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

Index: oprofile-0.7-libs.patch
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile-0.7-libs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oprofile-0.7-libs.patch	8 Jun 2005 20:35:03 -0000	1.3
+++ oprofile-0.7-libs.patch	22 Sep 2006 18:17:22 -0000	1.4
@@ -1,5 +1,5 @@
---- oprofile-0.9/libutil/Makefile.am.orig	2005-03-25 17:51:07.000000000 -0500
-+++ oprofile-0.9/libutil/Makefile.am	2005-06-08 14:17:14.000000000 -0400
+--- oprofile-0.9.2/libutil/Makefile.am.libs	2003-09-26 09:23:32.000000000 -0400
++++ oprofile-0.9.2/libutil/Makefile.am	2006-09-18 10:20:33.000000000 -0400
 @@ -2,8 +2,8 @@
  
  AM_CFLAGS = @OP_CFLAGS@
@@ -11,8 +11,46 @@
  	op_deviceio.c \
  	op_lockfile.c \
  	op_file.c \
---- oprofile-0.9/pp/Makefile.am.orig	2005-04-04 16:54:23.000000000 -0400
-+++ oprofile-0.9/pp/Makefile.am	2005-06-08 14:17:14.000000000 -0400
+--- oprofile-0.9.2/libabi/tests/Makefile.am.libs	2005-08-04 14:27:28.000000000 -0400
++++ oprofile-0.9.2/libabi/tests/Makefile.am	2006-09-18 10:27:20.000000000 -0400
+@@ -13,9 +13,9 @@
+ 
+ abi_test_SOURCES = abi_test.cpp
+ abi_test_LDADD = \
+-	../libabi.a \
++	../libopabi.a \
+ 	../../libop/libop.a \
+ 	../../libdb/libodb.a \
+ 	../../libopt++/libopt++.a \
+-	../../libutil++/libutil++.a \
+-	../../libutil/libutil.a
++	../../libutil++/liboputil++.a \
++	../../libutil/liboputil.a
+--- oprofile-0.9.2/libabi/Makefile.am.libs	2005-08-04 14:27:27.000000000 -0400
++++ oprofile-0.9.2/libabi/Makefile.am	2006-09-18 10:28:31.000000000 -0400
+@@ -10,15 +10,15 @@
+ 
+ AM_CXXFLAGS = @OP_CXXFLAGS@
+ 
+-noinst_LIBRARIES = libabi.a
+-libabi_a_SOURCES = abi.cpp abi.h op_abi.c op_abi.h
++noinst_LIBRARIES = libopabi.a
++libopabi_a_SOURCES = abi.cpp abi.h op_abi.c op_abi.h
+ 
+ bin_PROGRAMS = opimport
+ 
+ opimport_SOURCES = opimport.cpp
+ opimport_LDADD = \
+-	libabi.a \
++	libopabi.a \
+ 	../libdb/libodb.a \
+ 	../libopt++/libopt++.a \
+-	../libutil++/libutil++.a \
+-	../libutil/libutil.a
++	../libutil++/liboputil++.a \
++	../libutil/liboputil.a
+--- oprofile-0.9.2/pp/Makefile.am.libs	2005-04-04 18:34:41.000000000 -0400
++++ oprofile-0.9.2/pp/Makefile.am	2006-09-18 10:20:33.000000000 -0400
 @@ -19,9 +19,9 @@
  	../libpp/libpp.a \
  	../libopt++/libopt++.a \
@@ -25,31 +63,16 @@
  	../libdb/libodb.a
  
  opreport_SOURCES = opreport.cpp \
---- oprofile-0.9/daemon/Makefile.am.orig	2005-05-02 10:39:36.000000000 -0400
-+++ oprofile-0.9/daemon/Makefile.am	2005-06-08 14:17:14.000000000 -0400
-@@ -41,17 +41,17 @@
- if enable_abi
- oprofiled_LDADD = \
- 	liblegacy/liblegacy.a \
--	../libabi/libabi.a \
-+	../libabi/libopabi.a \
- 	../libdb/libodb.a \
- 	../libop/libop.a \
--	../libutil/libutil.a
-+	../libutil/liboputil.a
- LINKER=$(CXX)
- else
- oprofiled_LDADD = \
- 	liblegacy/liblegacy.a \
- 	../libdb/libodb.a \
- 	../libop/libop.a \
--	../libutil/libutil.a
-+	../libutil/liboputil.a
- LINKER=$(CC)
- endif
+--- oprofile-0.9.2/utils/Makefile.am.libs	2005-03-31 12:20:41.000000000 -0500
++++ oprofile-0.9.2/utils/Makefile.am	2006-09-18 10:20:33.000000000 -0400
+@@ -7,4 +7,4 @@
+ dist_bin_SCRIPTS = opcontrol
  
---- oprofile-0.9/gui/Makefile.am.orig	2005-03-25 17:51:07.000000000 -0500
-+++ oprofile-0.9/gui/Makefile.am	2005-06-08 14:17:14.000000000 -0400
+ ophelp_SOURCES = ophelp.c
+-ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
++ophelp_LDADD = ../libop/libop.a ../libutil/liboputil.a
+--- oprofile-0.9.2/gui/Makefile.am.libs	2003-11-06 14:45:54.000000000 -0500
++++ oprofile-0.9.2/gui/Makefile.am	2006-09-18 10:20:33.000000000 -0400
 @@ -26,9 +26,9 @@
  oprof_start_SOURCES = $(dist_sources)
  nodist_oprof_start_SOURCES = oprof_start.moc.cpp
@@ -62,50 +85,8 @@
  	ui/liboprof_start.a \
  	@QT_LDFLAGS@ \
  	@QT_LIB@ \
---- oprofile-0.9/libabi/Makefile.am.orig	2005-04-28 16:09:46.000000000 -0400
-+++ oprofile-0.9/libabi/Makefile.am	2005-06-08 14:21:40.000000000 -0400
-@@ -21,17 +21,17 @@
- 
- AM_CXXFLAGS = @OP_CXXFLAGS@
- 
--noinst_LIBRARIES = libabi.a
--libabi_a_SOURCES = abi.cpp op_abi.cpp
-+noinst_LIBRARIES = libopabi.a
-+libopabi_a_SOURCES = abi.cpp op_abi.cpp
- 
- bin_PROGRAMS = opimport
- 
- opimport_SOURCES = opimport.cpp
- opimport_LDADD = \
--	libabi.a \
-+	libopabi.a \
- 	../libdb/libodb.a \
- 	../libopt++/libopt++.a \
--	../libutil++/libutil++.a \
--	../libutil/libutil.a
-+	../libutil++/liboputil++.a \
-+	../libutil/liboputil.a
- 
- endif
---- oprofile-0.9/libabi/tests/Makefile.am.orig	2005-06-08 14:21:29.000000000 -0400
-+++ oprofile-0.9/libabi/tests/Makefile.am	2005-06-08 14:22:37.000000000 -0400
-@@ -20,11 +20,11 @@
- 
- abi_test_SOURCES = abi_test.cpp
- abi_test_LDADD = \
--	../libabi.a \
-+	../libopabi.a \
- 	../../libop/libop.a \
- 	../../libdb/libodb.a \
- 	../../libopt++/libopt++.a \
--	../../libutil++/libutil++.a \
--	../../libutil/libutil.a
-+	../../libutil++/liboputil++.a \
-+	../../libutil/liboputil.a
- 
- endif
---- oprofile-0.9/libutil++/Makefile.am.orig	2005-04-19 16:28:50.000000000 -0400
-+++ oprofile-0.9/libutil++/Makefile.am	2005-06-08 14:17:14.000000000 -0400
+--- oprofile-0.9.2/libutil++/Makefile.am.libs	2005-04-22 15:29:21.000000000 -0400
++++ oprofile-0.9.2/libutil++/Makefile.am	2006-09-18 10:20:33.000000000 -0400
 @@ -5,8 +5,8 @@
  	-I ${top_srcdir}/libop
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -117,11 +98,17 @@
  	op_bfd.cpp \
  	op_bfd.h \
  	bfd_support.cpp \
---- oprofile-0.9/utils/Makefile.am.orig	2005-03-31 11:49:28.000000000 -0500
-+++ oprofile-0.9/utils/Makefile.am	2005-06-08 14:24:46.000000000 -0400
-@@ -7,4 +7,4 @@
- dist_bin_SCRIPTS = opcontrol
+--- oprofile-0.9.2/daemon/Makefile.am.libs	2005-08-04 14:27:26.000000000 -0400
++++ oprofile-0.9.2/daemon/Makefile.am	2006-09-18 10:25:46.000000000 -0400
+@@ -40,9 +40,9 @@
  
- ophelp_SOURCES = ophelp.c
--ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
-+ophelp_LDADD = ../libop/libop.a ../libutil/liboputil.a
+ oprofiled_LDADD = \
+ 	liblegacy/liblegacy.a \
+-	../libabi/libabi.a \
++	../libabi/libopabi.a \
+ 	../libdb/libodb.a \
+ 	../libop/libop.a \
+-	../libutil/libutil.a
++	../libutil/liboputil.a
+ 
+ oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

oprofile-0.9.1-xen.patch:
 daemon/init.c          |    2 
 daemon/opd_interface.h |    3 -
 daemon/opd_kernel.c    |  147 +++++++++++++++++++++++++++++++++++++++++++++++--
 daemon/opd_kernel.h    |    5 +
 daemon/opd_sfile.c     |    2 
 daemon/opd_trans.c     |   39 +++++++++++--
 daemon/opd_trans.h     |    4 +
 daemon/oprofiled.c     |    2 
 daemon/oprofiled.h     |    1 
 doc/opcontrol.1.in     |   35 +++++++++++
 utils/opcontrol        |  133 ++++++++++++++++++++++++++++++++++++++++++--
 11 files changed, 352 insertions(+), 21 deletions(-)

Index: oprofile-0.9.1-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile-0.9.1-xen.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oprofile-0.9.1-xen.patch	24 Aug 2006 14:04:16 -0000	1.2
+++ oprofile-0.9.1-xen.patch	22 Sep 2006 18:17:22 -0000	1.3
@@ -1,78 +1,34 @@
-Signed-off-by: Jose Renato Santos <jsantos at hpl.hp.com>
-
-diff -Naur oprofile-0.9.1/daemon/init.c oprofile-0.9.1-passive/daemon/init.c
---- oprofile-0.9.1/daemon/init.c	2005-05-02 08:06:57.000000000 -0700
-+++ oprofile-0.9.1-passive/daemon/init.c	2006-08-22 08:46:00.000000000 -0700
-@@ -7,6 +7,9 @@
-  *
-  * @author John Levon
-  * @author Philippe Elie
-+ * Modified by Aravind Menon for Xen
-+ * These modifications are:
-+ * Copyright (C) 2005 Hewlett-Packard Co.
-  */
- 
- #include "config.h"
-@@ -222,6 +225,9 @@
- 	size_t opd_buf_size;
+diff -urN oprofile-0.9.1-xenact/daemon/init.c oprofile-0.9.1-xenpass/daemon/init.c
+--- oprofile-0.9.1-xenact/daemon/init.c	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/init.c	2006-09-19 10:39:44.000000000 -0400
+@@ -226,6 +226,8 @@
  
  	opd_create_vmlinux(vmlinux, kernel_range);
-+	opd_create_xen(xenimage, xen_range);
+ 	opd_create_xen(xenimage, xen_range);
 +	if (xen_passive_setup)
 +		opd_create_passive(xen_passive_setup);
  
  	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.1/daemon/opd_interface.h oprofile-0.9.1-passive/daemon/opd_interface.h
---- oprofile-0.9.1/daemon/opd_interface.h	2005-04-13 19:14:17.000000000 -0700
-+++ oprofile-0.9.1-passive/daemon/opd_interface.h	2006-08-23 17:45:00.000000000 -0700
-@@ -8,6 +8,9 @@
-  *
-  * @author John Levon
-  * @author Philippe Elie
-+ * Modified by Aravind Menon for Xen
-+ * These modifications are:
-+ * Copyright (C) 2005 Hewlett-Packard Co.
-  */
- 
- #ifndef OPD_INTERFACE_H
-@@ -17,10 +20,14 @@
- #define CPU_SWITCH_CODE			2
- #define COOKIE_SWITCH_CODE		3
- #define KERNEL_ENTER_SWITCH_CODE	4
--#define KERNEL_EXIT_SWITCH_CODE		5
--#define MODULE_LOADED_CODE              6
-+#define USER_ENTER_SWITCH_CODE		5
-+#define MODULE_LOADED_CODE		6
- #define CTX_TGID_CODE			7
- #define TRACE_BEGIN_CODE		8
--#define LAST_CODE			9
-+/* Code 9 used to be TRACE_END_CODE which is not used anymore  */
-+/* Code 9 is now considered an unknown escape code             */
-+#define XEN_ENTER_SWITCH_CODE		10
+diff -urN oprofile-0.9.1-xenact/daemon/opd_interface.h oprofile-0.9.1-xenpass/daemon/opd_interface.h
+--- oprofile-0.9.1-xenact/daemon/opd_interface.h	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/opd_interface.h	2006-09-19 10:39:44.000000000 -0400
+@@ -27,6 +27,7 @@
+ /* Code 9 used to be TRACE_END_CODE which is not used anymore  */
+ /* Code 9 is now considered an unknown escape code             */
+ #define XEN_ENTER_SWITCH_CODE		10
+-#define LAST_CODE			11
 +#define DOMAIN_SWITCH_CODE		11
 +#define LAST_CODE			12
   
  #endif /* OPD_INTERFACE_H */
-diff -Naur oprofile-0.9.1/daemon/opd_kernel.c oprofile-0.9.1-passive/daemon/opd_kernel.c
---- oprofile-0.9.1/daemon/opd_kernel.c	2004-01-29 12:00:26.000000000 -0800
-+++ oprofile-0.9.1-passive/daemon/opd_kernel.c	2006-08-23 16:50:43.000000000 -0700
-@@ -7,6 +7,9 @@
-  *
-  * @author John Levon
-  * @author Philippe Elie
-+ * Modified by Aravind Menon for Xen
-+ * These modifications are:
-+ * Copyright (C) 2005 Hewlett-Packard Co.
-  */
+diff -urN oprofile-0.9.1-xenact/daemon/opd_kernel.c oprofile-0.9.1-xenpass/daemon/opd_kernel.c
+--- oprofile-0.9.1-xenact/daemon/opd_kernel.c	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/opd_kernel.c	2006-09-19 10:39:44.000000000 -0400
+@@ -34,6 +34,11 @@
  
- #include "opd_kernel.h"
-@@ -29,6 +32,13 @@
+ static struct kernel_image xen_image;
  
- static struct kernel_image vmlinux_image;
- 
-+static struct kernel_image xen_image;
-+
 +static LIST_HEAD(passive_vmlinux);
 +static LIST_HEAD(passive_xen);
 +static LIST_HEAD(passive_apps);
@@ -81,37 +37,33 @@
  void opd_create_vmlinux(char const * name, char const * arg)
  {
  	/* vmlinux is *not* on the list of modules */
-@@ -54,6 +64,107 @@
- 	}
- }
+@@ -61,6 +66,8 @@
  
-+void opd_create_xen(char const * name, char const * arg)
-+{
+ void opd_create_xen(char const * name, char const * arg)
+ {
 +	int stat;
 +
-+	/* xen is *not* on the list of modules */
-+	list_init(&xen_image.list);
-+
-+	/* for no xen */
-+	if (no_xen) {
-+		xen_image.name = "no-xen";
-+		return;
-+	}
-+
-+	xen_image.name = xstrdup(name);
-+
+ 	/* xen is *not* on the list of modules */
+ 	list_init(&xen_image.list);
+ 
+@@ -72,18 +79,92 @@
+ 
+ 	xen_image.name = xstrdup(name);
+ 
+-	sscanf(arg, "%llx,%llx", &xen_image.start, &xen_image.end);
 +	stat = sscanf(arg, "%llx,%llx", &xen_image.start, &xen_image.end);
-+
-+	verbprintf(vmisc, "xen_start = %llx, xen_end = %llx\n",
-+	           xen_image.start, xen_image.end);
-+
+ 
+ 	verbprintf(vmisc, "xen_start = %llx, xen_end = %llx\n",
+ 	           xen_image.start, xen_image.end);
+ 
+-	if (!xen_image.start && !xen_image.end) {
 +	if ( stat != 2 ) {
-+		fprintf(stderr, "error: mis-parsed xen range: %llx-%llx\n",
-+		        xen_image.start, xen_image.end);
-+		exit(EXIT_FAILURE);
-+	}
-+}
-+
+ 		fprintf(stderr, "error: mis-parsed xen range: %llx-%llx\n",
+ 		        xen_image.start, xen_image.end);
+ 		exit(EXIT_FAILURE);
+ 	}
+ }
+ 
 +void opd_create_passive_domain(int id, char const * image_kernel, 
 +			       char const * range, char const * image_xen)
 +{
@@ -189,7 +141,7 @@
  
  /**
   * Allocate and initialise a kernel image description
-@@ -180,6 +291,65 @@
+@@ -210,6 +291,65 @@
  	struct list_head * pos;
  	struct kernel_image * image = &vmlinux_image;
  
@@ -255,33 +207,32 @@
  	if (no_vmlinux)
  		return image;
  
-diff -Naur oprofile-0.9.1/daemon/opd_kernel.h oprofile-0.9.1-passive/daemon/opd_kernel.h
---- oprofile-0.9.1/daemon/opd_kernel.h	2003-09-24 14:21:14.000000000 -0700
-+++ oprofile-0.9.1-passive/daemon/opd_kernel.h	2006-08-22 09:26:41.000000000 -0700
-@@ -7,6 +7,9 @@
-  *
-  * @author John Levon
-  * @author Philippe Elie
-+ * Modified by Aravind Menon for Xen
-+ * These modifications are:
-+ * Copyright (C) 2005 Hewlett-Packard Co.
-  */
+@@ -222,8 +362,5 @@
+ 			return image;
+ 	}
  
- #ifndef OPD_KERNEL_H
-@@ -20,6 +23,12 @@
+-	if (xen_image.start <= trans->pc && xen_image.end > trans->pc)
+-		return &xen_image;
+-
+ 	return NULL;
+ }
+diff -urN oprofile-0.9.1-xenact/daemon/opd_kernel.h oprofile-0.9.1-xenpass/daemon/opd_kernel.h
+--- oprofile-0.9.1-xenact/daemon/opd_kernel.h	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/opd_kernel.h	2006-09-19 10:39:44.000000000 -0400
+@@ -23,8 +23,12 @@
  /** create the kernel image */
  void opd_create_vmlinux(char const * name, char const * arg);
  
 +/** create Xen image */
-+void opd_create_xen(char const * name, char const * arg);
-+
+ void opd_create_xen(char const * name, char const * arg);
+ 
 +/** create Xen passive domain images */
 +void opd_create_passive(char const *setup_file);
 +
  /** opd_reread_module_info - parse /proc/modules for kernel modules */
  void opd_reread_module_info(void);
  
-@@ -28,6 +37,7 @@
+@@ -33,6 +37,7 @@
  	char * name;
  	vma_t start;
  	vma_t end;
@@ -289,9 +240,9 @@
  	struct list_head list;
  };
  
-diff -Naur oprofile-0.9.1/daemon/opd_sfile.c oprofile-0.9.1-passive/daemon/opd_sfile.c
---- oprofile-0.9.1/daemon/opd_sfile.c	2005-05-25 17:00:02.000000000 -0700
-+++ oprofile-0.9.1-passive/daemon/opd_sfile.c	2006-08-23 16:54:46.000000000 -0700
+diff -urN oprofile-0.9.1-xenact/daemon/opd_sfile.c oprofile-0.9.1-xenpass/daemon/opd_sfile.c
+--- oprofile-0.9.1-xenact/daemon/opd_sfile.c	2005-05-25 20:00:02.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/opd_sfile.c	2006-09-19 10:39:44.000000000 -0400
 @@ -226,7 +226,7 @@
  	}
  
@@ -301,20 +252,10 @@
  		ki = find_kernel_image(trans);
  		if (!ki) {
  			verbprintf(vsamples, "Lost kernel sample %llx\n", trans->pc);
-diff -Naur oprofile-0.9.1/daemon/opd_trans.c oprofile-0.9.1-passive/daemon/opd_trans.c
---- oprofile-0.9.1/daemon/opd_trans.c	2005-05-25 17:00:02.000000000 -0700
-+++ oprofile-0.9.1-passive/daemon/opd_trans.c	2006-08-23 16:56:07.000000000 -0700
-@@ -7,6 +7,9 @@
-  *
-  * @author John Levon
-  * @author Philippe Elie
-+ * Modified by Aravind Menon for Xen
-+ * These modifications are:
-+ * Copyright (C) 2005 Hewlett-Packard Co.
-  */
- 
- #include "opd_trans.h"
-@@ -24,6 +27,8 @@
+diff -urN oprofile-0.9.1-xenact/daemon/opd_trans.c oprofile-0.9.1-xenpass/daemon/opd_trans.c
+--- oprofile-0.9.1-xenact/daemon/opd_trans.c	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/opd_trans.c	2006-09-19 10:39:44.000000000 -0400
+@@ -27,6 +27,8 @@
  #include <stdio.h>
  #include <errno.h>
  
@@ -323,7 +264,7 @@
  extern size_t kernel_pointer_size;
  
  
-@@ -210,6 +215,9 @@
+@@ -213,6 +215,9 @@
  {
  	verbprintf(vmisc, "KERNEL_ENTER_SWITCH to kernel\n");
  	trans->in_kernel = 1;
@@ -333,15 +274,9 @@
  	clear_trans_current(trans);
  	/* subtlety: we must keep trans->cookie cached,
  	 * even though it's meaningless for the kernel -
-@@ -219,10 +227,13 @@
- }
- 
- 
--static void code_kernel_exit(struct transient * trans)
-+static void code_user_enter(struct transient * trans)
+@@ -226,6 +231,9 @@
  {
--	verbprintf(vmisc, "KERNEL_EXIT_SWITCH to user-space\n");
-+	verbprintf(vmisc, "USER_ENTER_SWITCH to user-space\n");
+ 	verbprintf(vmisc, "USER_ENTER_SWITCH to user-space\n");
  	trans->in_kernel = 0;
 +	/* if in passive domain mode cpu mode should be incremented */
 +	if (current_domain != COORDINATOR_DOMAIN)
@@ -349,23 +284,26 @@
  	clear_trans_current(trans);
  	clear_trans_last(trans);
  }
-@@ -248,6 +259,37 @@
- 	trans->tracing = TRACING_START;
- }
- 
-+static void code_xen_enter(struct transient *trans)
-+{
-+	verbprintf(vmisc, "XEN_ENTER_SWITCH to xen\n");
+@@ -254,17 +262,35 @@
+ static void code_xen_enter(struct transient *trans)
+ {
+ 	verbprintf(vmisc, "XEN_ENTER_SWITCH to xen\n");
+-	trans->in_kernel = 1;
 +	trans->in_kernel = 2;
 +	/* if in passive domain mode cpu mode should be incremented */
 +	if (current_domain != COORDINATOR_DOMAIN)
 +		trans->in_kernel++;
-+	trans->current = NULL;
-+	/* subtlety: we must keep trans->cookie cached, even though it's 
+ 	trans->current = NULL;
+ 	/* subtlety: we must keep trans->cookie cached, even though it's 
+-	 * meaningless for Xen - we won't necessarily get a cookie switch 
+-	 * on Xen exit. See comments in opd_sfile.c. It seems that we can 
+-	 * get away with in_kernel = 1 as long as we supply the correct 
+-	 * Xen image, and its address range in startup find_kernel_image 
+-	 * is modified to look in the Xen image also
 +	 * meaningless for Xen - same reason as for kernel 
-+	 */
-+}
-+
+ 	 */
+ }
+ 
 +static void code_domain_switch(struct transient *trans)
 +{
 +	/* While processing passive domain samples we ensure (in_kernel!=0)
@@ -384,28 +322,21 @@
 +	if (current_domain == COORDINATOR_DOMAIN)
 +		trans->in_kernel--;
 +}
- 
++
  typedef void (*handler_t)(struct transient *);
  
-@@ -257,11 +299,14 @@
- 	&code_cpu_switch,
- 	&code_cookie_switch,
- 	&code_kernel_enter,
--	&code_kernel_exit,
-+ 	&code_user_enter,
- 	&code_module_loaded,
- 	/* tgid handled differently */
- 	&code_unknown,
+ static handler_t handlers[LAST_CODE + 1] = {
+@@ -280,6 +306,7 @@
  	&code_trace_begin,
-+	&code_unknown,
-+ 	&code_xen_enter,
+ 	&code_unknown,
+  	&code_xen_enter,
 +	&code_domain_switch,
  };
  
  
-diff -Naur oprofile-0.9.1/daemon/opd_trans.h oprofile-0.9.1-passive/daemon/opd_trans.h
---- oprofile-0.9.1/daemon/opd_trans.h	2005-05-02 08:06:59.000000000 -0700
-+++ oprofile-0.9.1-passive/daemon/opd_trans.h	2006-08-22 10:04:52.000000000 -0700
+diff -urN oprofile-0.9.1-xenact/daemon/opd_trans.h oprofile-0.9.1-xenpass/daemon/opd_trans.h
+--- oprofile-0.9.1-xenact/daemon/opd_trans.h	2005-05-02 11:06:59.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/opd_trans.h	2006-09-19 10:39:44.000000000 -0400
 @@ -15,6 +15,10 @@
  #include "opd_cookie.h"
  #include "op_types.h"
@@ -417,95 +348,38 @@
  struct sfile;
  struct anon_mapping;
  
-diff -Naur oprofile-0.9.1/daemon/oprofiled.c oprofile-0.9.1-passive/daemon/oprofiled.c
---- oprofile-0.9.1/daemon/oprofiled.c	2005-03-29 09:10:51.000000000 -0800
-+++ oprofile-0.9.1-passive/daemon/oprofiled.c	2006-08-22 09:37:36.000000000 -0700
-@@ -7,6 +7,9 @@
-  *
-  * @author John Levon
-  * @author Philippe Elie
-+ * Modified by Aravind Menon for Xen
-+ * These modifications are:
-+ * Copyright (C) 2005 Hewlett-Packard Co.
-  */
- 
- #include "config.h"
-@@ -60,6 +63,10 @@
- int no_vmlinux;
- char * vmlinux;
- char * kernel_range;
-+int no_xen;
-+char * xenimage;
-+char * xen_range;
+diff -urN oprofile-0.9.1-xenact/daemon/oprofiled.c oprofile-0.9.1-xenpass/daemon/oprofiled.c
+--- oprofile-0.9.1-xenact/daemon/oprofiled.c	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/oprofiled.c	2006-09-19 10:39:44.000000000 -0400
+@@ -66,6 +66,7 @@
+ int no_xen;
+ char * xenimage;
+ char * xen_range;
 +char * xen_passive_setup;
  static char * verbose;
  static char * binary_name_filter;
  static char * events;
-@@ -75,7 +82,10 @@
- 	{ "kernel-range", 'r', POPT_ARG_STRING, &kernel_range, 0, "Kernel VMA range", "start-end", },
- 	{ "vmlinux", 'k', POPT_ARG_STRING, &vmlinux, 0, "vmlinux kernel image", "file", },
- 	{ "no-vmlinux", 0, POPT_ARG_NONE, &no_vmlinux, 0, "vmlinux kernel image file not available", NULL, },
-+	{ "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", },
+@@ -84,6 +85,7 @@
+ 	{ "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" },
 +	{ "xen-passive-setup", 0, POPT_ARG_STRING, &xen_passive_setup, 0, "Xen passive domain setup file", "filename", },
  	{ "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]" },
-@@ -407,7 +417,26 @@
- 		poptPrintHelp(optcon, stderr, 0);
- 		exit(EXIT_FAILURE);
- 	}
--	
-+
-+	if (!xenimage || !strcmp("", xenimage)) {
-+		no_xen = 1;
-+	} else {
-+ 		no_xen = 0;
-+
-+		/* canonicalise xen image filename. */
-+		tmp = xmalloc(PATH_MAX);
-+		if (realpath(xenimage, tmp))
-+			xenimage = tmp;
-+		else
-+			free(tmp);
-+
-+		if (!xen_range || !strcmp("", xen_range)) {
-+			fprintf(stderr, "oprofiled: no Xen VMA range specified.\n");
-+			poptPrintHelp(optcon, stderr, 0);
-+			exit(EXIT_FAILURE);
-+		}
-+	}
-+
- 	opd_parse_events(events);
- 
- 	opd_parse_image_filter();
-diff -Naur oprofile-0.9.1/daemon/oprofiled.h oprofile-0.9.1-passive/daemon/oprofiled.h
---- oprofile-0.9.1/daemon/oprofiled.h	2005-04-26 16:49:45.000000000 -0700
-+++ oprofile-0.9.1-passive/daemon/oprofiled.h	2006-08-22 08:46:33.000000000 -0700
-@@ -7,6 +7,9 @@
-  *
-  * @author John Levon
-  * @author Philippe Elie
-+ * Modified by Aravind Menon for Xen
-+ * These modifications are:
-+ * Copyright (C) 2005 Hewlett-Packard Co.
-  */
- 
- #ifndef OPROFILED_H
-@@ -58,5 +61,9 @@
- extern int no_vmlinux;
- extern char * vmlinux;
- extern char * kernel_range;
-+extern int no_xen;
-+extern char * xenimage;
-+extern char * xen_range;
+diff -urN oprofile-0.9.1-xenact/daemon/oprofiled.h oprofile-0.9.1-xenpass/daemon/oprofiled.h
+--- oprofile-0.9.1-xenact/daemon/oprofiled.h	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/daemon/oprofiled.h	2006-09-19 10:39:44.000000000 -0400
+@@ -64,5 +64,6 @@
+ extern int no_xen;
+ extern char * xenimage;
+ extern char * xen_range;
 +extern char * xen_passive_setup;
  
  #endif /* OPROFILED_H */
-diff -Naur oprofile-0.9.1/doc/opcontrol.1.in oprofile-0.9.1-passive/doc/opcontrol.1.in
---- oprofile-0.9.1/doc/opcontrol.1.in	2005-04-28 14:09:21.000000000 -0700
-+++ oprofile-0.9.1-passive/doc/opcontrol.1.in	2006-08-21 15:31:41.000000000 -0700
+diff -urN oprofile-0.9.1-xenact/doc/opcontrol.1.in oprofile-0.9.1-xenpass/doc/opcontrol.1.in
+--- oprofile-0.9.1-xenact/doc/opcontrol.1.in	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/doc/opcontrol.1.in	2006-09-19 10:39:44.000000000 -0400
 @@ -105,7 +105,8 @@
  .BI "--callgraph=#depth"
  Enable callgraph sample collection with a maximum depth. Use 0 to disable
@@ -516,25 +390,20 @@
  .br
  .TP
  .BI "--image="[name,name...|"all"]
-@@ -129,8 +130,52 @@
- .BI "--kernel-range="start,end
- Set kernel range vma address in hexadecimal.
- 
-+.SH OPTIONS (specific to Xen)
-+.TP
-+.BI "--xen="file
-+Xen image
-+.br
-+.TP
-+.BI "--active-domains="<list>
+@@ -136,12 +137,41 @@
+ .br
+ .TP
+ .BI "--active-domains="<list>
+-List of domain ids participating in a multi-domain profiling session. If 
 +List of domain ids participating in a multi-domain profiling session. 
 +Each of the specified domains must run an instance of oprofile. The 
 +sequence of opcontrol commands in each domain must follow a given 
 +order which is specified in the oprofile user manual. If 
-+more than one domain is specified in <list> they should be separated using 
-+commas. This option can only be used in domain 0 which is the only domain 
-+that can coordinate a multi-domain profiling session. Including domain 0 in 
-+the list of active domains is optional. (e.g. --active-domains=2,5,6 and 
+ more than one domain is specified in <list> they should be separated using 
+ commas. This option can only be used in domain 0 which is the only domain 
+ that can coordinate a multi-domain profiling session. Including domain 0 in 
+ the list of active domains is optional. (e.g. --active-domains=2,5,6 and 
+---active-domains=0,2,5,6 are equivalent)
 +--active-domains=0,2,5,6 are equivalent).
 +This option can only be specified
 +if --start-daemon is also specified and it is only 
@@ -562,22 +431,19 @@
 +--passive-domains option, also separated by commas. The association
 +between the images and domains is based on the order they are
 +specified in both options.
-+.br
-+
- .SH ENVIRONMENT
--No special environment variables are recognised by opreport.
-+No special environment variables are recognised by opcontrol.
+ .br
  
- .SH FILES
- .TP
-diff -Naur oprofile-0.9.1/utils/opcontrol oprofile-0.9.1-passive/utils/opcontrol
---- oprofile-0.9.1/utils/opcontrol	2005-06-16 12:12:07.000000000 -0700
-+++ oprofile-0.9.1-passive/utils/opcontrol	2006-08-23 17:25:13.000000000 -0700
-@@ -144,6 +144,17 @@
-    --buffer-size=num             kernel buffer size in sample units
+ .SH ENVIRONMENT
+diff -urN oprofile-0.9.1-xenact/utils/opcontrol oprofile-0.9.1-xenpass/utils/opcontrol
+--- oprofile-0.9.1-xenact/utils/opcontrol	2006-09-19 10:39:56.000000000 -0400
++++ oprofile-0.9.1-xenpass/utils/opcontrol	2006-09-19 10:39:44.000000000 -0400
+@@ -145,9 +145,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)
-+
+ 
+-   --xen                         Xen image (for Xen only)
+-   --active-domains=<list>       List of domains in profiling session (for Xen only)
+-                                 (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)
 +                                 (detailed profiling of user level and kernel modules code)
@@ -591,15 +457,7 @@
  " >&2
  }
  
-@@ -246,6 +257,7 @@
- 	CPU_BUF_SIZE=0
- 	NOTE_SIZE=0
- 	VMLINUX=
-+	XENIMAGE="none"
- 	VERBOSE=""
- 	SEPARATE_LIB=0
- 	SEPARATE_KERNEL=0
-@@ -259,6 +271,9 @@
+@@ -264,6 +271,9 @@
  	SETUP_DIR="/root/.oprofile"
  	SETUP_FILE="$SETUP_DIR/daemonrc"
  
@@ -609,15 +467,7 @@
  	CPUTYPE=`cat $MOUNT/cpu_type`
  	OP_COUNTERS=`ls $MOUNT/ | grep "^[0-9]\+\$" | tr "\n" " "`
  	NR_CHOSEN=0
-@@ -326,6 +341,7 @@
- 		echo "NOTE_SIZE=$NOTE_SIZE" >> $SETUP_FILE
- 	fi
- 	echo "CALLGRAPH=$CALLGRAPH" >> $SETUP_FILE
-+	echo "XENIMAGE=$XENIMAGE" >> $SETUP_FILE
- }
- 
- 
-@@ -363,7 +379,7 @@
+@@ -369,7 +379,7 @@
  }
  
  
@@ -626,77 +476,21 @@
  {
  	if test -z "$VMLINUX"; then
  		echo "No vmlinux file specified. You must specify the correct vmlinux file, e.g." >&2
-@@ -387,34 +403,134 @@
- }
- 
- 
--# get start and end points of the kernel
--get_kernel_range()
-+# similar check for Xen image
-+check_valid_xen()
- {
--	if test ! -z "$KERNEL_RANGE"; then
--		return;
-+	if test -f "$XENIMAGE"; then
-+		return
- 	fi
+@@ -390,8 +400,12 @@
  
--	if test "$VMLINUX" = "none"; then
-+	if test "$XENIMAGE" = "none"; then
-+		return
-+	fi
-+
-+	echo "The specified XenImage file \"$XENIMAGE\" does not exist." >&2
-+	exit 1
+ 	echo "The specified vmlinux file \"$VMLINUX\" doesn't exist." >&2
+ 	exit 1
 +}
 +
-+
-+# get start and end points of a file image (linux kernel or xen)
-+# get_image_range parameter: $1=type_of_image (linux or xen)
-+get_image_range()
+ 
+ # similar check for Xen image
++check_valid_xen()
 +{
-+	if test "$1" = "xen"; then
-+		if test ! -z "$XEN_RANGE"; then
-+			return;
-+		fi
-+		FILE_IMAGE="$XENIMAGE"
-+	else
-+		if test ! -z "$KERNEL_RANGE"; then
-+			return;
-+		fi
-+		FILE_IMAGE="$VMLINUX"
-+	fi
-+
-+	if test "$FILE_IMAGE" = "none"; then
- 		return;
+ 	if test -f "$XENIMAGE"; then
+ 		return
  	fi
- 
- 	# start at the start of .text and then continue to the end 
--	range_info=`objdump -h $VMLINUX 2>/dev/null | grep " .text "`
-+	range_info=`objdump -h $FILE_IMAGE 2>/dev/null | grep " .text "`
- 	tmp1=`echo $range_info | awk '{print $4}'`	
- 	tmp_length=`echo $range_info | awk  '{print $3}'`
--	tmp2=`objdump -h $VMLINUX --adjust-vma=0x$tmp_length 2>/dev/null | grep " .text " | awk  '{print $4}'`
-+	tmp2=`objdump -h $FILE_IMAGE --adjust-vma=0x$tmp_length 2>/dev/null | grep " .text " | awk  '{print $4}'`
- 
- 	if test -z "$tmp1" -o -z "$tmp2"; then
--		echo "The specified file $VMLINUX does not seem to be valid" >&2
--		echo "Make sure you are using vmlinux not vmlinuz" >&2
-+		echo "The specified file $FILE_IMAGE does not seem to be valid" >&2
-+		echo "Make sure you are using the non-compressed image file (e.g. vmlinux not vmlinuz)" >&2
- 		vecho "found start as \"$tmp1\", end as \"$tmp2\"" >&2
- 		exit 1
+@@ -447,6 +461,76 @@
  	fi
- 
--	KERNEL_RANGE="`echo $tmp1`,`echo $tmp2`"
--	vecho "KERNEL_RANGE $KERNEL_RANGE"
-+	if test "$1" = "xen"; then
-+		XEN_RANGE="`echo $tmp1`,`echo $tmp2`"
-+		vecho "XEN_RANGE $XEN_RANGE"
-+	else
-+		KERNEL_RANGE="`echo $tmp1`,`echo $tmp2`"
-+		vecho "KERNEL_RANGE $KERNEL_RANGE"
-+	fi
  }
   
 +set_passive_domain()
@@ -772,30 +566,10 @@
   
  # validate --separate= parameters. This function is called with IFS=,
  # so on each argument is splitted
-@@ -692,7 +808,7 @@
- 				VMLINUX=$val
+@@ -746,6 +830,16 @@
+ 				ACTIVE_DOMAINS=$val
  				DO_SETUP=yes
- 				# check validity
--				get_kernel_range
-+				get_image_range "linux"
  				;;
- 			--no-vmlinux)
- 				VMLINUX=none
-@@ -703,6 +819,27 @@
- 				KERNEL_RANGE=$val
- 				DO_SETUP=yes
- 				;;
-+			--xen)
-+				error_if_empty $arg $val
-+				XENIMAGE=$val
-+				DO_SETUP=yes
-+				get_image_range "xen"
-+				;;
-+			--active-domains)
-+				error_if_empty $arg $val
-+				ACTIVE_DOMAINS=$val
-+				DO_SETUP=yes
-+				;;
 +			--passive-domains|--domains)
 +				error_if_empty $arg $val
 +				PASSIVE_DOMAINS=$val
@@ -809,7 +583,7 @@
  			--note-table-size)
  				error_if_empty $arg $val
  				if test $"KERNEL_SUPPORT" = "yes"; then
-@@ -775,6 +912,16 @@
+@@ -818,6 +912,16 @@
  			exit 1
  		fi
  	fi
@@ -826,18 +600,10 @@
  }
  
  
-@@ -974,6 +1121,23 @@
+@@ -1025,6 +1129,15 @@
  		fi
  	fi
  
-+	if test -n "$ACTIVE_DOMAINS"; then
-+		if test "$KERNEL_SUPPORT" = "yes"; then
-+			echo $ACTIVE_DOMAINS >$MOUNT/active_domains
-+		else
-+			echo "active-domains not supported - ignored" >&2
-+		fi
-+	fi
-+
 +	if test -n "$PASSIVE_DOMAINS"; then
 +		if test "$KERNEL_SUPPORT" = "yes"; then
 +			echo $PASSIVE_DOMAINS >$MOUNT/passive_domains
@@ -850,28 +616,17 @@
  	if test $NOTE_SIZE != 0; then
  		set_param notesize $NOTE_SIZE
  	fi
-@@ -1066,8 +1230,10 @@
+@@ -1117,7 +1230,8 @@
   
  	do_setup
  	do_load_setup
 -	check_valid_args
--	get_kernel_range
 +	check_valid_vmlinux
 +	check_valid_xen
-+	get_image_range "linux"
-+	get_image_range "xen"
+ 	get_image_range "linux"
+ 	get_image_range "xen"
  	do_param_setup
- 
- 	OPD_ARGS=" \
-@@ -1084,10 +1250,18 @@
- 		OPD_ARGS="$OPD_ARGS --vmlinux=$VMLINUX --kernel-range=$KERNEL_RANGE"
- 	fi
- 
-+	if ! test "$XENIMAGE" = "none"; then
-+		OPD_ARGS="$OPD_ARGS --xen-image=$XENIMAGE --xen-range=$XEN_RANGE"
-+	fi
-+ 
- 	if ! test -z "$IMAGE_FILTER"; then
+@@ -1144,6 +1258,10 @@
  		OPD_ARGS="$OPD_ARGS --image=$IMAGE_FILTER"
  	fi
  
@@ -882,7 +637,7 @@
  	if test -n "$VERBOSE"; then
  		OPD_ARGS="$OPD_ARGS --verbose=$VERBOSE"
  	fi
-@@ -1294,6 +1468,8 @@
+@@ -1350,6 +1468,8 @@
  	move_and_remove $SAMPLES_DIR/current/{root}
  
  	hup_daemon
@@ -891,7 +646,7 @@
  }
  
  
-@@ -1324,7 +1500,8 @@
+@@ -1380,7 +1500,8 @@
  	fi
   
  	if test "$SETUP" = "yes"; then


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- oprofile.spec	24 Aug 2006 14:04:16 -0000	1.48
+++ oprofile.spec	22 Sep 2006 18:17:22 -0000	1.49
@@ -1,9 +1,9 @@
-%define DATE 20060710
-%define oprofile_version 0.9.1
+%define DATE 20060919
+%define oprofile_version 0.9.2
 Summary: System wide profiler
 Name: oprofile
-Version: 0.9.1
-Release: 16
+Version: 0.9.2
+Release: 2
 License: GPL
 Group: Development/System
 #
@@ -11,18 +11,10 @@
 Requires: binutils
 Requires: which
 Patch10: oprofile-0.4-guess2.patch
-#The following patch should go away when newer binutils/libbfd is used
-#Patch35: oprofile-0.4-separatedebug.patch
 Patch63: oprofile-0.7-libs.patch
-#Patch79: oprofile-0.8.1-power970.patch
-#Patch80: oprofile-0.8.2-ppc64dot.patch
-Patch81: oprofile-0.9.1-anon.patch
-Patch82: oprofile_opcontrol.patch
 Patch83: oprofile-0.9.1-xen.patch
-Patch84: oprofile-power5p.patch
-Patch86: oprofile-ppc64evts.patch
 Patch87: oprofile-power6.patch
-Patch88: oprofile-core.patch
+#Patch88: oprofile-core.patch
 
 URL: http://oprofile.sf.net
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
@@ -33,6 +25,7 @@
 BuildPreReq: elinks
 BuildPreReq: gtk2-devel
 BuildPreReq: automake
+BuildPreReq: binutils-devel
 
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -67,14 +60,9 @@
 %patch10 -p1 -b .guess2
 #%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
-#%patch80 -p1 -b .ppc64dot
-%patch81 -p1 -b .anon
-%patch82 -p1 -b .opcontrol
 %patch83 -p1 -b .xen
-%patch84 -p1 -b .power5p
-%patch86 -p1 -b .ppc64evts
 %patch87 -p1 -b .power6
-%patch88 -p0 -b .core
+#%patch88 -p0 -b .core
 
 ./autogen.sh
 
@@ -162,6 +150,7 @@
 %{_mandir}/man1/opreport.1.gz
 %{_mandir}/man1/oprofile.1.gz
 %{_mandir}/man1/oparchive.1.gz
+%{_mandir}/man1/opimport.1.gz
 
 /usr/share/oprofile/alpha/ev4/events
 /usr/share/oprofile/alpha/ev4/unit_masks
@@ -181,6 +170,8 @@
 /usr/share/oprofile/i386/athlon/unit_masks
 /usr/share/oprofile/i386/core/events
 /usr/share/oprofile/i386/core/unit_masks
+/usr/share/oprofile/i386/core_2/events
+/usr/share/oprofile/i386/core_2/unit_masks
 /usr/share/oprofile/i386/p4-ht/events
 /usr/share/oprofile/i386/p4-ht/unit_masks
 /usr/share/oprofile/i386/p4/events
@@ -219,6 +210,16 @@
 /usr/share/oprofile/ppc64/970/event_mappings
 /usr/share/oprofile/ppc64/970/events
 /usr/share/oprofile/ppc64/970/unit_masks
+/usr/share/oprofile/mips/20K/events
+/usr/share/oprofile/mips/20K/unit_masks
+/usr/share/oprofile/mips/24K/events
+/usr/share/oprofile/mips/24K/unit_masks
+/usr/share/oprofile/mips/25K/events
+/usr/share/oprofile/mips/25K/unit_masks
+/usr/share/oprofile/mips/34K/events
+/usr/share/oprofile/mips/34K/unit_masks
+/usr/share/oprofile/mips/5K/events
+/usr/share/oprofile/mips/5K/unit_masks
 /usr/share/oprofile/mips/r10000/events
 /usr/share/oprofile/mips/r10000/unit_masks
 /usr/share/oprofile/mips/r12000/events
@@ -233,10 +234,12 @@
 /usr/share/oprofile/mips/vr5432/unit_masks
 /usr/share/oprofile/mips/vr5500/events
 /usr/share/oprofile/mips/vr5500/unit_masks
+/usr/share/oprofile/ppc/7450/events
+/usr/share/oprofile/ppc/7450/unit_masks
 /usr/share/oprofile/ppc/e500/events
 /usr/share/oprofile/ppc/e500/unit_masks
-/usr/share/oprofile/mips/24K/events
-/usr/share/oprofile/mips/24K/unit_masks
+/usr/share/oprofile/ppc/e500v2/events
+/usr/share/oprofile/ppc/e500v2/unit_masks
 
 %files devel
 %defattr(-,root,root)
@@ -261,6 +264,9 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Wed Sep 18 2006 Will Cohen <wcohen at redhat.com> - 0.9.2-2
+- Rebase on 0.9.2 release.
+
 * Thu Aug 24 2006 Will Cohen <wcohen at redhat.com>
 - Update xenoprof patch.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Jul 2005 14:37:57 -0000	1.12
+++ sources	22 Sep 2006 18:17:22 -0000	1.13
@@ -1 +1 @@
-c25a05406e30e81a6afbd3264191fa37  oprofile-0.9.1.tar.gz
+9af4e1e1aab89131516736bb60e9efba  oprofile-0.9.2.tar.gz




More information about the fedora-cvs-commits mailing list