* [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
@ 2014-07-18 23:01 Darren Hart
2014-07-21 15:21 ` Darren Hart
0 siblings, 1 reply; 4+ messages in thread
From: Darren Hart @ 2014-07-18 23:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Darren Hart, california.l.sullivan
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)
---
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index e64abe2..9af91c9 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}
}
--
2.0.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
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
0 siblings, 1 reply; 4+ messages in thread
From: Darren Hart @ 2014-07-21 15:21 UTC (permalink / raw)
To: Darren Hart, openembedded-core; +Cc: california.l.sullivan
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.
--
Darren Hart Open Source Technology Center
darren.hart@intel.com Intel Corporation
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
2014-07-21 15:21 ` Darren Hart
@ 2014-07-21 15:32 ` Richard Purdie
2014-07-21 16:16 ` Darren Hart
0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2014-07-21 15:32 UTC (permalink / raw)
To: Darren Hart; +Cc: california.l.sullivan, openembedded-core
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...
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
2014-07-21 15:32 ` Richard Purdie
@ 2014-07-21 16:16 ` Darren Hart
0 siblings, 0 replies; 4+ messages in thread
From: Darren Hart @ 2014-07-21 16:16 UTC (permalink / raw)
To: Richard Purdie; +Cc: california.l.sullivan, openembedded-core
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-21 16:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox