On Friday, May 26, 2023, Khem Raj <[email protected]> wrote: > 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 > > Signed-off-by: Khem Raj <[email protected]> > Cc: Max Krummenacher <[email protected]> > --- > v2: Check if files exist before sed'ing them > > meta/recipes-kernel/perf/perf.bb | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/ perf.bb > index 67b01a7f65a..2d803381bb4 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" > do_compile() { > # Linux kernel build system is expected to do the right thing > unset CFLAGS > + test -e ${S}/tools/lib/traceevent/plugins/Makefile && \ > + sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/lib/traceevent/plugins/Makefile > + test -e ${S}/tools/perf/Makefile.config && \ > + sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/perf/Makefile.config > oe_runmake all > } > > @@ -364,7 +368,7 @@ RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN} > RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" > > FILES_SOLIBSDEV = "" > -FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent ${libdir}/libperf-jvmti.so" > +FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent* ${libdir}/libperf-jvmti.so" > FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive" > FILES:${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" > FILES:${PN}-python = " \ > -- > 2.40.1 > > LGTM Thanks for the fix Khem. Regards Max
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181766): https://lists.openembedded.org/g/openembedded-core/message/181766 Mute This Topic: https://lists.openembedded.org/mt/99144937/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
