]> code.ossystems Code Review - openembedded-core.git/commitdiff
bluez5: Only install .conf files if found
authorJukka Rissanen <jukka.rissanen@linux.intel.com>
Mon, 29 Jul 2013 08:29:41 +0000 (11:29 +0300)
committerSaul Wold <sgw@linux.intel.com>
Tue, 30 Jul 2013 06:04:01 +0000 (23:04 -0700)
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@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-connectivity/bluez5/bluez5.inc

index fc7890096247a5cc02caa188c812871fba82f1ed..36a606195ec6e9c61da8c0070a944891d9d59c85 100644 (file)
@@ -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/
 }