summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/oprofile
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-07-02 14:20:21 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-04 17:40:35 +0100
commitf47c151aea7ba32fa47d5a889e3f4ec619f9340f (patch)
tree96f4ff65ef409c2806aa755e19695549dedd1f34 /meta/recipes-kernel/oprofile
parent2933dc1f1732c1662c7fff9c50692b66c2eea720 (diff)
downloadpoky-f47c151aea7ba32fa47d5a889e3f4ec619f9340f.tar.gz
oprofile: Change /root to /home/root
OE uses /home/root instead of /root for the root user's directory. Update oprofile to match. Upstream-status: Inappropriate [OE Specific] (From OE-Core rev: d50c44585e72057532b8e0d9221ebf058e514672) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/oprofile')
-rw-r--r--meta/recipes-kernel/oprofile/oprofile.inc3
-rw-r--r--meta/recipes-kernel/oprofile/oprofile/oprofile-root.patch108
2 files changed, 110 insertions, 1 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
index 73a5a07d14..ac8ce10440 100644
--- a/meta/recipes-kernel/oprofile/oprofile.inc
+++ b/meta/recipes-kernel/oprofile/oprofile.inc
@@ -19,10 +19,11 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}"
19FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" 19FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
20FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" 20FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
21 21
22INC_PR = "r0" 22INC_PR = "r1"
23 23
24SRC_URI = "file://opstart.patch \ 24SRC_URI = "file://opstart.patch \
25 file://oprofile-no-query-modules.patch \ 25 file://oprofile-no-query-modules.patch \
26 file://oprofile-root.patch \
26 file://acinclude.m4" 27 file://acinclude.m4"
27 28
28inherit autotools 29inherit autotools
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..db63a8e8da
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofile/oprofile-root.patch
@@ -0,0 +1,108 @@
1Change hardcoded /root to /home/root
2
3Upstream-Status: inappropriate [OE specific]
4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6
7diff -ur oprofile-0.9.7.orig/doc/opcontrol.1.in oprofile-0.9.7/doc/opcontrol.1.in
8--- oprofile-0.9.7.orig/doc/opcontrol.1.in 2011-07-04 21:25:04.000000000 -0500
9+++ oprofile-0.9.7/doc/opcontrol.1.in 2012-07-02 14:02:16.358865420 -0500
10@@ -171,7 +171,7 @@
11
12 .SH FILES
13 .TP
14-.I /root/.oprofile/daemonrc
15+.I /home/root/.oprofile/daemonrc
16 Configuration file for opcontrol
17 .TP
18 .I /var/lib/oprofile/samples/
19diff -ur oprofile-0.9.7.orig/doc/oprofile.1 oprofile-0.9.7/doc/oprofile.1
20--- oprofile-0.9.7.orig/doc/oprofile.1 2011-08-12 10:23:27.000000000 -0500
21+++ oprofile-0.9.7/doc/oprofile.1 2012-07-02 14:02:29.295862358 -0500
22@@ -150,7 +150,7 @@
23 .I $HOME/.oprofile/
24 Configuration files
25 .TP
26-.I /root/.oprofile/daemonrc
27+.I /home/root/.oprofile/daemonrc
28 Configuration file for opcontrol
29 .TP
30 .I /opt/oprofile-0.9.7-rc3/share/oprofile/
31diff -ur oprofile-0.9.7.orig/doc/oprofile.1.in oprofile-0.9.7/doc/oprofile.1.in
32--- oprofile-0.9.7.orig/doc/oprofile.1.in 2011-07-04 21:25:04.000000000 -0500
33+++ oprofile-0.9.7/doc/oprofile.1.in 2012-07-02 14:01:35.812004623 -0500
34@@ -150,7 +150,7 @@
35 .I $HOME/.oprofile/
36 Configuration files
37 .TP
38-.I /root/.oprofile/daemonrc
39+.I /home/root/.oprofile/daemonrc
40 Configuration file for opcontrol
41 .TP
42 .I @prefix@/share/oprofile/
43diff -ur oprofile-0.9.7.orig/doc/oprofile.html oprofile-0.9.7/doc/oprofile.html
44--- oprofile-0.9.7.orig/doc/oprofile.html 2011-07-04 21:32:35.000000000 -0500
45+++ oprofile-0.9.7/doc/oprofile.html 2012-07-02 14:04:59.804018961 -0500
46@@ -1394,7 +1394,7 @@
47 <dd>
48 <p>
49 Followed by list arguments for profiling set up. List of arguments
50- saved in <code class="filename">/root/.oprofile/daemonrc</code>.
51+ saved in <code class="filename">/home/root/.oprofile/daemonrc</code>.
52 Giving this option is not necessary; you can just directly pass one
53 of the setup options, e.g. <span class="command"><strong>opcontrol --no-vmlinux</strong></span>.
54 </p>
55@@ -1430,7 +1430,7 @@
56 <dd>
57 <p>
58 Start data collection with either arguments provided by <code class="option">--setup</code>
59- or information saved in <code class="filename">/root/.oprofile/daemonrc</code>. Specifying
60+ or information saved in <code class="filename">/home/root/.oprofile/daemonrc</code>. Specifying
61 the addition <code class="option">--verbose</code> makes the daemon generate lots of debug data
62 whilst it is running.
63 </p>
64diff -ur oprofile-0.9.7.orig/doc/oprofile.xml oprofile-0.9.7/doc/oprofile.xml
65--- oprofile-0.9.7.orig/doc/oprofile.xml 2011-07-04 21:25:04.000000000 -0500
66+++ oprofile-0.9.7/doc/oprofile.xml 2012-07-02 14:02:03.543019283 -0500
67@@ -568,7 +568,7 @@
68 <term><option>--setup</option></term>
69 <listitem><para>
70 Followed by list arguments for profiling set up. List of arguments
71- saved in <filename>/root/.oprofile/daemonrc</filename>.
72+ saved in <filename>/home/root/.oprofile/daemonrc</filename>.
73 Giving this option is not necessary; you can just directly pass one
74 of the setup options, e.g. <command>opcontrol --no-vmlinux</command>.
75 </para></listitem>
76@@ -592,7 +592,7 @@
77 <term><option>--start</option></term>
78 <listitem><para>
79 Start data collection with either arguments provided by <option>--setup</option>
80- or information saved in <filename>/root/.oprofile/daemonrc</filename>. Specifying
81+ or information saved in <filename>/home/root/.oprofile/daemonrc</filename>. Specifying
82 the addition <option>--verbose</option> makes the daemon generate lots of debug data
83 whilst it is running.
84 </para></listitem>
85diff -ur oprofile-0.9.7.orig/gui/oprof_start_util.cpp oprofile-0.9.7/gui/oprof_start_util.cpp
86--- oprofile-0.9.7.orig/gui/oprof_start_util.cpp 2011-07-04 21:25:04.000000000 -0500
87+++ oprofile-0.9.7/gui/oprof_start_util.cpp 2012-07-02 13:55:21.041876096 -0500
88@@ -39,7 +39,7 @@
89 // return the ~ expansion suffixed with a '/'
90 string const get_config_dir()
91 {
92- return "/root";
93+ return "/home/root";
94 }
95
96 string daemon_pid;
97diff -ur oprofile-0.9.7.orig/utils/opcontrol oprofile-0.9.7/utils/opcontrol
98--- oprofile-0.9.7.orig/utils/opcontrol 2011-07-20 14:36:48.000000000 -0500
99+++ oprofile-0.9.7/utils/opcontrol 2012-07-02 13:55:06.232872688 -0500
100@@ -384,7 +384,7 @@
101 OPROFILED="$OPDIR/oprofiled"
102
103 # location for daemon setup information
104- SETUP_DIR="/root/.oprofile"
105+ SETUP_DIR="/home/root/.oprofile"
106 SETUP_FILE="$SETUP_DIR/daemonrc"
107 SEC_SETUP_FILE="$SETUP_DIR/daemonrc_new"
108
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-01 23:17:55 +0000