summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2013-01-04 17:29:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 14:30:50 +0000
commitc7041c713f7efa367891e5707c358fa16b5ce119 (patch)
treecd02d90aca94629574621b1900f8160ded85e306
parent5648fec625d69c4c4a8da12dfd599fb118d15360 (diff)
downloadpoky-c7041c713f7efa367891e5707c358fa16b5ce119.tar.gz
oprofile: updated to 0.9.8
(From OE-Core rev: e8150e3941a471bf7e6d375595c15d54b809b15c) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/oprofile/oprofile.inc3
-rw-r--r--meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch66
-rw-r--r--meta/recipes-kernel/oprofile/oprofile/opstart.patch29
-rw-r--r--meta/recipes-kernel/oprofile/oprofile_0.9.7.bb11
-rw-r--r--meta/recipes-kernel/oprofile/oprofile_0.9.8.bb11
5 files changed, 27 insertions, 93 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
index 23ddb14f38..9bbd2efbc8 100644
--- a/meta/recipes-kernel/oprofile/oprofile.inc
+++ b/meta/recipes-kernel/oprofile/oprofile.inc
@@ -19,12 +19,11 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}"
19FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" 19FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
20FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" 20FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
21 21
22INC_PR = "r2" 22INC_PR = "r0"
23 23
24SRC_URI = "file://opstart.patch \ 24SRC_URI = "file://opstart.patch \
25 file://oprofile-no-query-modules.patch \ 25 file://oprofile-no-query-modules.patch \
26 file://oprofile-root.patch \ 26 file://oprofile-root.patch \
27 file://fix-bfd-include.patch \
28 file://acinclude.m4" 27 file://acinclude.m4"
29 28
30inherit autotools 29inherit autotools
diff --git a/meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch b/meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch
deleted file mode 100644
index 944320f896..0000000000
--- a/meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1bfd.h now wants to include autotools generated config.h for reasoning read
2http://sourceware.org/bugzilla/show_bug.cgi?id=14243
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Upstream-Status: Pending
7Index: oprofile-0.9.7/libutil++/bfd_support.h
8===================================================================
9--- oprofile-0.9.7.orig/libutil++/bfd_support.h 2011-07-04 19:25:04.000000000 -0700
10+++ oprofile-0.9.7/libutil++/bfd_support.h 2012-12-02 10:51:23.518784249 -0800
11@@ -11,6 +11,7 @@
12 #ifndef BFD_SUPPORT_H
13 #define BFD_SUPPORT_H
14
15+#include "config.h"
16 #include "utility.h"
17 #include "op_types.h"
18 #include "locate_images.h"
19Index: oprofile-0.9.7/libopagent/opagent.c
20===================================================================
21--- oprofile-0.9.7.orig/libopagent/opagent.c 2011-07-04 19:25:04.000000000 -0700
22+++ oprofile-0.9.7/libopagent/opagent.c 2012-12-02 10:58:10.954804150 -0800
23@@ -50,6 +50,7 @@
24 * See libopagent/Makefile.am for more information.
25 *******************************************************************/
26
27+#include "config.h"
28 #include <stdio.h>
29 #include <errno.h>
30 #include <string.h>
31Index: oprofile-0.9.7/libpp/symbol.h
32===================================================================
33--- oprofile-0.9.7.orig/libpp/symbol.h 2011-07-04 19:25:04.000000000 -0700
34+++ oprofile-0.9.7/libpp/symbol.h 2012-12-02 10:59:59.434809273 -0800
35@@ -18,6 +18,7 @@
36 #include "format_flags.h"
37 #include "op_types.h"
38
39+#include "config.h"
40 #include <bfd.h>
41 #include <stdint.h>
42
43Index: oprofile-0.9.7/opjitconv/debug_line.c
44===================================================================
45--- oprofile-0.9.7.orig/opjitconv/debug_line.c 2011-07-04 19:25:04.000000000 -0700
46+++ oprofile-0.9.7/opjitconv/debug_line.c 2012-12-02 11:02:26.046816339 -0800
47@@ -8,6 +8,7 @@
48 * @author Philippe Elie
49 */
50
51+#include "config.h"
52 #include <stdint.h>
53 #include <stdlib.h>
54 #include <string.h>
55Index: oprofile-0.9.7/opjitconv/opjitconv.h
56===================================================================
57--- oprofile-0.9.7.orig/opjitconv/opjitconv.h 2011-07-04 19:25:04.000000000 -0700
58+++ oprofile-0.9.7/opjitconv/opjitconv.h 2012-12-02 11:01:25.558813373 -0800
59@@ -26,6 +26,7 @@
60 #define OP_JIT_CONV_ALREADY_DONE 5
61 #define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6
62
63+#include "config.h"
64 #include <bfd.h>
65 #include <stddef.h>
66 #include <sys/stat.h>
diff --git a/meta/recipes-kernel/oprofile/oprofile/opstart.patch b/meta/recipes-kernel/oprofile/oprofile/opstart.patch
index c588deb337..0b181b1048 100644
--- a/meta/recipes-kernel/oprofile/oprofile/opstart.patch
+++ b/meta/recipes-kernel/oprofile/oprofile/opstart.patch
@@ -1,17 +1,18 @@
1Upstream-Status: Pending 1diff --git a/utils/Makefile.am b/utils/Makefile.am
2 2index d34b060..dff15f9 100644
3Index: oprofile/utils/Makefile.am 3--- oprofile.orig/utils/Makefile.am
4=================================================================== 4+++ oprofile/utils/Makefile.am
5--- oprofile.orig/utils/Makefile.am 2005-03-31 18:20:41.000000000 +0100 5@@ -7,7 +7,7 @@ AM_LDFLAGS = @OP_LDFLAGS@
6+++ oprofile/utils/Makefile.am 2008-07-02 15:14:07.000000000 +0100
7@@ -3,8 +3,15 @@
8 6
9 LIBS=@POPT_LIBS@ @LIBERTY_LIBS@ 7 LIBS=@POPT_LIBS@ @LIBERTY_LIBS@
10 8
11-bin_PROGRAMS = ophelp 9-bin_PROGRAMS = ophelp op-check-perfevents
12+bin_PROGRAMS = ophelp opstart 10+bin_PROGRAMS = ophelp op-check-perfevents opstart
13 dist_bin_SCRIPTS = opcontrol 11 dist_bin_SCRIPTS = opcontrol
14 12
13 op_check_perfevents_SOURCES = op_perf_events_checker.c
14@@ -15,3 +15,10 @@ op_check_perfevents_CPPFLAGS = ${AM_CFLAGS} @PERF_EVENT_FLAGS@
15
15 ophelp_SOURCES = ophelp.c 16 ophelp_SOURCES = ophelp.c
16 ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a 17 ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
17+ 18+
@@ -19,8 +20,8 @@ Index: oprofile/utils/Makefile.am
19+ 20+
20+install-exec-local: 21+install-exec-local:
21+ cd $(DESTDIR)/$(bindir) && \ 22+ cd $(DESTDIR)/$(bindir) && \
22+ rm -f opstop && \ 23+ rm -f opstop && \
23+ $(LN_S) opstart opstop 24+ $(LN_S) opstart opstop
24Index: oprofile/utils/opstart.c 25Index: oprofile/utils/opstart.c
25=================================================================== 26===================================================================
26--- /dev/null 1970-01-01 00:00:00.000000000 +0000 27--- /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -136,10 +137,10 @@ Index: oprofile/utils/opstart.c
136+ return 0; 137+ return 0;
137+} 138+}
138+ 139+
139Index: oprofile/configure.in 140Index: oprofile/configure.ac
140=================================================================== 141===================================================================
141--- oprofile.orig/configure.in 2008-07-02 15:13:58.000000000 +0100 142--- oprofile.orig/configure.ac 2008-07-02 15:13:58.000000000 +0100
142+++ oprofile/configure.in 2008-07-02 15:17:37.000000000 +0100 143+++ oprofile/configure.ac 2008-07-02 15:17:37.000000000 +0100
143@@ -16,6 +16,7 @@ 144@@ -16,6 +16,7 @@
144 AM_CONFIG_HEADER(config.h) 145 AM_CONFIG_HEADER(config.h)
145 146
diff --git a/meta/recipes-kernel/oprofile/oprofile_0.9.7.bb b/meta/recipes-kernel/oprofile/oprofile_0.9.7.bb
deleted file mode 100644
index d7e151134c..0000000000
--- a/meta/recipes-kernel/oprofile/oprofile_0.9.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require oprofile.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
6
7SRC_URI[md5sum] = "8b5d1d9b65f84420bcc3234777ad3be3"
8SRC_URI[sha256sum] = "cb5b507d5dea058d223fcad3cec8ff9638a4163106afd66d176798bbd973d527"
9
10S = "${WORKDIR}/oprofile-${PV}"
11
diff --git a/meta/recipes-kernel/oprofile/oprofile_0.9.8.bb b/meta/recipes-kernel/oprofile/oprofile_0.9.8.bb
new file mode 100644
index 0000000000..939c1bab85
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofile_0.9.8.bb
@@ -0,0 +1,11 @@
1require oprofile.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
6
7SRC_URI[md5sum] = "6d127023af1dd1cf24e15411229f3cc8"
8SRC_URI[sha256sum] = "ab45900fa1a23e5d5badf3c0a55f26c17efe6e184efcf00b371433751fa761bc"
9
10S = "${WORKDIR}/oprofile-${PV}"
11