mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 06:32:12 +02:00
kernelshark: Remove trace-cmd from the kernelshark package
Fixes [YOCTO 6550]
Images installing both trace-cmd and kernelshark would fail with:
error: file /usr/bin/trace-cmd conflicts between attempted installs of
kernelshark-1.2+git0+7055ffd37b-r3.core2_32 and
trace-cmd-1.2+git0+7055ffd37b-r3.core2_32
This patch removes ${bindir}/trace-cmd from the install prior to
packaging, as is already done with the ${datadir}.
Reported-by: California Sullivan <california.l.sullivan@intel.com>
(From OE-Core rev: 3cd92ac652e12fc2f4d67cbc5e7f83dd95f6bd1d)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
(cherry picked from commit eb08ae8f729ef77329892d19b23ddfdaa7953de0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e26aae7014
commit
5be57ba62b
@@ -15,6 +15,7 @@ EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
|
||||
|
||||
do_install() {
|
||||
oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
|
||||
rm ${D}${bindir}/trace-cmd
|
||||
rm -rf ${D}${datadir}/trace-cmd
|
||||
rmdir ${D}${datadir}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user