[RFC 00/10] mods to support virtual/bluez

[RFC 00/10] mods to support virtual/bluez

[Peter A. Bigot]

This series is a proposed fix for Yocto 5031, providing virtual/bluez to
select between bluez4 and bluez5.  The intent is to continue using
bluez4 as the default, but to allow distros to switch to bluez5 if the
packages they need support the new interface.

The material here depends on this RFC branch:

  git://git.yoctoproject.org/poky-contrib pabigot/wip/virtual-bluez

Please comment on the overall approach in the oe-core thread.

The following changes since commit dac2422f737c351c37a8405a76b5f0b5df9311a0:

  krb5: add initscripts-functions to RDEPENDS (2014-11-07 15:06:22 +0100)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib pabigot/wip/virtual-bluez
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=pabigot/wip/virtual-bluez

Peter A. Bigot (10):
  gypsy: switch to virtual/bluez
  gpsd: switch to virtual/bluez
  foxtrotgps: switch to virtual/bluez
  packagegroup-basic: switch bluetooth to virtual/bluez
  gvfs: switch to virtual/bluez
  obexd: conflict with bluez5
  gnome-bluetooth: switch to virtual/bluez
  gnokii: switch to virtual/bluez
  obex-data-server: conflict with bluez5
  openobex: switch to virtual/bluez

 meta-gnome/recipes-connectivity/obex/obexd_0.48.bb                 | 2 ++
 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb | 5 +++--
 meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb                       | 2 +-
 meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb               | 2 +-
 meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb        | 1 +
 meta-oe/recipes-connectivity/obex/openobex_1.5.bb                  | 2 +-
 meta-oe/recipes-core/packagegroups/packagegroup-basic.bb           | 2 +-
 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb          | 2 +-
 meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb                       | 2 +-
 meta-oe/recipes-navigation/gypsy/gypsy.inc                         | 2 +-
 10 files changed, 13 insertions(+), 9 deletions(-)

-- 
1.8.5.5

[RFC 01/10] gypsy: switch to virtual/bluez

[Peter A. Bigot]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-oe/recipes-navigation/gypsy/gypsy.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/gypsy/gypsy.inc b/meta-oe/recipes-navigation/gypsy/gypsy.inc
index 7c93d0a..15d80fe 100644
--- a/meta-oe/recipes-navigation/gypsy/gypsy.inc
+++ b/meta-oe/recipes-navigation/gypsy/gypsy.inc
@@ -6,7 +6,7 @@ client applications, passing the data as simple values for the clients \
 to use."
 LICENSE = "GPLv2.0 & LGPLv2.1"
 SECTION = "console/network"
-DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt-native libxslt"
+DEPENDS = "glib-2.0 dbus virtual/bluez dbus-glib libxslt-native libxslt"
 
 inherit autotools pkgconfig gtk-doc
 PACKAGES += "libgypsy"
-- 
1.8.5.5

[RFC 02/10] gpsd: switch to virtual/bluez

[Peter A. Bigot]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
index 6d3adc1..d081f89 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
@@ -31,7 +31,7 @@ export STAGING_INCDIR
 export STAGING_LIBDIR
 
 PACKAGECONFIG ??= "bluez"
-PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez4"
+PACKAGECONFIG[bluez] = "bluez='true',bluez='false',virtual/bluez"
 
 EXTRA_OESCONS = " \
     sysroot=${STAGING_DIR_TARGET} \
-- 
1.8.5.5

[RFC 03/10] foxtrotgps: switch to virtual/bluez

[Peter A. Bigot]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
index 101e87e..ef63296 100644
--- a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
+++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.foxtrotgps.org/"
 SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-DEPENDS = "curl gtk+ libglade sqlite3 libexif gpsd bluez4 intltool-native"
+DEPENDS = "curl gtk+ libglade sqlite3 libexif gpsd virtual/bluez intltool-native"
 
 SRC_URI = "http://www.foxtrotgps.org/releases/${BP}.tar.gz"
 SRC_URI[md5sum] = "6777d448ee9d3ba195f9d26ea90e3163"
-- 
1.8.5.5

[RFC 04/10] packagegroup-basic: switch bluetooth to virtual/bluez

