Revert "bluez5: remove configuration files from install task"

This reverts commit 49391fdcf71b32c5fd3c7b134c1d1c45cc1db388 which
introduced a bluetooth regression on systems with read-only rootfs.

When configuration files are missing, bluez tries to generate them which
fails on a read-only rootfs. As a result bluetooth service fails to
start and bluetooth is broken. Hence, configuration files need to be
installed in the rootfs in a way or another.

Bluez commit be0e79629 (build: ship all config files with --enable-datafiles,
2024-02-12) introduced configuration files installation in bluez version
5.73. However, scarthgap pulls in version 5.72, so it is responsible of the
installation of configuration files until bluez is upgraded. Scarthgap
commit 49391fdcf71b32c5fd3c7b134c1d1c45cc1db388 removed installation of
configuration files too early, hence the revert.

Signed-off-by: Catalin Popescu <catalin.popescu@leica-geosystems.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 9cbeb5e99f0dfd22b07b52aaebcdc36035ac1f30..39e1bf389ce40654fa9e1ffe508c81a8fe41252e 100644 (file)
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -87,6 +87,14 @@ do_install:append() {
        install -d ${D}${INIT_D_DIR}
        install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
 
+       install -d ${D}${sysconfdir}/bluetooth/
+       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
+
        if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
                sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
        fi