[oe-commits] Cristian Iorga : bluez4: conflicts with bluez5

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 34ad3decaa0c90238693c43294648dcb1f187ed8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=34ad3decaa0c90238693c43294648dcb1f187ed8

Author: Cristian Iorga <cristian.iorga at intel.com>
Date:   Tue Jul 16 18:26:02 2013 +0300

bluez4: conflicts with bluez5

- RCONFLICTS bluez5

Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-connectivity/bluez/bluez4_4.101.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index f48adfd..7af1305 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -11,6 +11,8 @@ SRC_URI += "file://bluetooth.conf \
 SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
 SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
 
+RCONFLICTS_${PN} = "bluez5"
+
 do_install_append() {
 	install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
 	install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/