summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez5
diff options
context:
space:
mode:
authorIsmo Puustinen <ismo.puustinen@intel.com>2017-01-25 15:03:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:43:01 +0000
commitb7d212dc2f69f62c121c55cccee267e445c2d6dd (patch)
tree06081c08fdad983bb70c52e2ee7f5c9a4dcfcf30 /meta/recipes-connectivity/bluez5
parent49f6a9e7949ec3bd774c8b8580a5f7d57502fd40 (diff)
downloadpoky-b7d212dc2f69f62c121c55cccee267e445c2d6dd.tar.gz
bluez5: make readline support conditional.
Add readline support to PACKAGECONFIG. If readline needs if left out of compilation, the bluez utilities which depend on readline are not included in build or packages. The defaults in PACKAGECONFIG are the same as before, so there should be no change to current users. (From OE-Core rev: 3985eed70c194c3d9d0c6e94a65e2edfa3f29a8e) Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 55a5055ff3..ed75db2113 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -6,15 +6,16 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ 7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" 8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e"
9DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline" 9DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck"
10PROVIDES += "bluez-hcidump" 10PROVIDES += "bluez-hcidump"
11RPROVIDES_${PN} += "bluez-hcidump" 11RPROVIDES_${PN} += "bluez-hcidump"
12 12
13RCONFLICTS_${PN} = "bluez4" 13RCONFLICTS_${PN} = "bluez4"
14 14
15PACKAGECONFIG ??= "obex-profiles" 15PACKAGECONFIG ??= "obex-profiles readline"
16PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" 16PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
17PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," 17PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
18PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
18 19
19SRC_URI = "\ 20SRC_URI = "\
20 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ 21 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -42,7 +43,7 @@ EXTRA_OECONF = "\
42NOINST_TOOLS_READLINE ??= "" 43NOINST_TOOLS_READLINE ??= ""
43NOINST_TOOLS_EXPERIMENTAL ??= "" 44NOINST_TOOLS_EXPERIMENTAL ??= ""
44NOINST_TOOLS = " \ 45NOINST_TOOLS = " \
45 ${NOINST_TOOLS_READLINE} \ 46 ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \
46 ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ 47 ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \
47" 48"
48 49