Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Darren Hart <dvhart@linux.intel.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: california.l.sullivan@intel.com,
	openembedded-core@lists.openembedded.org
Subject: Re: [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
Date: Mon, 21 Jul 2014 09:16:01 -0700	[thread overview]
Message-ID: <CFF28A91.9D412%dvhart@linux.intel.com> (raw)
In-Reply-To: <1405956772.22985.99.camel@ted>

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

>On Mon, 2014-07-21 at 08:21 -0700, Darren Hart wrote:
>> On 7/18/14, 16:01, "Darren Hart" <dvhart@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@intel.com>
>> >Signed-off-by: Darren Hart <dvhart@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@intel.com				            Intel Corporation





      reply	other threads:[~2014-07-21 16:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-18 23:01 [PATCH] kernelshark: Remove trace-cmd from the kernelshark package Darren Hart
2014-07-21 15:21 ` Darren Hart
2014-07-21 15:32   ` Richard Purdie
2014-07-21 16:16     ` Darren Hart [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CFF28A91.9D412%dvhart@linux.intel.com \
    --to=dvhart@linux.intel.com \
    --cc=california.l.sullivan@intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=richard.purdie@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox