[PATCHv3 0/3] bluez5 support updates

[PATCHv3 0/3] bluez5 support updates

[Peter A. Bigot]

This is the meta-oe changes supporting the proposed fix for Yocto
5031, just refreshed as described at:

http://lists.openembedded.org/pipermail/openembedded-core/2015-February/101535.html

The following changes since commit 9c926ef2d463e643fb0dc87f6535a12e35d039ab:

  msr-tools: add recipe (2015-01-28 09:54:41 +0100)

are available in the git repository at:

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

Peter A. Bigot (3):
  gnokii: refine selector for bluez4 package config
  gpsd: select distro preference for bluez provider
  packagegroup-basic: select distro preference for bluez provider

 meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb     | 2 +-
 meta-oe/recipes-core/packagegroups/packagegroup-basic.bb | 3 ++-
 meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb             | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

-- 
1.9.1

[PATCHv3 1/3] gnokii: refine selector for bluez4 package config

[Peter A. Bigot]

Use bluez4 or bluez5 to avoid ambiguity.

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..acae868 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[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
 PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical"
 PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite"
 PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
-- 
1.9.1

[PATCHv3 2/3] gpsd: select distro preference for bluez provider

[Peter A. Bigot]

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

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
index 6d3adc1..93cf1ae 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
@@ -20,7 +20,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
 SRC_URI[md5sum] = "fc5b03aae38b9b5b6880b31924d0ace3"
 SRC_URI[sha256sum] = "706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320"
 
-inherit scons update-rc.d python-dir pythonnative systemd
+inherit scons update-rc.d python-dir pythonnative systemd bluetooth
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"
@@ -30,8 +30,8 @@ SYSTEMD_OESCONS = "${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false
 export STAGING_INCDIR
 export STAGING_LIBDIR
 
-PACKAGECONFIG ??= "bluez"
-PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez4"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
+PACKAGECONFIG[bluez4] = "bluez='true',bluez='false',bluez4"
 
 EXTRA_OESCONS = " \
     sysroot=${STAGING_DIR_TARGET} \
-- 
1.9.1

[PATCHv3 3/3] packagegroup-basic: select distro preference for bluez provider

[Peter A. Bigot]

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

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index 20b1652..4f2992c 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -9,6 +9,7 @@ PR = "r13"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
+inherit bluetooth
 
 # Poke extra recomendations into the list using your machine.conf
 #
@@ -45,7 +46,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", "${BLUEZ}", "", d)} \
     ${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \
     \
     tzdata \
-- 
1.9.1