summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-07-18 15:50:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-20 15:27:38 +0100
commit08bfdf909a9d5843b63ceb3b2851d41541e69343 (patch)
tree8cee6b355d11f3c4699619c6aeb256f31da3a9d5 /meta/recipes-kernel
parent00463a3343f248c36ca46ae34ff6cd67a47337c0 (diff)
downloadpoky-08bfdf909a9d5843b63ceb3b2851d41541e69343.tar.gz
oprofile: Fix build when query_module is not there
on 2.6 kernels we do not have query_module so warn about it (From OE-Core rev: 3c6661680822246658ea47394ef1673fc068551c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch29
-rw-r--r--meta/recipes-kernel/oprofile/oprofile_0.9.6.bb3
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch b/meta/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch
new file mode 100644
index 0000000000..c9d7cd63e7
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch
@@ -0,0 +1,29 @@
1disable portions which use query_module on 2.6 kernel this is not available
2in OE we dont support 2.4 anyway
3
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Index: oprofile-0.9.6/daemon/liblegacy/opd_kernel.c
9===================================================================
10--- oprofile-0.9.6.orig/daemon/liblegacy/opd_kernel.c 2009-11-24 07:25:17.000000000 -0800
11+++ oprofile-0.9.6/daemon/liblegacy/opd_kernel.c 2011-07-18 10:08:39.863798825 -0700
12@@ -270,6 +270,9 @@
13 */
14 static void opd_drop_module_sample(unsigned long eip)
15 {
16+ verbprintf(vmodule, "query_module not available on linux-2.6: %s\n", strerror(EPERM));
17+
18+#if 0
19 char * module_names;
20 char * name;
21 size_t size = 1024;
22@@ -307,6 +310,7 @@
23
24 if (module_names)
25 free(module_names);
26+#endif
27 }
28
29
diff --git a/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb b/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
index 603500d428..0f154c8cec 100644
--- a/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
+++ b/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
@@ -19,10 +19,11 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*.so.* ${datadir}/${BPN}"
19FILES_${PN}-dev += "${libdir}/${BPN}/lib*.so ${libdir}/${BPN}/lib*.la" 19FILES_${PN}-dev += "${libdir}/${BPN}/lib*.so ${libdir}/${BPN}/lib*.la"
20FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" 20FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
21 21
22PR = "r1" 22PR = "r2"
23 23
24SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ 24SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
25 file://opstart.patch \ 25 file://opstart.patch \
26 file://oprofile-no-query-modules.patch \
26 file://acinclude.m4" 27 file://acinclude.m4"
27 28
28SRC_URI[md5sum] = "4e407093ac06200185d5a5e6437d7242" 29SRC_URI[md5sum] = "4e407093ac06200185d5a5e6437d7242"