diff options
| author |   Darren Hart <dvhart@linux.intel.com> | 2014-07-18 23:01:52 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-19 00:16:06 +0100 |
| commit | 3cd92ac652e12fc2f4d67cbc5e7f83dd95f6bd1d (patch) | |
| tree | 2616b925b6d5afe9707de26b5978fc000a18b303 /meta/recipes-kernel/trace-cmd | |
| parent | df41a457eb467489ef57974cfa12db3a51d59ab1 (diff) | |
| download | openembedded-core-contrib-3cd92ac652e12fc2f4d67cbc5e7f83dd95f6bd1d.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>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
(cherry picked from commit eb08ae8f729ef77329892d19b23ddfdaa7953de0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/trace-cmd')
| -rw-r--r-- | meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 1 |
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" 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} } |