Patchwork [2/5] bluez4: conflicts with/replaces bluez5

login
register
mail settings
Submitter Cristian Iorga
Date July 12, 2013, 2:44 p.m.
Message ID <a05bb98e398d4a5f8bc4fa9940759007cc4f305d.1373640113.git.cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/53593/
State New
Headers show

Comments

Cristian Iorga - July 12, 2013, 2:44 p.m.
- RCONFLICTS/RREPLACES bluez5

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 meta/recipes-connectivity/bluez/bluez4_4.101.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Ross Burton - July 12, 2013, 4:01 p.m.
On 12 July 2013 15:44, Cristian Iorga <cristian.iorga@intel.com> wrote:
> -PR = "r5"
> +PR = "r6"

No need for PR bump.

Ross

Patch

diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index f48adfd..91ebc63 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -1,6 +1,6 @@ 
 require bluez4.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://bluetooth.conf \
             file://sbc_mmx.patch \
@@ -11,6 +11,9 @@  SRC_URI += "file://bluetooth.conf \
 SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
 SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
 
+RCONFLICTS_${PN} = "bluez5"
+RREPLACES_${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/