summaryrefslogtreecommitdiffstats
path: root/meta/packages/oprofile/oprofile/oparchive-debug-dir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/oprofile/oprofile/oparchive-debug-dir.patch')
-rw-r--r--meta/packages/oprofile/oprofile/oparchive-debug-dir.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/packages/oprofile/oprofile/oparchive-debug-dir.patch b/meta/packages/oprofile/oprofile/oparchive-debug-dir.patch
deleted file mode 100644
index ab925c9048..0000000000
--- a/meta/packages/oprofile/oprofile/oparchive-debug-dir.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Index: oprofile/pp/oparchive.cpp
2===================================================================
3--- oprofile.orig/pp/oparchive.cpp
4+++ oprofile/pp/oparchive.cpp
5@@ -84,9 +84,10 @@ int oparchive(options::spec const & spec
6 exe_archive_file);
7
8 /* If there are any debuginfo files, copy them over.
9- * Need to copy the debug info file in the same
10- * directory as the executable. The /usr/lib/debug
11- * search path is not going to work.
12+ * Need to copy the debug info file to somewhere we'll
13+ * find it - executable location + "/.debug"
14+ * to avoid overwriting files with the same name. The
15+ * /usr/lib/debug search path is not going to work.
16 */
17 bfd * ibfd = open_bfd(exe_name);
18 if (ibfd) {
19@@ -97,8 +98,15 @@ int oparchive(options::spec const & spec
20 if (find_separate_debug_file(ibfd, dirname, global,
21 debug_filename)) {
22 /* found something copy it over */
23- string dest_debug = options::outdirectory +
24- dirname + "/" +
25+ string dest_debug_dir = options::outdirectory +
26+ dirname + "/.debug/";
27+ if (create_dir(dest_debug_dir.c_str())) {
28+ cerr << "Unable to create directory: "
29+ << dest_debug_dir << "." << endl;
30+ exit (EXIT_FAILURE);
31+ }
32+
33+ string dest_debug = dest_debug_dir +
34 op_basename(debug_filename);
35 copy_one_file(image_ok, debug_filename, dest_debug);
36 }
37Index: oprofile/ChangeLog
38===================================================================
39--- oprofile.orig/ChangeLog
40+++ oprofile/ChangeLog
41@@ -1,5 +1,11 @@
42 2007-05-09 Richard Purdie <rpurdie@openedhand.com>
43
44+ * oprofile/pp/oparchive.cpp: If the debug files have the same name
45+ as the original binary, the binary gets overwritten. Add in a .debug
46+ directory to avoid this.
47+
48+2007-05-09 Richard Purdie <rpurdie@openedhand.com>
49+
50 * oprofile/daemon/opd_cookie.c: Fix syscall for ARM EABI
51
52 2007-04-25 Manoj Ekbote <manoj.ekbote@broadcom.com>