summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2014-07-18 23:01:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:18:21 +0100
commit5be57ba62b47f12f937b2e1e0f5ea07092c243d8 (patch)
tree5e78fcd60fdc4b8905e322865a24250573424795
parente26aae701452f01abc62fcd3ed29b9ca08750fce (diff)
downloadpoky-5be57ba62b47f12f937b2e1e0f5ea07092c243d8.tar.gz
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>
-rw-r--r--meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index e64abe2ecc..9af91c9599 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -15,6 +15,7 @@ EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
15 15
16do_install() { 16do_install() {
17 oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui 17 oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
18 rm ${D}${bindir}/trace-cmd
18 rm -rf ${D}${datadir}/trace-cmd 19 rm -rf ${D}${datadir}/trace-cmd
19 rmdir ${D}${datadir} 20 rmdir ${D}${datadir}
20} 21}