aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-navigation
diff options
context:
space:
mode:
authorPeter Bigot <pab@pabigot.com>2015-02-08 12:47:35 -0600
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 09:35:50 +0100
commitdc558655518e9722e43a5a56559c2adf918c7b54 (patch)
tree5ff7cb238bf600e267426cbf456c7b0ebae8bd52 /meta-oe/recipes-navigation
parent5afa450950bd2b86181b5fe5df6eb3d61ce3e8aa (diff)
downloadmeta-openembedded-dc558655518e9722e43a5a56559c2adf918c7b54.tar.gz
meta-openembedded-dc558655518e9722e43a5a56559c2adf918c7b54.tar.bz2
meta-openembedded-dc558655518e9722e43a5a56559c2adf918c7b54.zip
gpsd: select distro preference for bluez provider
Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-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 6d3adc18d..93cf1aec7 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} \