[PATCH 0/2] [V2] BlueZ 5 experimental packages

[PATCH 0/2] [V2] BlueZ 5 experimental packages

[Cristian Iorga]

This sets of patches adds bluez5 recipes as experimental packages.
BlueZ 5.X is not an upgrade for Bluez 4.x, as such, no upgrade is
provided/possible.
The two versions of the BT stack also conflicts each other.

The following changes since commit 74e403705e25afec656b5e40921771a9c29bdc40:

  yocto-kernel: make BBLAYERS parsing more robust (2013-07-13 18:23:39 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ciorga/bluez57v2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/bluez57v2

Cristian Iorga (2):
  bluez5: new package for v5.7
  bluez4: conflicts with/replaces bluez5

 meta/recipes-connectivity/bluez/bluez4_4.101.bb    |    3 ++
 .../bluez5/bluez5-5.7/bluetooth.conf               |   16 +++++++
 meta/recipes-connectivity/bluez5/bluez5.inc        |   45 ++++++++++++++++++++
 meta/recipes-connectivity/bluez5/bluez5_5.7.bb     |   37 ++++++++++++++++
 4 files changed, 101 insertions(+)
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5-5.7/bluetooth.conf
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5.inc
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.7.bb

-- 
1.7.10.4

[PATCH 2/2] bluez4: conflicts with/replaces bluez5

[Cristian Iorga]

- RCONFLICTS/RREPLACES bluez5

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 meta/recipes-connectivity/bluez/bluez4_4.101.bb |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index f48adfd..b91c9c3 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -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/
-- 
1.7.10.4

Re: [PATCH 2/2] bluez4: conflicts with/replaces bluez5

[Saul Wold]

On 07/15/2013 06:50 AM, Cristian Iorga wrote:
> - RCONFLICTS/RREPLACES bluez5
>
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> ---
>   meta/recipes-connectivity/bluez/bluez4_4.101.bb |    3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
> index f48adfd..b91c9c3 100644
> --- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
> +++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
> @@ -11,6 +11,9 @@ SRC_URI += "file://bluetooth.conf \
>   SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
>   SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
>
> +RCONFLICTS_${PN} = "bluez5"
> +RREPLACES_${PN} = "bluez5"
> +
Is the RREPLACES correct here and in the bluez5 recipe?

I know they conflict, but I did not think they could replace each other.

Sau!

>   do_install_append() {
>   	install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
>   	install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
>

Re: [PATCH 2/2] bluez4: conflicts with/replaces bluez5

[Phil Blundell]

> +RCONFLICTS_${PN} = "bluez5"
> +RREPLACES_${PN} = "bluez5"

I'm not sure that this necessarily does quite what you want.  What
exactly were you trying to achieve with that RREPLACES?

p.

Re: [PATCH 2/2] bluez4: conflicts with/replaces bluez5

[Burton, Ross]

On 15 July 2013 17:27, Phil Blundell <pb@pbcl.net> wrote:
>> +RCONFLICTS_${PN} = "bluez5"
>> +RREPLACES_${PN} = "bluez5"
>
> I'm not sure that this necessarily does quite what you want.  What
> exactly were you trying to achieve with that RREPLACES?

I remember when this series was first published there was a long
debate over the exact lines required.  That said, I can't see why we
need replaces either.

Ross

Re: [PATCH 2/2] bluez4: conflicts with/replaces bluez5

[Iorga, Cristian]

Please see my V3 cover letter to observe the reasoning behind RREPLACES presence.

Thanks,
Cristian

-----Original Message-----
From: Burton, Ross [mailto:ross.burton@intel.com] 
Sent: Monday, July 15, 2013 8:01 PM
To: Phil Blundell
Cc: Iorga, Cristian; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 2/2] bluez4: conflicts with/replaces bluez5

On 15 July 2013 17:27, Phil Blundell <pb@pbcl.net> wrote:
>> +RCONFLICTS_${PN} = "bluez5"
>> +RREPLACES_${PN} = "bluez5"
>
> I'm not sure that this necessarily does quite what you want.  What 
> exactly were you trying to achieve with that RREPLACES?

I remember when this series was first published there was a long debate over the exact lines required.  That said, I can't see why we need replaces either.

Ross