diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-05-25 22:25:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-31 16:53:04 +0100 |
commit | 5f022cd62c8b6a5170b4c52aaf4862be29fdc678 (patch) | |
tree | cc79720a198e67be0efd4d9ec679232dd6c49ae0 /meta/recipes-kernel/perf | |
parent | 1975ed8c8de7e27514b1dd1b0ec5fade5c98b39c (diff) | |
download | poky-5f022cd62c8b6a5170b4c52aaf4862be29fdc678.tar.gz |
perf: Make built-in libtraceevent plugins cohabit with external libtraceevent
This will package the plugins built by perf into kernel specific dir
under libdir, so it does not conflict with plugins from newly added
libtraceevent recipe
Fixes
do_sdk_depends: The file /usr/lib/traceevent/plugins/plugin_cfg80211.so is installed by both perf and libtraceevent, aborting
(From OE-Core rev: 28f39769c27d257a60ff0152acc0c76f0276fa6a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 67b01a7f65..2d803381bb 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -137,6 +137,10 @@ PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip" | |||
137 | do_compile() { | 137 | do_compile() { |
138 | # Linux kernel build system is expected to do the right thing | 138 | # Linux kernel build system is expected to do the right thing |
139 | unset CFLAGS | 139 | unset CFLAGS |
140 | test -e ${S}/tools/lib/traceevent/plugins/Makefile && \ | ||
141 | sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/lib/traceevent/plugins/Makefile | ||
142 | test -e ${S}/tools/perf/Makefile.config && \ | ||
143 | sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/perf/Makefile.config | ||
140 | oe_runmake all | 144 | oe_runmake all |
141 | } | 145 | } |
142 | 146 | ||
@@ -364,7 +368,7 @@ RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN} | |||
364 | RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" | 368 | RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" |
365 | 369 | ||
366 | FILES_SOLIBSDEV = "" | 370 | FILES_SOLIBSDEV = "" |
367 | FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent ${libdir}/libperf-jvmti.so" | 371 | FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent* ${libdir}/libperf-jvmti.so" |
368 | FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive" | 372 | FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive" |
369 | FILES:${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" | 373 | FILES:${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" |
370 | FILES:${PN}-python = " \ | 374 | FILES:${PN}-python = " \ |