summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalt Miner <wminer@linuxfoundation.org>2015-10-23 15:05:45 +0000
committerGerrit Code Review <gerrit@172.30.200.200>2015-10-23 15:05:45 +0000
commit96e920d213ad449590995cab195675a2b9e8441d (patch)
tree92f7181fba4a2c4b0f0c1440d28d28dbb21cbc4e
parent7d9331c81f8a7a15ae6371bc5f23570b8ca7b5d1 (diff)
parent882f5b7bfd8ee7393364dc31c29862a09056b1f6 (diff)
Merge "Provide oFono 1.15 with BlueZ 5 support"
-rw-r--r--meta-agl/recipes-connectivity/ofono/ofono_%.bbappend6
-rw-r--r--meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi-connectivity.bb1
2 files changed, 7 insertions, 0 deletions
diff --git a/meta-agl/recipes-connectivity/ofono/ofono_%.bbappend b/meta-agl/recipes-connectivity/ofono/ofono_%.bbappend
new file mode 100644
index 000000000..6bf323626
--- /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 c2c1d72a9..b197814f8 100644
--- 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 \
"