summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-21 07:09:41 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-21 07:09:41 +0000
commit6e20da741b77f3e5c9b8a96e3101fcc4ab9cfee2 (patch)
tree358f20bb2914d10383dd81161184379de96bc50b
parent98186f1d474b5dcc2cd32d5b6d7194c2ec385b5d (diff)
Remove reference to query_modules in oprofile, does not exist in linux-2.6. oprofile now builds for ARM
-rw-r--r--package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch (renamed from package/oprofile/oprofile-0.9.4-avr32-enable-lookup_dcookie.patch)0
-rw-r--r--package/oprofile/oprofile-0.9.4-002-no-query-modules.patch21
-rw-r--r--package/oprofile/oprofile.mk10
3 files changed, 27 insertions, 4 deletions
diff --git a/package/oprofile/oprofile-0.9.4-avr32-enable-lookup_dcookie.patch b/package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch
index 7c4138946..7c4138946 100644
--- a/package/oprofile/oprofile-0.9.4-avr32-enable-lookup_dcookie.patch
+++ b/package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch
diff --git a/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch b/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch
new file mode 100644
index 000000000..9f00da641
--- /dev/null
+++ b/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch
@@ -0,0 +1,21 @@
+diff -urN oprofile-0.9.4-0rig//daemon/liblegacy/opd_kernel.c oprofile-0.9.4/daemon/liblegacy/opd_kernel.c
+--- oprofile-0.9.4-0rig//daemon/liblegacy/opd_kernel.c 2005-05-04 04:47:03.000000000 +0200
++++ oprofile-0.9.4/daemon/liblegacy/opd_kernel.c 2009-01-21 07:40:20.000000000 +0100
+@@ -270,6 +270,9 @@
+ */
+ static void opd_drop_module_sample(unsigned long eip)
+ {
++ verbprintf(vmodule, "query_module not available on linux-2.6: %s\n", strerror(EPERM));
++
++#if 0
+ char * module_names;
+ char * name;
+ size_t size = 1024;
+@@ -307,6 +310,7 @@
+
+ if (module_names)
+ free(module_names);
++#endif
+ }
+
+
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 066dbd2e7..ee6be3dc1 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -4,10 +4,11 @@
#
#############################################################
OPROFILE_VERSION := 0.9.4
-OPROFILE_CONF_OPT := --localstatedir=/var \
- --with-extra-includes="$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd -I$(TOOL_BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)/include" \
- --with-extra-libs=$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
- --with-kernel-support
+OPROFILE_CONF_OPT := --localstatedir=/var \
+ --with-extra-includes="$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
+ -I$(TOOL_BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)/include" \
+ --with-extra-libs=$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
+ --with-kernel-support
OPROFILE_BINARIES := utils/ophelp
OPROFILE_BINARIES += pp/opannotate pp/oparchive pp/opgprof pp/opreport opjitconv/opjitconv
@@ -43,3 +44,4 @@ $(OPROFILE_TARGET_CLEAN):
rm -rf $(TARGET_DIR)/usr/share/oprofile
-$(MAKE) -C $(OPROFILE_DIR) clean
touch $@
+