Re: [OE-core] [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
On 7/18/14, 16:01, Darren Hart dvh...@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.sulli...@intel.com
Signed-off-by: Darren Hart dvh...@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.h...@intel.com Intel Corporation
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
On Mon, 2014-07-21 at 08:21 -0700, Darren Hart wrote:
On 7/18/14, 16:01, Darren Hart dvh...@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.sulli...@intel.com
Signed-off-by: Darren Hart dvh...@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
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
On 7/21/14, 8:32, Richard Purdie richard.pur...@linuxfoundation.org
wrote:
On Mon, 2014-07-21 at 08:21 -0700, Darren Hart wrote:
On 7/18/14, 16:01, Darren Hart dvh...@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.sulli...@intel.com
Signed-off-by: Darren Hart dvh...@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.h...@intel.com Intel Corporation
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] 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.sulli...@intel.com
Signed-off-by: Darren Hart dvh...@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
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
