[oe-commits] Darren Hart : kernelshark: Remove trace-cmd from the kernelshark package
git at git.openembedded.org
git at git.openembedded.org
Mon Jul 21 09:53:16 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 3cd92ac652e12fc2f4d67cbc5e7f83dd95f6bd1d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3cd92ac652e12fc2f4d67cbc5e7f83dd95f6bd1d
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 e64abe2..9af91c9 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"
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}
}
More information about the Openembedded-commits
mailing list