114 lines
4.7 KiB
Diff
114 lines
4.7 KiB
Diff
Change hardcoded /root to /home/root
|
|
|
|
Upstream-Status: inappropriate [OE specific]
|
|
|
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
|
|
|
Replace "/home/root" with stub "ROOTHOME", then substitute it with
|
|
real root home directory which is configured dymanically.
|
|
|
|
Signed-off-by: Kang Kai <kai.kang@windriver.com>
|
|
|
|
diff -ur oprofile-0.9.7.orig/doc/opcontrol.1.in oprofile-0.9.7/doc/opcontrol.1.in
|
|
--- oprofile-0.9.7.orig/doc/opcontrol.1.in 2011-07-04 21:25:04.000000000 -0500
|
|
+++ oprofile-0.9.7/doc/opcontrol.1.in 2012-07-02 14:02:16.358865420 -0500
|
|
@@ -171,7 +171,7 @@
|
|
|
|
.SH FILES
|
|
.TP
|
|
-.I /root/.oprofile/daemonrc
|
|
+.I ROOTHOME/.oprofile/daemonrc
|
|
Configuration file for opcontrol
|
|
.TP
|
|
.I /var/lib/oprofile/samples/
|
|
diff -ur oprofile-0.9.7.orig/doc/oprofile.1 oprofile-0.9.7/doc/oprofile.1
|
|
--- oprofile-0.9.7.orig/doc/oprofile.1 2011-08-12 10:23:27.000000000 -0500
|
|
+++ oprofile-0.9.7/doc/oprofile.1 2012-07-02 14:02:29.295862358 -0500
|
|
@@ -150,7 +150,7 @@
|
|
.I $HOME/.oprofile/
|
|
Configuration files
|
|
.TP
|
|
-.I /root/.oprofile/daemonrc
|
|
+.I ROOTHOME/.oprofile/daemonrc
|
|
Configuration file for opcontrol
|
|
.TP
|
|
.I /opt/oprofile-0.9.7-rc3/share/oprofile/
|
|
diff -ur oprofile-0.9.7.orig/doc/oprofile.1.in oprofile-0.9.7/doc/oprofile.1.in
|
|
--- oprofile-0.9.7.orig/doc/oprofile.1.in 2011-07-04 21:25:04.000000000 -0500
|
|
+++ oprofile-0.9.7/doc/oprofile.1.in 2012-07-02 14:01:35.812004623 -0500
|
|
@@ -150,7 +150,7 @@
|
|
.I $HOME/.oprofile/
|
|
Configuration files
|
|
.TP
|
|
-.I /root/.oprofile/daemonrc
|
|
+.I ROOTHOME/.oprofile/daemonrc
|
|
Configuration file for opcontrol
|
|
.TP
|
|
.I @prefix@/share/oprofile/
|
|
diff -ur oprofile-0.9.7.orig/doc/oprofile.html oprofile-0.9.7/doc/oprofile.html
|
|
--- oprofile-0.9.7.orig/doc/oprofile.html 2011-07-04 21:32:35.000000000 -0500
|
|
+++ oprofile-0.9.7/doc/oprofile.html 2012-07-02 14:04:59.804018961 -0500
|
|
@@ -1394,7 +1394,7 @@
|
|
<dd>
|
|
<p>
|
|
Followed by list arguments for profiling set up. List of arguments
|
|
- saved in <code class="filename">/root/.oprofile/daemonrc</code>.
|
|
+ saved in <code class="filename">ROOTHOME/.oprofile/daemonrc</code>.
|
|
Giving this option is not necessary; you can just directly pass one
|
|
of the setup options, e.g. <span class="command"><strong>opcontrol --no-vmlinux</strong></span>.
|
|
</p>
|
|
@@ -1430,7 +1430,7 @@
|
|
<dd>
|
|
<p>
|
|
Start data collection with either arguments provided by <code class="option">--setup</code>
|
|
- or information saved in <code class="filename">/root/.oprofile/daemonrc</code>. Specifying
|
|
+ or information saved in <code class="filename">ROOTHOME/.oprofile/daemonrc</code>. Specifying
|
|
the addition <code class="option">--verbose</code> makes the daemon generate lots of debug data
|
|
whilst it is running.
|
|
</p>
|
|
diff -ur oprofile-0.9.7.orig/doc/oprofile.xml oprofile-0.9.7/doc/oprofile.xml
|
|
--- oprofile-0.9.7.orig/doc/oprofile.xml 2011-07-04 21:25:04.000000000 -0500
|
|
+++ oprofile-0.9.7/doc/oprofile.xml 2012-07-02 14:02:03.543019283 -0500
|
|
@@ -568,7 +568,7 @@
|
|
<term><option>--setup</option></term>
|
|
<listitem><para>
|
|
Followed by list arguments for profiling set up. List of arguments
|
|
- saved in <filename>/root/.oprofile/daemonrc</filename>.
|
|
+ saved in <filename>ROOTHOME/.oprofile/daemonrc</filename>.
|
|
Giving this option is not necessary; you can just directly pass one
|
|
of the setup options, e.g. <command>opcontrol --no-vmlinux</command>.
|
|
</para></listitem>
|
|
@@ -592,7 +592,7 @@
|
|
<term><option>--start</option></term>
|
|
<listitem><para>
|
|
Start data collection with either arguments provided by <option>--setup</option>
|
|
- or information saved in <filename>/root/.oprofile/daemonrc</filename>. Specifying
|
|
+ or information saved in <filename>ROOTHOME/.oprofile/daemonrc</filename>. Specifying
|
|
the addition <option>--verbose</option> makes the daemon generate lots of debug data
|
|
whilst it is running.
|
|
</para></listitem>
|
|
diff -ur oprofile-0.9.7.orig/gui/oprof_start_util.cpp oprofile-0.9.7/gui/oprof_start_util.cpp
|
|
--- oprofile-0.9.7.orig/gui/oprof_start_util.cpp 2011-07-04 21:25:04.000000000 -0500
|
|
+++ oprofile-0.9.7/gui/oprof_start_util.cpp 2012-07-02 13:55:21.041876096 -0500
|
|
@@ -39,7 +39,7 @@
|
|
// return the ~ expansion suffixed with a '/'
|
|
string const get_config_dir()
|
|
{
|
|
- return "/root";
|
|
+ return "ROOTHOME";
|
|
}
|
|
|
|
string daemon_pid;
|
|
diff -ur oprofile-0.9.7.orig/utils/opcontrol oprofile-0.9.7/utils/opcontrol
|
|
--- oprofile-0.9.7.orig/utils/opcontrol 2011-07-20 14:36:48.000000000 -0500
|
|
+++ oprofile-0.9.7/utils/opcontrol 2012-07-02 13:55:06.232872688 -0500
|
|
@@ -384,7 +384,7 @@
|
|
OPROFILED="$OPDIR/oprofiled"
|
|
|
|
# location for daemon setup information
|
|
- SETUP_DIR="/root/.oprofile"
|
|
+ SETUP_DIR="ROOTHOME/.oprofile"
|
|
SETUP_FILE="$SETUP_DIR/daemonrc"
|
|
SEC_SETUP_FILE="$SETUP_DIR/daemonrc_new"
|
|
|