Patchwork kernelshark: Remove trace-cmd from the kernelshark package

login
register
mail settings
Submitter Darren Hart
Date July 18, 2014, 11:01 p.m.
Message ID <7ebd83d37f946d8f169e4bec7e00bfeed6cc6408.1405724512.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/76103/
State Accepted
Commit 5be57ba62b47f12f937b2e1e0f5ea07092c243d8
Headers show

Comments

Darren Hart - July 18, 2014, 11:01 p.m.
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(+)
Darren Hart - July 21, 2014, 3:21 p.m.
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.
Richard Purdie - July 21, 2014, 3:32 p.m.
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
Darren Hart - July 21, 2014, 4:16 p.m.
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.

Patch

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}
 }