summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-08-30 16:49:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-08 23:47:14 (GMT)
commit8a12e713f9306ae45fa27cbc1127849d03101811 (patch)
tree4e5d71b710a434c0f9b6496c430b40e3843c6972
parent2b0f105e59f8044264cfab38d6f1f8b9d653414c (diff)
downloadpoky-8a12e713f9306ae45fa27cbc1127849d03101811.tar.gz
perf: adapt to Makefile.config
commit 4842576cd857 [perf tools: Move config/Makefile into Makefile.config] relocated the configuration Makefile of perf. As such, we need to adapt our fixup routines to work with the Makefile no matter where it is. (From OE-Core rev: 573d584ff704025387782e35ed344e73294d6d0a) (From OE-Core rev: 857f0190d334abc6e338938d6b1db1664d5c6987) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/perf/perf.bb9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index dc22481..ecee545 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -136,11 +136,17 @@ do_configure_prepend () {
136 # with each other if its in the shared source directory 136 # with each other if its in the shared source directory
137 # 137 #
138 if [ -e "${S}/tools/perf/config/Makefile" ]; then 138 if [ -e "${S}/tools/perf/config/Makefile" ]; then
139 perfconfig="${S}/tools/perf/config/Makefile"
140 fi
141 if [ -e "${S}/tools/perf/Makefile.config" ]; then
142 perfconfig="${S}/tools/perf/Makefile.config"
143 fi
144 if [ -n "${perfconfig}" ]; then
139 # Match $(prefix)/$(lib) and $(prefix)/lib 145 # Match $(prefix)/$(lib) and $(prefix)/lib
140 sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ 146 sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \
141 -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ 147 -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \
142 -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ 148 -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
143 ${S}/tools/perf/config/Makefile 149 ${perfconfig}
144 fi 150 fi
145 if [ -e "${S}/tools/perf/Makefile.perf" ]; then 151 if [ -e "${S}/tools/perf/Makefile.perf" ]; then
146 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ 152 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
@@ -211,6 +217,7 @@ RDEPENDS_${PN}-tests =+ "python"
211RSUGGESTS_SCRIPTING = "${@perf_feature_enabled('perf-scripting', '${PN}-perl ${PN}-python', '',d)}" 217RSUGGESTS_SCRIPTING = "${@perf_feature_enabled('perf-scripting', '${PN}-perl ${PN}-python', '',d)}"
212RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" 218RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
213 219
220#FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core /usr/lib64/traceevent ${libdir}/traceevent"
214FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent" 221FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent"
215FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive" 222FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
216FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" 223FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests"