diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-08-30 12:49:00 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-05 11:55:49 +0100 |
| commit | 573d584ff704025387782e35ed344e73294d6d0a (patch) | |
| tree | 453461c32da0307aa07110bf2eda3c2f8f3fd493 /meta/recipes-kernel/perf | |
| parent | 3585c71dc575dd28a1e2655efc967dd4d6086a37 (diff) | |
| download | openembedded-core-contrib-573d584ff704025387782e35ed344e73294d6d0a.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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/perf')
| -rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index d4855488aeb..88e3a0a78cd 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -133,11 +133,17 @@ do_configure_prepend () { # with each other if its in the shared source directory # if [ -e "${S}/tools/perf/config/Makefile" ]; then + perfconfig="${S}/tools/perf/config/Makefile" + fi + if [ -e "${S}/tools/perf/Makefile.config" ]; then + perfconfig="${S}/tools/perf/Makefile.config" + fi + if [ -n "${perfconfig}" ]; then # Match $(prefix)/$(lib) and $(prefix)/lib sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ - ${S}/tools/perf/config/Makefile + ${perfconfig} fi # The man pages installation is "$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)" # in ${S}/tools/perf/Documentation/Makefile, if the mandir set to '?=', it @@ -214,6 +220,7 @@ RDEPENDS_${PN}-tests =+ "python" RSUGGESTS_SCRIPTING = "${@perf_feature_enabled('perf-scripting', '${PN}-perl ${PN}-python', '',d)}" RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" +#FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core /usr/lib64/traceevent ${libdir}/traceevent" FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent" FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive" FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" |