summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarc Ferland <ferlandm@amotus.ca>2017-06-13 13:44:56 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-23 11:44:13 +0100
commit21f93730e2d2946c8f96702a294dcebb8d30f30e (patch)
tree7df6838e26bd82f37aa054d0715f42626d4374fa /meta
parentdff44c43094e44d4a6994fd823bd44897277ee2f (diff)
downloadpoky-21f93730e2d2946c8f96702a294dcebb8d30f30e.tar.gz
bluez5: add more PACKAGECONFIG options
This patch adds missing PACKAGECONFIG options and allow for a more fine-grained build of bluez5. I took care of providing a default configuration that matches the previous default config. (From OE-Core rev: 2589cfb8a5b46be958ff3ee228c3a32f82dada86) Signed-off-by: Marc Ferland <ferlandm@amotus.ca> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc28
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.45.bb2
2 files changed, 25 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 5fc49f3c72..f267c6626d 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -12,13 +12,35 @@ RPROVIDES_${PN} += "bluez-hcidump"
12 12
13RCONFLICTS_${PN} = "bluez4" 13RCONFLICTS_${PN} = "bluez4"
14 14
15PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 15PACKAGECONFIG ??= "obex-profiles \
16 readline \
17 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
18 a2dp-profiles \
19 avrcp-profiles \
20 network-profiles \
21 hid-profiles \
22 hog-profiles \
23 tools \
24 deprecated \
25"
16PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" 26PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
17PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," 27PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
18PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" 28PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
19PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" 29PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
20PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" 30PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
21PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups" 31PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups"
32PACKAGECONFIG[nfc] = "--enable-nfc,--disable-nfc"
33PACKAGECONFIG[sap-profiles] = "--enable-sap,--disable-sap"
34PACKAGECONFIG[a2dp-profiles] = "--enable-a2dp,--disable-a2dp"
35PACKAGECONFIG[avrcp-profiles] = "--enable-avrcp,--disable-avrcp"
36PACKAGECONFIG[network-profiles] = "--enable-network,--disable-network"
37PACKAGECONFIG[hid-profiles] = "--enable-hid,--disable-hid"
38PACKAGECONFIG[hog-profiles] = "--enable-hog,--disable-hog"
39PACKAGECONFIG[health-profiles] = "--enable-health,--disable-health"
40PACKAGECONFIG[sixaxis] = "--enable-sixaxis,--disable-sixaxis"
41PACKAGECONFIG[tools] = "--enable-tools,--disable-tools"
42PACKAGECONFIG[threads] = "--enable-threads,--disable-threads"
43PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated"
22 44
23SRC_URI = "\ 45SRC_URI = "\
24 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ 46 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -33,8 +55,6 @@ S = "${WORKDIR}/bluez-${PV}"
33inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest 55inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
34 56
35EXTRA_OECONF = "\ 57EXTRA_OECONF = "\
36 --enable-tools \
37 --enable-deprecated \
38 --enable-test \ 58 --enable-test \
39 --enable-datafiles \ 59 --enable-datafiles \
40 --enable-library \ 60 --enable-library \
@@ -48,7 +68,7 @@ NOINST_TOOLS_BT ??= ""
48NOINST_TOOLS = " \ 68NOINST_TOOLS = " \
49 ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ 69 ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \
50 ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ 70 ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \
51 ${NOINST_TOOLS_BT} \ 71 ${@bb.utils.contains('PACKAGECONFIG', 'tools', '${NOINST_TOOLS_BT}', '', d)} \
52" 72"
53 73
54do_install_append() { 74do_install_append() {
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.45.bb b/meta/recipes-connectivity/bluez5/bluez5_5.45.bb
index ee5e88fc9f..d5f516cb13 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.45.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.45.bb
@@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "4cacb00703a6bc149cb09502257d321597d43952374a16f3558766ffa8
8# noinst programs in Makefile.tools that are conditional on READLINE 8# noinst programs in Makefile.tools that are conditional on READLINE
9# support 9# support
10NOINST_TOOLS_READLINE ?= " \ 10NOINST_TOOLS_READLINE ?= " \
11 attrib/gatttool \ 11 ${@bb.utils.contains('PACKAGECONFIG', 'deprecated', 'attrib/gatttool', '', d)} \
12 tools/obex-client-tool \ 12 tools/obex-client-tool \
13 tools/obex-server-tool \ 13 tools/obex-server-tool \
14 tools/bluetooth-player \ 14 tools/bluetooth-player \