Merge "Provide oFono 1.15 with BlueZ 5 support"

diff --git a/meta-agl/recipes-connectivity/ofono/ofono_%.bbappend b/meta-agl/recipes-connectivity/ofono/ofono_%.bbappend
new file mode 100644 (file)
index 0000000..6bf3236
--- /dev/null
+++ b/meta-agl/recipes-connectivity/ofono/ofono_%.bbappend
@@ -0,0 +1,6 @@
+# Prevent BlueZ 4 from being always pulled
+DEPENDS_remove = "bluez4"
+
+# If Bluetooth is asked in DISTRO_FEATURES, verify if Bluez 5 is also
+# explicitly specified. If it is not, fall back to BlueZ 4
+DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5', 'bluez4', d), '', d)}"

diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb b/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb
index c2c1d72..b197814 100644 (file)
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb
+++ b/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb
@@ -11,6 +11,7 @@ PACKAGES = "\
 ALLOW_EMPTY_${PN} = "1"
 
 RDEPENDS_${PN} += "\
+    ofono \
     rygel \
     rygel-plugin-media-export \
     "