[OE-core] [PATCH] kernelshark: Remove trace-cmd from the kernelshark package

Darren Hart dvhart at linux.intel.com
Mon Jul 21 16:16:01 UTC 2014


On 7/21/14, 8:32, "Richard Purdie" <richard.purdie at linuxfoundation.org>
wrote:

>On Mon, 2014-07-21 at 08:21 -0700, Darren Hart wrote:
>> On 7/18/14, 16:01, "Darren Hart" <dvhart at linux.intel.com> wrote:
>> 
>> >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)
>> 
>> Apologies for the cherry-picked line, that shouldn't have appeared here.
>> Please remove prior to merge. I can resubmit if that is preferred.
>
>Too late, its in...

Yeah, I saw that. My apologies, that was sloppy and unacceptable. I'll
correct this going forward.

-- 
Darren Hart					Open Source Technology Center
darren.hart at intel.com				            Intel Corporation






More information about the Openembedded-core mailing list