summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-07-16 18:26:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-18 21:24:27 +0100
commita527fe24d812bb024d602d8b016c76704887b177 (patch)
tree49ca78c4b5714bf4781c1aa498b99e70603023a6 /meta/recipes-connectivity
parent37784b9822c95e9c713dd5813d9ac3e65087b6e4 (diff)
downloadpoky-a527fe24d812bb024d602d8b016c76704887b177.tar.gz
bluez4: conflicts with bluez5
- RCONFLICTS bluez5 (From OE-Core rev: 34ad3decaa0c90238693c43294648dcb1f187ed8) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4_4.101.bb2
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 f48adfd0a2..7af1305e66 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 \
11SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" 11SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
12SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487" 12SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
13 13
14RCONFLICTS_${PN} = "bluez5"
15
14do_install_append() { 16do_install_append() {
15 install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ 17 install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
16 install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/ 18 install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/