summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2013-07-29 11:29:41 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-31 06:59:55 +0100
commite472443db2978239c1c8a783bf9ea04f533b45d4 (patch)
treed3f77412c950293f507a22f4a8883da907f944e8 /meta
parent05241f94634cc78830b35b52b4e15958adfac170 (diff)
downloadpoky-e472443db2978239c1c8a783bf9ea04f533b45d4.tar.gz
bluez5: Only install .conf files if found
Bluez5 is migrating away from using separate .conf files for different profiles. So only install profile configuration files when they are found. This is needed so that the bluez5.inc file can be used with latest bluez5 from git. (From OE-Core rev: ecdbaeeef11fd7732fffe992c7aa3cfa28eaabff) Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc12
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index fc78900962..36a606195e 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -39,9 +39,15 @@ EXTRA_OECONF = "\
39 39
40do_install_append() { 40do_install_append() {
41 install -d ${D}${sysconfdir}/bluetooth/ 41 install -d ${D}${sysconfdir}/bluetooth/
42 install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ 42 if [ -f ${S}/profiles/audio/audio.conf ]; then
43 install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ 43 install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
44 install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ 44 fi
45 if [ -f ${S}/profiles/network/network.conf ]; then
46 install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
47 fi
48 if [ -f ${S}/profiles/input/input.conf ]; then
49 install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
50 fi
45 # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT 51 # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
46 install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ 52 install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
47} 53}