summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2019-01-15 06:55:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-16 08:19:34 +0000
commitd38dfb48cd2344eeff83c67e2f50d35c15322a3d (patch)
treea9e2f1f7d8c605fe646b15eb0acad10eeb0bb227 /meta
parente1e38c9bd16220f78068299cd90692d96d045bf9 (diff)
downloadpoky-d38dfb48cd2344eeff83c67e2f50d35c15322a3d.tar.gz
perf: Package libperf-jvmti.so as part of ${PN}
perf's jvmti support builds libperf-jvmti.so that needs to be packaged as part of the main package, not a developer package. Given there's no files in the developer package, override FILES_SOLIBSDEV so it's not gobbled by FILES_${PN}-dev, and then add just that file to FILES_${PN} so that if in the future there other files which would be added to the dev package we'll fail then. (From OE-Core rev: 284763fcf188a497f15a1c69a50ceeee99d546f8) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/perf/perf.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index bae4948751..515a78b859 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -254,7 +254,8 @@ RDEPENDS_${PN}-tests =+ "python"
254RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}-perl ${PN}-python', '',d)}" 254RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}-perl ${PN}-python', '',d)}"
255RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" 255RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
256 256
257FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent" 257FILES_SOLIBSDEV = ""
258FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent ${libdir}/libperf-jvmti.so"
258FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive" 259FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
259FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" 260FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests"
260FILES_${PN}-python = " \ 261FILES_${PN}-python = " \