[Peter A. Bigot]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-oe/recipes-core/packagegroups/packagegroup-basic.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index 20b1652..e25eabb 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -45,7 +45,7 @@ RRECOMMENDS_${PN} = "\
     ${@base_contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \
     ${@base_contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \
     \
-    ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "bluetooth", "virtual/bluez", "", d)} \
     ${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \
     \
     tzdata \
-- 
1.8.5.5

[meta-gnome][RFC 05/10] gvfs: switch to virtual/bluez

[Peter A. Bigot]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
index 131c849..4e1dd23 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
@@ -29,5 +29,5 @@ PACKAGECONFIG[samba] = "--enable-samba --with-samba-includes=${STAGING_INCDIR} \
 # needs meta-filesystems
 PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse"
 PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive"
-PACKAGECONFIG[obexftp] = "--enable-obexftp, --disable-obexftp, bluez4 expat"
+PACKAGECONFIG[obexftp] = "--enable-obexftp, --disable-obexftp, virtual/bluez expat"
 PACKAGECONFIG[cdda] = "--enable-cdda, --disable-cdda, libcdio"
-- 
1.8.5.5

[meta-gnome][RFC 06/10] obexd: conflict with bluez5

[Peter A. Bigot]

obexd was integrated into bluez5 and is no longer a separate package.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-gnome/recipes-connectivity/obex/obexd_0.48.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
index 26869fe..f28f77b 100644
--- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
+++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
@@ -1,5 +1,7 @@
 SUMMARY = "OBEX Server and Client"
+# obexd was integrated into bluez5
 DEPENDS = "glib-2.0 dbus bluez4 libical"
+RCONFLICTS_${PN} = "bluez5"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
-- 
1.8.5.5

[meta-gnome][RFC 07/10] gnome-bluetooth: switch to virtual/bluez

[Peter A. Bigot]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
index 4fd38a0..1f619cd 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 PR = "r1"
 
 SECTION = "x11/gnome"
-DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez4 gnome-keyring virtual/libx11 libxi intltool-native"
+DEPENDS = "${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/bluez', 'bluez5', 'bluez5', 'obexd obex-data-server', d)} \
+    gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify virtual/bluez gnome-keyring virtual/libx11 libxi intltool-native"
 
 inherit gnomebase gtk-icon-cache
 
@@ -28,6 +29,6 @@ do_configure_append() {
     sed -i 's,func_fatal_error "error: cannot install,echo "bogus message about,' ${HOST_SYS}-libtool
 }
 
-RRECOMMENDS_${PN} += "obexd obex-data-server"
+RRECOMMENDS_${PN} += "${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/bluez', 'bluez5', 'bluez5-obex', 'obexd obex-data-server', d)}"
 
 FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/"
-- 
1.8.5.5

[RFC 08/10] gnokii: switch to virtual/bluez

[Peter A. Bigot]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
index 4826452..4423906 100644
--- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
+++ b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
@@ -9,7 +9,7 @@ DEPENDS = "glib-2.0"
 X11DEPENDS = " libxpm gtk+"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
-PACKAGECONFIG[bluez] = "--enable-bluetooth,--disable-bluetooth,bluez4"
+PACKAGECONFIG[bluez] = "--enable-bluetooth,--disable-bluetooth,virtual/bluez"
 PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical"
 PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite"
 PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
-- 
1.8.5.5

[RFC 09/10] obex-data-server: conflict with bluez5

[Peter A. Bigot]

Although this package builds with bluez5, it was removed from Fedora 20
[1] and is not used in bluez5-based GNOME [2], suggesting the bluez5
obexd is to be used instead.

[1] http://pkgs.fedoraproject.org/cgit/obex-data-server.git/log/?h=f20
[2] http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
index 4a2b2b1..afe6106 100644
--- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
+++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
@@ -3,6 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "gtk+ bluez4 dbus-glib imagemagick openobex"
+RCONFLICTS_${PN} = "bluez5"
 
 SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz"
 SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d"
-- 
1.8.5.5

[RFC 10/10] openobex: switch to virtual/bluez

[Peter A. Bigot]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-oe/recipes-connectivity/obex/openobex_1.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
index b07779d..1324843 100644
--- a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
+++ b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \
 Object Exchange (OBEX) protocol."
 HOMEPAGE = "http://openobex.triq.net"
 SECTION = "libs"
-DEPENDS = "virtual/libusb0 bluez4"
+DEPENDS = "virtual/libusb0 virtual/bluez"
 LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-- 
1.8.5.5