diff options
Diffstat (limited to 'meta/recipes-kernel/oprofile/oprofile/oprofile-root.patch')
-rw-r--r-- | meta/recipes-kernel/oprofile/oprofile/oprofile-root.patch | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofile/oprofile-root.patch b/meta/recipes-kernel/oprofile/oprofile/oprofile-root.patch new file mode 100644 index 0000000000..f3fe4c9cb3 --- /dev/null +++ b/meta/recipes-kernel/oprofile/oprofile/oprofile-root.patch | |||
@@ -0,0 +1,113 @@ | |||
1 | Change hardcoded /root to /home/root | ||
2 | |||
3 | Upstream-Status: inappropriate [OE specific] | ||
4 | |||
5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
6 | |||
7 | Replace "/home/root" with stub "ROOTHOME", then substitute it with | ||
8 | real root home directory which is configured dymanically. | ||
9 | |||
10 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | ||
11 | |||
12 | diff -ur oprofile-0.9.7.orig/doc/opcontrol.1.in oprofile-0.9.7/doc/opcontrol.1.in | ||
13 | --- oprofile-0.9.7.orig/doc/opcontrol.1.in 2011-07-04 21:25:04.000000000 -0500 | ||
14 | +++ oprofile-0.9.7/doc/opcontrol.1.in 2012-07-02 14:02:16.358865420 -0500 | ||
15 | @@ -171,7 +171,7 @@ | ||
16 | |||
17 | .SH FILES | ||
18 | .TP | ||
19 | -.I /root/.oprofile/daemonrc | ||
20 | +.I ROOTHOME/.oprofile/daemonrc | ||
21 | Configuration file for opcontrol | ||
22 | .TP | ||
23 | .I /var/lib/oprofile/samples/ | ||
24 | diff -ur oprofile-0.9.7.orig/doc/oprofile.1 oprofile-0.9.7/doc/oprofile.1 | ||
25 | --- oprofile-0.9.7.orig/doc/oprofile.1 2011-08-12 10:23:27.000000000 -0500 | ||
26 | +++ oprofile-0.9.7/doc/oprofile.1 2012-07-02 14:02:29.295862358 -0500 | ||
27 | @@ -150,7 +150,7 @@ | ||
28 | .I $HOME/.oprofile/ | ||
29 | Configuration files | ||
30 | .TP | ||
31 | -.I /root/.oprofile/daemonrc | ||
32 | +.I ROOTHOME/.oprofile/daemonrc | ||
33 | Configuration file for opcontrol | ||
34 | .TP | ||
35 | .I /opt/oprofile-0.9.7-rc3/share/oprofile/ | ||
36 | diff -ur oprofile-0.9.7.orig/doc/oprofile.1.in oprofile-0.9.7/doc/oprofile.1.in | ||
37 | --- oprofile-0.9.7.orig/doc/oprofile.1.in 2011-07-04 21:25:04.000000000 -0500 | ||
38 | +++ oprofile-0.9.7/doc/oprofile.1.in 2012-07-02 14:01:35.812004623 -0500 | ||
39 | @@ -150,7 +150,7 @@ | ||
40 | .I $HOME/.oprofile/ | ||
41 | Configuration files | ||
42 | .TP | ||
43 | -.I /root/.oprofile/daemonrc | ||
44 | +.I ROOTHOME/.oprofile/daemonrc | ||
45 | Configuration file for opcontrol | ||
46 | .TP | ||
47 | .I @prefix@/share/oprofile/ | ||
48 | diff -ur oprofile-0.9.7.orig/doc/oprofile.html oprofile-0.9.7/doc/oprofile.html | ||
49 | --- oprofile-0.9.7.orig/doc/oprofile.html 2011-07-04 21:32:35.000000000 -0500 | ||
50 | +++ oprofile-0.9.7/doc/oprofile.html 2012-07-02 14:04:59.804018961 -0500 | ||
51 | @@ -1394,7 +1394,7 @@ | ||
52 | <dd> | ||
53 | <p> | ||
54 | Followed by list arguments for profiling set up. List of arguments | ||
55 | - saved in <code class="filename">/root/.oprofile/daemonrc</code>. | ||
56 | + saved in <code class="filename">ROOTHOME/.oprofile/daemonrc</code>. | ||
57 | Giving this option is not necessary; you can just directly pass one | ||
58 | of the setup options, e.g. <span class="command"><strong>opcontrol --no-vmlinux</strong></span>. | ||
59 | </p> | ||
60 | @@ -1430,7 +1430,7 @@ | ||
61 | <dd> | ||
62 | <p> | ||
63 | Start data collection with either arguments provided by <code class="option">--setup</code> | ||
64 | - or information saved in <code class="filename">/root/.oprofile/daemonrc</code>. Specifying | ||
65 | + or information saved in <code class="filename">ROOTHOME/.oprofile/daemonrc</code>. Specifying | ||
66 | the addition <code class="option">--verbose</code> makes the daemon generate lots of debug data | ||
67 | whilst it is running. | ||
68 | </p> | ||
69 | diff -ur oprofile-0.9.7.orig/doc/oprofile.xml oprofile-0.9.7/doc/oprofile.xml | ||
70 | --- oprofile-0.9.7.orig/doc/oprofile.xml 2011-07-04 21:25:04.000000000 -0500 | ||
71 | +++ oprofile-0.9.7/doc/oprofile.xml 2012-07-02 14:02:03.543019283 -0500 | ||
72 | @@ -568,7 +568,7 @@ | ||
73 | <term><option>--setup</option></term> | ||
74 | <listitem><para> | ||
75 | Followed by list arguments for profiling set up. List of arguments | ||
76 | - saved in <filename>/root/.oprofile/daemonrc</filename>. | ||
77 | + saved in <filename>ROOTHOME/.oprofile/daemonrc</filename>. | ||
78 | Giving this option is not necessary; you can just directly pass one | ||
79 | of the setup options, e.g. <command>opcontrol --no-vmlinux</command>. | ||
80 | </para></listitem> | ||
81 | @@ -592,7 +592,7 @@ | ||
82 | <term><option>--start</option></term> | ||
83 | <listitem><para> | ||
84 | Start data collection with either arguments provided by <option>--setup</option> | ||
85 | - or information saved in <filename>/root/.oprofile/daemonrc</filename>. Specifying | ||
86 | + or information saved in <filename>ROOTHOME/.oprofile/daemonrc</filename>. Specifying | ||
87 | the addition <option>--verbose</option> makes the daemon generate lots of debug data | ||
88 | whilst it is running. | ||
89 | </para></listitem> | ||
90 | diff -ur oprofile-0.9.7.orig/gui/oprof_start_util.cpp oprofile-0.9.7/gui/oprof_start_util.cpp | ||
91 | --- oprofile-0.9.7.orig/gui/oprof_start_util.cpp 2011-07-04 21:25:04.000000000 -0500 | ||
92 | +++ oprofile-0.9.7/gui/oprof_start_util.cpp 2012-07-02 13:55:21.041876096 -0500 | ||
93 | @@ -39,7 +39,7 @@ | ||
94 | // return the ~ expansion suffixed with a '/' | ||
95 | string const get_config_dir() | ||
96 | { | ||
97 | - return "/root"; | ||
98 | + return "ROOTHOME"; | ||
99 | } | ||
100 | |||
101 | string daemon_pid; | ||
102 | diff -ur oprofile-0.9.7.orig/utils/opcontrol oprofile-0.9.7/utils/opcontrol | ||
103 | --- oprofile-0.9.7.orig/utils/opcontrol 2011-07-20 14:36:48.000000000 -0500 | ||
104 | +++ oprofile-0.9.7/utils/opcontrol 2012-07-02 13:55:06.232872688 -0500 | ||
105 | @@ -384,7 +384,7 @@ | ||
106 | OPROFILED="$OPDIR/oprofiled" | ||
107 | |||
108 | # location for daemon setup information | ||
109 | - SETUP_DIR="/root/.oprofile" | ||
110 | + SETUP_DIR="ROOTHOME/.oprofile" | ||
111 | SETUP_FILE="$SETUP_DIR/daemonrc" | ||
112 | SEC_SETUP_FILE="$SETUP_DIR/daemonrc_new" | ||
113 | |||