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-25 18:01:16 +0100 |
commit | 33a4425d6de5a8aabcb40ccbc80483749fc3cb32 (patch) | |
tree | aafaad5de31f2e4cedfbf2494feb3a20e84a0021 /meta/recipes-kernel | |
parent | 8abf510a1390fbbf1f79ae6018d50ae221917465 (diff) | |
download | poky-33a4425d6de5a8aabcb40ccbc80483749fc3cb32.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: e80b2075055947b45102da629f99b677f8752e0d)
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')
-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" | |||
25 | 25 | ||
26 | do_install() { | 26 | do_install() { |
27 | oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui | 27 | oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui |
28 | rm ${D}${bindir}/trace-cmd | ||
28 | rm -rf ${D}${datadir}/trace-cmd | 29 | rm -rf ${D}${datadir}/trace-cmd |
29 | rmdir ${D}${datadir} | 30 | rmdir ${D}${datadir} |
30 | } | 31 | } |