diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2014-07-18 23:01:52 +0000 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2014-07-25 09:46:30 -0700 |
| commit | e80b2075055947b45102da629f99b677f8752e0d (patch) | |
| tree | a8efd5271716c9619d80d0f8e229e441e307d8d3 | |
| parent | 80ba78dcdef75e7b1c1761cd0cfadfe497cb0591 (diff) | |
| download | openembedded-core-e80b2075055947b45102da629f99b677f8752e0d.tar.gz openembedded-core-e80b2075055947b45102da629f99b677f8752e0d.tar.bz2 openembedded-core-e80b2075055947b45102da629f99b677f8752e0d.zip | |
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>
| -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 d61097df91..f287bed951 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} } |