Patchwork [V2,3/4] bluez5: conflicts with bluez4

login
register
mail settings
Submitter Cristian Iorga
Date March 12, 2013, 5:03 p.m.
Message ID <1363107795-2140-4-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/46073/
State New
Headers show

Comments

Cristian Iorga - March 12, 2013, 5:03 p.m.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 meta/recipes-connectivity/bluez5/bluez5_5.3.bb |    2 ++
 1 file changed, 2 insertions(+)
Martin Jansa - March 12, 2013, 9:48 p.m.
On Tue, Mar 12, 2013 at 07:03:14PM +0200, Cristian Iorga wrote:
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> ---
>  meta/recipes-connectivity/bluez5/bluez5_5.3.bb |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb
> index 311562f..5963483 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb
> +++ b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb
> @@ -6,6 +6,8 @@ SRC_URI += "file://bluetooth.conf \
>  SRC_URI[md5sum] = "44de20f6422bf90a01b8df48e7dfe4ed"
>  SRC_URI[sha256sum] = "828e2cd1109835c2fc1d731fb7fd7b46951044e451cc8556a37e1312d8c8c9a6"
>  
> +RCONFLICTS_${PN} = "bluez4"

That's not enough for upgrade path, add RREPLACES/RPROVIDES too.
> +
>  do_install_append() {
>  	install -d ${D}${sysconfdir}/bluetooth/
>  	install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb
index 311562f..5963483 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.3.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.3.bb
@@ -6,6 +6,8 @@  SRC_URI += "file://bluetooth.conf \
 SRC_URI[md5sum] = "44de20f6422bf90a01b8df48e7dfe4ed"
 SRC_URI[sha256sum] = "828e2cd1109835c2fc1d731fb7fd7b46951044e451cc8556a37e1312d8c8c9a6"
 
+RCONFLICTS_${PN} = "bluez4"
+
 do_install_append() {
 	install -d ${D}${sysconfdir}/bluetooth/
 	install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/