From: Vitus Jensen <vjensen@gmx.de>
Date: Fri, 21 May 2010 04:38:06 +0000 (+0000)
Subject: socketcan-utils-test: rconflicts with canutils
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=715d9585bbe20dd10a5a10fde4e64b124c91d0d1;p=openembedded.git

socketcan-utils-test: rconflicts with canutils

Rconflicts because of identical program names.

Signed-off-by: Vitus Jensen <vjensen@gmx.de>
Signed-off-by: Eric Bénard <eric@eukrea.com>
---

diff --git a/recipes/socketcan/socketcan-utils-test_svn.bb b/recipes/socketcan/socketcan-utils-test_svn.bb
index e04c3c2e4f..2239a02880 100644
--- a/recipes/socketcan/socketcan-utils-test_svn.bb
+++ b/recipes/socketcan/socketcan-utils-test_svn.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Socketcan user space utilities and test apps"
 HOMEPAGE = "http://developer.berlios.de/projects/socketcan/"
 SECTION = "console/utils"
 LICENSE = "GPL"
+RCONFLICTS = "canutils"
 
 SRCREV = "917"
 PV = "0.0+svnr${SRCPV}"