aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2014-11-26 10:53:05 -0600
committerPeter A. Bigot <pab@pabigot.com>2015-02-08 09:48:27 -0600
commit4ad2b41b888ebddd6951dfe8ef83c89bf5f3d2e5 (patch)
treeb677068ae6c6c88c6375bac634ffd6b73ce5b617
parent755eef61918d9e50cba60c72d5adf8878d9b37c0 (diff)
downloadmeta-openembedded-contrib-4ad2b41b888ebddd6951dfe8ef83c89bf5f3d2e5.tar.gz
gpsd: select distro preference for bluez provider
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb6
1 files 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 6d3adc18da..93cf1aec72 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} \