[oe-commits] Jukka Rissanen : bluez5: Only install .conf files if found

git at git.openembedded.org git at git.openembedded.org
Wed Jul 31 05:51:32 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: ecdbaeeef11fd7732fffe992c7aa3cfa28eaabff
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ecdbaeeef11fd7732fffe992c7aa3cfa28eaabff

Author: Jukka Rissanen <jukka.rissanen at linux.intel.com>
Date:   Mon Jul 29 11:29:41 2013 +0300

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.

Signed-off-by: Jukka Rissanen <jukka.rissanen at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-connectivity/bluez5/bluez5.inc |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index fc78900..36a6061 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -39,9 +39,15 @@ EXTRA_OECONF = "\
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/bluetooth/
-	install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
-	install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
-	install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
+	if [ -f ${S}/profiles/audio/audio.conf ]; then
+	    install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
+	fi
+	if [ -f ${S}/profiles/network/network.conf ]; then
+	    install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
+	fi
+	if [ -f ${S}/profiles/input/input.conf ]; then
+	    install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
+	fi
 	# at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
 	install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
 }



More information about the Openembedded-commits mailing list