[oe-commits] Darren Hart : kernelshark: Remove trace-cmd from the kernelshark package

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: daisy
Commit: e80b2075055947b45102da629f99b677f8752e0d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e80b2075055947b45102da629f99b677f8752e0d

Author: Darren Hart <dvhart at linux.intel.com>
Date:   Fri Jul 18 23:01:52 2014 +0000

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 at intel.com>
Signed-off-by: Darren Hart <dvhart at linux.intel.com>
(cherry picked from commit eb08ae8f729ef77329892d19b23ddfdaa7953de0)
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index d61097d..f287bed 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -25,6 +25,7 @@ FILESPATH = "${FILE_DIRNAME}/trace-cmd"
 
 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}
 }