Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez
On Mon, Nov 11, 2013 at 05:31:07PM -0800, Saul Wold wrote: On 11/11/2013 04:30 PM, Rongqing Li wrote: On 11/11/2013 05:59 PM, Iorga, Cristian wrote: Hi all, As far as I have experimented, there is no upgrade path available at the moment, due to extensive changes into the programming model for BlueZ5 vs BlueZ4. At the moment, the last single component that is not officially ready for BlueZ5 is PulseAudio. As have asked around, and PA5.0 will* support BlueZ5. PA5.0 should* be released before EoY2013. Judging by PA git log, there are extensive changes/updates in order to support BZ5. Regards, Cristian Thanks. Saul: Do you think it is ready for merge, our release needs it, thanks. At this point, I do not think this is an approporate patch, we can't switch between bluez4 and bluez5 as Cristian points out above, they are just not compatible. This is a case where we need 2 distinct versions and once the recipes/upstreams for the things that rely on bluez4 are updated to bluez5, we will cut over and then likely move the bluez4 stack out of oe-core into meta-oe. I disagree a bit here, if some distribution is using only packagegroup-base - bluez dependency, then this patch is useful to allow to switch to bluez5 already with just VIRTUAL_RUNTIME change instead of a lot longer .bbappend for packagegroup-base just to replace bluez4 with bluez5. If bluez4 is moved to meta-oe then there would be the same problem for people who can need bluez4-only images where bluez4 should be pulled by packagegroup-base. Sau! -Roy -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Martin Jansa Sent: Friday, November 1, 2013 11:35 AM To: rongqing...@windriver.com Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez On Fri, Nov 01, 2013 at 04:09:28PM +0800, rongqing...@windriver.com wrote: From: Roy Li rongqing...@windriver.com We have two version bluez, declare virtual/bluez and VIRTUAL-RUNTIME_bluez to switch them easily, and set the preferred provider for bluez as bluez4 +1 I agree that some apps aren't compatible with both versions now, but this gives easy way to switch between them for DISTRO which cares only about apps which are compatible with bluez5 already. BTW: Have someone tried upgrade path on target from bluez4 to bluez5? I know we discussed it at lengths before bluez5 was merged, but don't know if someone really tested it. Signed-off-by: Roy Li rongqing...@windriver.com --- meta/conf/distro/include/default-providers.inc |5 ++--- meta/recipes-connectivity/bluez/bluez4.inc |1 + meta/recipes-connectivity/bluez5/bluez5.inc |1 + meta/recipes-connectivity/connman/connman.inc |4 ++-- meta/recipes-connectivity/libpcap/libpcap.inc |2 +- meta/recipes-connectivity/neard/neard.inc |2 +- meta/recipes-connectivity/ofono/ofono.inc |2 +- meta/recipes-core/packagegroups/packagegroup-base.bb |2 +- meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc |2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb |2 +- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |2 +- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d4b9db0..0ec4cd9 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= opkg PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-native PREFERRED_PROVIDER_virtual/libx11 ?= libx11 PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel +PREFERRED_PROVIDER_virtual/bluez ?= bluez4 # # Default virtual runtime providers @@ -21,6 +22,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth VIRTUAL-RUNTIME_apm ?= apm VIRTUAL-RUNTIME_alsa-state ?= alsa-state +VIRTUAL-RUNTIME_bluez ?= bluez4 # # Default recipe providers @@ -40,6 +42,3 @@ PREFERRED_PROVIDER_console-tools ?= kbd PREFERRED_PROVIDER_gzip-native ?= pigz-native PREFERRED_PROVIDER_make ?= make PREFERRED_PROVIDER_udev ?= ${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)} -# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details -# on this rather strange entry. -PREFERRED_PROVIDER_bluez4 ?= bluez4 diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index e4f6834
Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez
On 11/12/13, 2:49 AM, Martin Jansa wrote: On Mon, Nov 11, 2013 at 05:31:07PM -0800, Saul Wold wrote: On 11/11/2013 04:30 PM, Rongqing Li wrote: On 11/11/2013 05:59 PM, Iorga, Cristian wrote: Hi all, As far as I have experimented, there is no upgrade path available at the moment, due to extensive changes into the programming model for BlueZ5 vs BlueZ4. At the moment, the last single component that is not officially ready for BlueZ5 is PulseAudio. As have asked around, and PA5.0 will* support BlueZ5. PA5.0 should* be released before EoY2013. Judging by PA git log, there are extensive changes/updates in order to support BZ5. Regards, Cristian Thanks. Saul: Do you think it is ready for merge, our release needs it, thanks. At this point, I do not think this is an approporate patch, we can't switch between bluez4 and bluez5 as Cristian points out above, they are just not compatible. This is a case where we need 2 distinct versions and once the recipes/upstreams for the things that rely on bluez4 are updated to bluez5, we will cut over and then likely move the bluez4 stack out of oe-core into meta-oe. I disagree a bit here, if some distribution is using only packagegroup-base - bluez dependency, then this patch is useful to allow to switch to bluez5 already with just VIRTUAL_RUNTIME change instead of a lot longer .bbappend for packagegroup-base just to replace bluez4 with bluez5. If bluez4 is moved to meta-oe then there would be the same problem for people who can need bluez4-only images where bluez4 should be pulled by packagegroup-base. My current expectation moving forward is that there will be a distro flag that selects bluez4 or bluez5 API. Then the recipes should be selecting behavior based on that flag. The VIRTUAL-RUNTIME_... is designed for cases where the same API is used, but different things could provide the functionality. Such as a syslog daemon. Since the APIs are different, it's not appropriate in this case. --Mark Sau! -Roy -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Martin Jansa Sent: Friday, November 1, 2013 11:35 AM To: rongqing...@windriver.com Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez On Fri, Nov 01, 2013 at 04:09:28PM +0800, rongqing...@windriver.com wrote: From: Roy Li rongqing...@windriver.com We have two version bluez, declare virtual/bluez and VIRTUAL-RUNTIME_bluez to switch them easily, and set the preferred provider for bluez as bluez4 +1 I agree that some apps aren't compatible with both versions now, but this gives easy way to switch between them for DISTRO which cares only about apps which are compatible with bluez5 already. BTW: Have someone tried upgrade path on target from bluez4 to bluez5? I know we discussed it at lengths before bluez5 was merged, but don't know if someone really tested it. Signed-off-by: Roy Li rongqing...@windriver.com --- meta/conf/distro/include/default-providers.inc |5 ++--- meta/recipes-connectivity/bluez/bluez4.inc |1 + meta/recipes-connectivity/bluez5/bluez5.inc |1 + meta/recipes-connectivity/connman/connman.inc |4 ++-- meta/recipes-connectivity/libpcap/libpcap.inc |2 +- meta/recipes-connectivity/neard/neard.inc |2 +- meta/recipes-connectivity/ofono/ofono.inc |2 +- meta/recipes-core/packagegroups/packagegroup-base.bb |2 +- meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc |2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb |2 +- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |2 +- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d4b9db0..0ec4cd9 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= opkg PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-native PREFERRED_PROVIDER_virtual/libx11 ?= libx11 PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel +PREFERRED_PROVIDER_virtual/bluez ?= bluez4 # # Default virtual runtime providers @@ -21,6 +22,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth VIRTUAL-RUNTIME_apm ?= apm VIRTUAL-RUNTIME_alsa-state ?= alsa-state +VIRTUAL-RUNTIME_bluez ?= bluez4 # # Default recipe providers @@ -40,6 +42,3 @@ PREFERRED_PROVIDER_console-tools ?= kbd PREFERRED_PROVIDER_gzip-native ?= pigz-native PREFERRED_PROVIDER_make ?= make PREFERRED_PROVIDER_udev ?= ${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d
Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez
Hi all, As far as I have experimented, there is no upgrade path available at the moment, due to extensive changes into the programming model for BlueZ5 vs BlueZ4. At the moment, the last single component that is not officially ready for BlueZ5 is PulseAudio. As have asked around, and PA5.0 will* support BlueZ5. PA5.0 should* be released before EoY2013. Judging by PA git log, there are extensive changes/updates in order to support BZ5. Regards, Cristian -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Martin Jansa Sent: Friday, November 1, 2013 11:35 AM To: rongqing...@windriver.com Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez On Fri, Nov 01, 2013 at 04:09:28PM +0800, rongqing...@windriver.com wrote: From: Roy Li rongqing...@windriver.com We have two version bluez, declare virtual/bluez and VIRTUAL-RUNTIME_bluez to switch them easily, and set the preferred provider for bluez as bluez4 +1 I agree that some apps aren't compatible with both versions now, but this gives easy way to switch between them for DISTRO which cares only about apps which are compatible with bluez5 already. BTW: Have someone tried upgrade path on target from bluez4 to bluez5? I know we discussed it at lengths before bluez5 was merged, but don't know if someone really tested it. Signed-off-by: Roy Li rongqing...@windriver.com --- meta/conf/distro/include/default-providers.inc|5 ++--- meta/recipes-connectivity/bluez/bluez4.inc|1 + meta/recipes-connectivity/bluez5/bluez5.inc |1 + meta/recipes-connectivity/connman/connman.inc |4 ++-- meta/recipes-connectivity/libpcap/libpcap.inc |2 +- meta/recipes-connectivity/neard/neard.inc |2 +- meta/recipes-connectivity/ofono/ofono.inc |2 +- meta/recipes-core/packagegroups/packagegroup-base.bb |2 +- meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc|2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb |2 +- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |2 +- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d4b9db0..0ec4cd9 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= opkg PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-native PREFERRED_PROVIDER_virtual/libx11 ?= libx11 PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel +PREFERRED_PROVIDER_virtual/bluez ?= bluez4 # # Default virtual runtime providers @@ -21,6 +22,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth VIRTUAL-RUNTIME_apm ?= apm VIRTUAL-RUNTIME_alsa-state ?= alsa-state +VIRTUAL-RUNTIME_bluez ?= bluez4 # # Default recipe providers @@ -40,6 +42,3 @@ PREFERRED_PROVIDER_console-tools ?= kbd PREFERRED_PROVIDER_gzip-native ?= pigz-native PREFERRED_PROVIDER_make ?= make PREFERRED_PROVIDER_udev ?= ${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)} -# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details -# on this rather strange entry. -PREFERRED_PROVIDER_bluez4 ?= bluez4 diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index e4f6834..c0babc6 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191 DEPENDS = udev libusb dbus-glib glib-2.0 libcheck readline RDEPENDS_${PN}-dev = bluez-hcidump +PROVIDES += virtual/bluez PACKAGECONFIG ??= \ ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 2e25d86..b3ab131 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e DEPENDS
Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez
On 11/11/2013 04:30 PM, Rongqing Li wrote: On 11/11/2013 05:59 PM, Iorga, Cristian wrote: Hi all, As far as I have experimented, there is no upgrade path available at the moment, due to extensive changes into the programming model for BlueZ5 vs BlueZ4. At the moment, the last single component that is not officially ready for BlueZ5 is PulseAudio. As have asked around, and PA5.0 will* support BlueZ5. PA5.0 should* be released before EoY2013. Judging by PA git log, there are extensive changes/updates in order to support BZ5. Regards, Cristian Thanks. Saul: Do you think it is ready for merge, our release needs it, thanks. At this point, I do not think this is an approporate patch, we can't switch between bluez4 and bluez5 as Cristian points out above, they are just not compatible. This is a case where we need 2 distinct versions and once the recipes/upstreams for the things that rely on bluez4 are updated to bluez5, we will cut over and then likely move the bluez4 stack out of oe-core into meta-oe. Sau! -Roy -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Martin Jansa Sent: Friday, November 1, 2013 11:35 AM To: rongqing...@windriver.com Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez On Fri, Nov 01, 2013 at 04:09:28PM +0800, rongqing...@windriver.com wrote: From: Roy Li rongqing...@windriver.com We have two version bluez, declare virtual/bluez and VIRTUAL-RUNTIME_bluez to switch them easily, and set the preferred provider for bluez as bluez4 +1 I agree that some apps aren't compatible with both versions now, but this gives easy way to switch between them for DISTRO which cares only about apps which are compatible with bluez5 already. BTW: Have someone tried upgrade path on target from bluez4 to bluez5? I know we discussed it at lengths before bluez5 was merged, but don't know if someone really tested it. Signed-off-by: Roy Li rongqing...@windriver.com --- meta/conf/distro/include/default-providers.inc |5 ++--- meta/recipes-connectivity/bluez/bluez4.inc |1 + meta/recipes-connectivity/bluez5/bluez5.inc |1 + meta/recipes-connectivity/connman/connman.inc |4 ++-- meta/recipes-connectivity/libpcap/libpcap.inc |2 +- meta/recipes-connectivity/neard/neard.inc |2 +- meta/recipes-connectivity/ofono/ofono.inc |2 +- meta/recipes-core/packagegroups/packagegroup-base.bb |2 +- meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc |2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb |2 +- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |2 +- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d4b9db0..0ec4cd9 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= opkg PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-native PREFERRED_PROVIDER_virtual/libx11 ?= libx11 PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel +PREFERRED_PROVIDER_virtual/bluez ?= bluez4 # # Default virtual runtime providers @@ -21,6 +22,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth VIRTUAL-RUNTIME_apm ?= apm VIRTUAL-RUNTIME_alsa-state ?= alsa-state +VIRTUAL-RUNTIME_bluez ?= bluez4 # # Default recipe providers @@ -40,6 +42,3 @@ PREFERRED_PROVIDER_console-tools ?= kbd PREFERRED_PROVIDER_gzip-native ?= pigz-native PREFERRED_PROVIDER_make ?= make PREFERRED_PROVIDER_udev ?= ${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)} -# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details -# on this rather strange entry. -PREFERRED_PROVIDER_bluez4 ?= bluez4 diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index e4f6834..c0babc6 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191 DEPENDS = udev libusb dbus-glib glib-2.0 libcheck readline RDEPENDS_${PN}-dev = bluez-hcidump +PROVIDES += virtual/bluez PACKAGECONFIG ??= \ ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 2e25d86..b3ab131 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5
Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez
On 13-11-11 08:31 PM, Saul Wold wrote: On 11/11/2013 04:30 PM, Rongqing Li wrote: On 11/11/2013 05:59 PM, Iorga, Cristian wrote: Hi all, As far as I have experimented, there is no upgrade path available at the moment, due to extensive changes into the programming model for BlueZ5 vs BlueZ4. At the moment, the last single component that is not officially ready for BlueZ5 is PulseAudio. As have asked around, and PA5.0 will* support BlueZ5. PA5.0 should* be released before EoY2013. Judging by PA git log, there are extensive changes/updates in order to support BZ5. Regards, Cristian Thanks. Saul: Do you think it is ready for merge, our release needs it, thanks. At this point, I do not think this is an approporate patch, we can't switch between bluez4 and bluez5 as Cristian points out above, they are just not compatible. This is a case where we need 2 distinct versions and once the recipes/upstreams for the things that rely on bluez4 are updated to bluez5, we will cut over and then likely move the bluez4 stack out of oe-core into meta-oe. Sau! Okay, thanks for the clarification. ../Randy -Roy -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Martin Jansa Sent: Friday, November 1, 2013 11:35 AM To: rongqing...@windriver.com Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez On Fri, Nov 01, 2013 at 04:09:28PM +0800, rongqing...@windriver.com wrote: From: Roy Li rongqing...@windriver.com We have two version bluez, declare virtual/bluez and VIRTUAL-RUNTIME_bluez to switch them easily, and set the preferred provider for bluez as bluez4 +1 I agree that some apps aren't compatible with both versions now, but this gives easy way to switch between them for DISTRO which cares only about apps which are compatible with bluez5 already. BTW: Have someone tried upgrade path on target from bluez4 to bluez5? I know we discussed it at lengths before bluez5 was merged, but don't know if someone really tested it. Signed-off-by: Roy Li rongqing...@windriver.com --- meta/conf/distro/include/default-providers.inc |5 ++--- meta/recipes-connectivity/bluez/bluez4.inc |1 + meta/recipes-connectivity/bluez5/bluez5.inc |1 + meta/recipes-connectivity/connman/connman.inc |4 ++-- meta/recipes-connectivity/libpcap/libpcap.inc |2 +- meta/recipes-connectivity/neard/neard.inc |2 +- meta/recipes-connectivity/ofono/ofono.inc |2 +- meta/recipes-core/packagegroups/packagegroup-base.bb |2 +- meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc |2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb |2 +- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |2 +- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d4b9db0..0ec4cd9 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= opkg PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-native PREFERRED_PROVIDER_virtual/libx11 ?= libx11 PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel +PREFERRED_PROVIDER_virtual/bluez ?= bluez4 # # Default virtual runtime providers @@ -21,6 +22,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth VIRTUAL-RUNTIME_apm ?= apm VIRTUAL-RUNTIME_alsa-state ?= alsa-state +VIRTUAL-RUNTIME_bluez ?= bluez4 # # Default recipe providers @@ -40,6 +42,3 @@ PREFERRED_PROVIDER_console-tools ?= kbd PREFERRED_PROVIDER_gzip-native ?= pigz-native PREFERRED_PROVIDER_make ?= make PREFERRED_PROVIDER_udev ?= ${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)} -# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details -# on this rather strange entry. -PREFERRED_PROVIDER_bluez4 ?= bluez4 diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index e4f6834..c0babc6 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191 DEPENDS = udev libusb dbus-glib glib-2.0 libcheck readline RDEPENDS_${PN}-dev = bluez-hcidump +PROVIDES += virtual/bluez PACKAGECONFIG ??= \ ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 2e25d86..b3ab131 100644
Re: [OE-core] [PATCH v2] bluez: declaration of virtual/bluez and VIRTUAL-RUNTIME_bluez
On Fri, Nov 01, 2013 at 04:09:28PM +0800, rongqing...@windriver.com wrote: From: Roy Li rongqing...@windriver.com We have two version bluez, declare virtual/bluez and VIRTUAL-RUNTIME_bluez to switch them easily, and set the preferred provider for bluez as bluez4 +1 I agree that some apps aren't compatible with both versions now, but this gives easy way to switch between them for DISTRO which cares only about apps which are compatible with bluez5 already. BTW: Have someone tried upgrade path on target from bluez4 to bluez5? I know we discussed it at lengths before bluez5 was merged, but don't know if someone really tested it. Signed-off-by: Roy Li rongqing...@windriver.com --- meta/conf/distro/include/default-providers.inc|5 ++--- meta/recipes-connectivity/bluez/bluez4.inc|1 + meta/recipes-connectivity/bluez5/bluez5.inc |1 + meta/recipes-connectivity/connman/connman.inc |4 ++-- meta/recipes-connectivity/libpcap/libpcap.inc |2 +- meta/recipes-connectivity/neard/neard.inc |2 +- meta/recipes-connectivity/ofono/ofono.inc |2 +- meta/recipes-core/packagegroups/packagegroup-base.bb |2 +- meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc|2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb |2 +- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |2 +- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d4b9db0..0ec4cd9 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= opkg PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-native PREFERRED_PROVIDER_virtual/libx11 ?= libx11 PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel +PREFERRED_PROVIDER_virtual/bluez ?= bluez4 # # Default virtual runtime providers @@ -21,6 +22,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth VIRTUAL-RUNTIME_apm ?= apm VIRTUAL-RUNTIME_alsa-state ?= alsa-state +VIRTUAL-RUNTIME_bluez ?= bluez4 # # Default recipe providers @@ -40,6 +42,3 @@ PREFERRED_PROVIDER_console-tools ?= kbd PREFERRED_PROVIDER_gzip-native ?= pigz-native PREFERRED_PROVIDER_make ?= make PREFERRED_PROVIDER_udev ?= ${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)} -# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details -# on this rather strange entry. -PREFERRED_PROVIDER_bluez4 ?= bluez4 diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index e4f6834..c0babc6 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191 DEPENDS = udev libusb dbus-glib glib-2.0 libcheck readline RDEPENDS_${PN}-dev = bluez-hcidump +PROVIDES += virtual/bluez PACKAGECONFIG ??= \ ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 2e25d86..b3ab131 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e DEPENDS = udev libusb dbus-glib glib-2.0 libcheck readline +PROVIDES += virtual/bluez RCONFLICTS_${PN} = bluez4 diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index c2d71e0..8641415 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -41,7 +41,7 @@ PACKAGECONFIG ??= wispr \ # PACKAGECONFIG_append_pn-connman = openvpn vpnc l2tp pptp PACKAGECONFIG[wifi] = --enable-wifi, --disable-wifi, wpa-supplicant -PACKAGECONFIG[bluetooth] = --enable-bluetooth, --disable-bluetooth, bluez4 +PACKAGECONFIG[bluetooth] = --enable-bluetooth, --disable-bluetooth, virtual/bluez PACKAGECONFIG[3g] = --enable-ofono, --disable-ofono, ofono PACKAGECONFIG[tist] = --enable-tist,--disable-tist, PACKAGECONFIG[openvpn] =