Change hardcoded /root to /home/root Upstream-Status: inappropriate [OE specific] Signed-off-by: Mark Hatle Replace "/home/root" with stub "ROOTHOME", then substitute it with real root home directory which is configured dymanically. Signed-off-by: Kang Kai 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 @@

Followed by list arguments for profiling set up. List of arguments - saved in /root/.oprofile/daemonrc. + saved in ROOTHOME/.oprofile/daemonrc. Giving this option is not necessary; you can just directly pass one of the setup options, e.g. opcontrol --no-vmlinux.

@@ -1430,7 +1430,7 @@

Start data collection with either arguments provided by --setup - or information saved in /root/.oprofile/daemonrc. Specifying + or information saved in ROOTHOME/.oprofile/daemonrc. Specifying the addition --verbose makes the daemon generate lots of debug data whilst it is running.

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 @@ Followed by list arguments for profiling set up. List of arguments - saved in /root/.oprofile/daemonrc. + saved in ROOTHOME/.oprofile/daemonrc. Giving this option is not necessary; you can just directly pass one of the setup options, e.g. opcontrol --no-vmlinux. @@ -592,7 +592,7 @@ Start data collection with either arguments provided by - or information saved in /root/.oprofile/daemonrc. Specifying + or information saved in ROOTHOME/.oprofile/daemonrc. Specifying the addition makes the daemon generate lots of debug data whilst it is running. 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"